diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-06-22 00:23:08 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-06-22 00:23:08 +0000 |
| commit | f489688114275c821b1e647e26f71eeb94d8ab24 (patch) | |
| tree | e26d6b2b7b7c4923e40e3cc04f3a98ef478b1af3 /lib/CodeGen/CGDeclCXX.cpp | |
| parent | 7255a2d997b15beae82e627052fdb1b2474495c2 (diff) | |
Per Chris's comment, remove another static (this one
is a static comparator operator).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@106511 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGDeclCXX.cpp')
| -rw-r--r-- | lib/CodeGen/CGDeclCXX.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp index c2e2dd0ee4..9695173513 100644 --- a/lib/CodeGen/CGDeclCXX.cpp +++ b/lib/CodeGen/CGDeclCXX.cpp @@ -180,22 +180,6 @@ CodeGenModule::EmitCXXGlobalVarDeclInitFunc(const VarDecl *D) { CXXGlobalInits.push_back(Fn); } -typedef std::pair<CodeGen::OrderGlobalInitsType, - llvm::Function *> global_init_pair; -static int PrioritizedCXXGlobalInitsCmp(const void* a, const void* b) { - const global_init_pair *LHS = static_cast<const global_init_pair*>(a); - const global_init_pair *RHS = static_cast<const global_init_pair*>(b); - if (LHS->first.priority < RHS->first.priority) - return -1; - if (LHS->first.priority == RHS->first.priority) { - if (LHS->first.lex_order < RHS->first.lex_order) - return -1; - if (LHS->first.lex_order == RHS->first.lex_order) - return 0; - } - return +1; -} - void CodeGenModule::EmitCXXGlobalInitFunc() { if (CXXGlobalInits.empty() && PrioritizedCXXGlobalInits.empty()) @@ -212,8 +196,7 @@ CodeGenModule::EmitCXXGlobalInitFunc() { if (!PrioritizedCXXGlobalInits.empty()) { llvm::SmallVector<llvm::Constant*, 8> LocalCXXGlobalInits; llvm::array_pod_sort(PrioritizedCXXGlobalInits.begin(), - PrioritizedCXXGlobalInits.end(), - PrioritizedCXXGlobalInitsCmp); + PrioritizedCXXGlobalInits.end()); for (unsigned i = 0; i < PrioritizedCXXGlobalInits.size(); i++) { llvm::Function *Fn = PrioritizedCXXGlobalInits[i].second; LocalCXXGlobalInits.push_back(Fn); |