From 469b2003211472d5eae8b20f87fc5b88aa7b07fd Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Tue, 22 Jun 2010 00:23:08 +0000 Subject: Per Chris's comment, remove another static (this one is a static comparator operator). llvm-svn: 106511 --- clang/lib/CodeGen/CGDeclCXX.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'clang/lib/CodeGen/CGDeclCXX.cpp') diff --git a/clang/lib/CodeGen/CGDeclCXX.cpp b/clang/lib/CodeGen/CGDeclCXX.cpp index c2e2dd0ee48..9695173513b 100644 --- a/clang/lib/CodeGen/CGDeclCXX.cpp +++ b/clang/lib/CodeGen/CGDeclCXX.cpp @@ -180,22 +180,6 @@ CodeGenModule::EmitCXXGlobalVarDeclInitFunc(const VarDecl *D) { CXXGlobalInits.push_back(Fn); } -typedef std::pair global_init_pair; -static int PrioritizedCXXGlobalInitsCmp(const void* a, const void* b) { - const global_init_pair *LHS = static_cast(a); - const global_init_pair *RHS = static_cast(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 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); -- cgit v1.2.3