diff options
author | Chris Lattner <sabre@nondot.org> | 2010-06-27 06:32:58 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-06-27 06:32:58 +0000 |
commit | e000907e136ec7b1f3fc025c49711780f6b1c4c8 (patch) | |
tree | 984ef0e663c14d78465bba1873af655cbafcb064 /clang | |
parent | 055097f0249a08a78b7acc3c047e265dec11c0c9 (diff) | |
download | bcm5719-llvm-e000907e136ec7b1f3fc025c49711780f6b1c4c8.tar.gz bcm5719-llvm-e000907e136ec7b1f3fc025c49711780f6b1c4c8.zip |
tidy up OrderGlobalInits
llvm-svn: 106976
Diffstat (limited to 'clang')
-rw-r--r-- | clang/lib/CodeGen/CGDeclCXX.cpp | 2 | ||||
-rw-r--r-- | clang/lib/CodeGen/CodeGenModule.h | 24 |
2 files changed, 12 insertions, 14 deletions
diff --git a/clang/lib/CodeGen/CGDeclCXX.cpp b/clang/lib/CodeGen/CGDeclCXX.cpp index 459a1e1fa62..7cbadd315e1 100644 --- a/clang/lib/CodeGen/CGDeclCXX.cpp +++ b/clang/lib/CodeGen/CGDeclCXX.cpp @@ -173,7 +173,7 @@ CodeGenModule::EmitCXXGlobalVarDeclInitFunc(const VarDecl *D) { if (D->hasAttr<InitPriorityAttr>()) { unsigned int order = D->getAttr<InitPriorityAttr>()->getPriority(); - OrderGlobalInitsType Key(order, PrioritizedCXXGlobalInits.size()); + OrderGlobalInits Key(order, PrioritizedCXXGlobalInits.size()); PrioritizedCXXGlobalInits.push_back(std::make_pair(Key, Fn)); } else diff --git a/clang/lib/CodeGen/CodeGenModule.h b/clang/lib/CodeGen/CodeGenModule.h index 4fbf34319f5..d0d3c7caee8 100644 --- a/clang/lib/CodeGen/CodeGenModule.h +++ b/clang/lib/CodeGen/CodeGenModule.h @@ -75,26 +75,24 @@ namespace CodeGen { class CGObjCRuntime; class MangleBuffer; - typedef struct OrderGlobalInits{ + struct OrderGlobalInits { unsigned int priority; unsigned int lex_order; OrderGlobalInits(unsigned int p, unsigned int l) - : priority(p), lex_order(l) {} - friend bool operator==(const OrderGlobalInits &LHS, - const OrderGlobalInits &RHS) { - return LHS.priority == RHS.priority && - LHS.lex_order == RHS.lex_order; + : priority(p), lex_order(l) {} + + bool operator==(const OrderGlobalInits &RHS) const { + return priority == RHS.priority && + lex_order == RHS.lex_order; } - friend bool operator<(const OrderGlobalInits &LHS, - const OrderGlobalInits &RHS) { - if (LHS.priority < RHS.priority) + bool operator<(const OrderGlobalInits &RHS) const { + if (priority < RHS.priority) return true; - return LHS.priority == RHS.priority && - LHS.lex_order < RHS.lex_order; + return priority == RHS.priority && lex_order < RHS.lex_order; } - } OrderGlobalInitsType; + }; /// CodeGenModule - This class organizes the cross-function state that is used /// while generating LLVM code. @@ -168,7 +166,7 @@ class CodeGenModule : public BlockModule { /// - Global variables with initializers whose order of initialization /// is set by init_priority attribute. - llvm::SmallVector<std::pair<OrderGlobalInitsType, llvm::Function*>, 8> + llvm::SmallVector<std::pair<OrderGlobalInits, llvm::Function*>, 8> PrioritizedCXXGlobalInits; /// CXXGlobalDtors - Global destructor functions and arguments that need to |