summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGDeclCXX.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2010-06-22 00:23:08 +0000
committerFariborz Jahanian <fjahanian@apple.com>2010-06-22 00:23:08 +0000
commit469b2003211472d5eae8b20f87fc5b88aa7b07fd (patch)
treeba1252c72c545a80594db6aefc40c0dc12c29864 /clang/lib/CodeGen/CGDeclCXX.cpp
parent7c3f7fee41515f0f67ad3a17df2a150b7d0300b3 (diff)
downloadbcm5719-llvm-469b2003211472d5eae8b20f87fc5b88aa7b07fd.tar.gz
bcm5719-llvm-469b2003211472d5eae8b20f87fc5b88aa7b07fd.zip
Per Chris's comment, remove another static (this one
is a static comparator operator). llvm-svn: 106511
Diffstat (limited to 'clang/lib/CodeGen/CGDeclCXX.cpp')
-rw-r--r--clang/lib/CodeGen/CGDeclCXX.cpp19
1 files changed, 1 insertions, 18 deletions
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<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);
OpenPOWER on IntegriCloud