diff options
| -rw-r--r-- | include/llvm/CodeGen/InstrForest.h | 2 | ||||
| -rw-r--r-- | include/llvm/CodeGen/MachineCodeForMethod.h | 6 | ||||
| -rw-r--r-- | include/llvm/CodeGen/MachineFunction.h | 6 | ||||
| -rw-r--r-- | lib/CodeGen/RegAlloc/LiveRangeInfo.h | 2 | ||||
| -rw-r--r-- | lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/include/llvm/CodeGen/InstrForest.h b/include/llvm/CodeGen/InstrForest.h index 6242dd48f0..650dbddf16 100644 --- a/include/llvm/CodeGen/InstrForest.h +++ b/include/llvm/CodeGen/InstrForest.h @@ -247,7 +247,7 @@ protected: // //------------------------------------------------------------------------ -class InstrForest : private std::hash_map<const Instruction *, InstructionNode*> { +class InstrForest : private hash_map<const Instruction *, InstructionNode*> { public: // Use a vector for the root set to get a deterministic iterator // for stable code generation. Even though we need to erase nodes diff --git a/include/llvm/CodeGen/MachineCodeForMethod.h b/include/llvm/CodeGen/MachineCodeForMethod.h index e1b8e4f1f5..742d4b5c0f 100644 --- a/include/llvm/CodeGen/MachineCodeForMethod.h +++ b/include/llvm/CodeGen/MachineCodeForMethod.h @@ -21,8 +21,8 @@ class TargetMachine; class MachineCodeForMethod : private Annotation { - std::hash_set<const Constant*> constantsForConstPool; - std::hash_map<const Value*, int> offsets; + hash_set<const Constant*> constantsForConstPool; + hash_map<const Value*, int> offsets; const Function* method; unsigned staticStackSize; unsigned automaticVarsSize; @@ -60,7 +60,7 @@ public: inline unsigned getRegSpillsSize() const { return regSpillsSize; } inline unsigned getMaxOptionalArgsSize() const { return maxOptionalArgsSize;} inline unsigned getMaxOptionalNumArgs() const { return maxOptionalNumArgs;} - inline const std::hash_set<const Constant*>& + inline const hash_set<const Constant*>& getConstantPoolValues() const {return constantsForConstPool;} // diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h index e1b8e4f1f5..742d4b5c0f 100644 --- a/include/llvm/CodeGen/MachineFunction.h +++ b/include/llvm/CodeGen/MachineFunction.h @@ -21,8 +21,8 @@ class TargetMachine; class MachineCodeForMethod : private Annotation { - std::hash_set<const Constant*> constantsForConstPool; - std::hash_map<const Value*, int> offsets; + hash_set<const Constant*> constantsForConstPool; + hash_map<const Value*, int> offsets; const Function* method; unsigned staticStackSize; unsigned automaticVarsSize; @@ -60,7 +60,7 @@ public: inline unsigned getRegSpillsSize() const { return regSpillsSize; } inline unsigned getMaxOptionalArgsSize() const { return maxOptionalArgsSize;} inline unsigned getMaxOptionalNumArgs() const { return maxOptionalNumArgs;} - inline const std::hash_set<const Constant*>& + inline const hash_set<const Constant*>& getConstantPoolValues() const {return constantsForConstPool;} // diff --git a/lib/CodeGen/RegAlloc/LiveRangeInfo.h b/lib/CodeGen/RegAlloc/LiveRangeInfo.h index 9fc3c64fe9..0ae5b34178 100644 --- a/lib/CodeGen/RegAlloc/LiveRangeInfo.h +++ b/lib/CodeGen/RegAlloc/LiveRangeInfo.h @@ -31,7 +31,7 @@ class Value; class Function; class Instruction; -typedef std::hash_map<const Value*, LiveRange*> LiveRangeMapType; +typedef hash_map<const Value*, LiveRange*> LiveRangeMapType; typedef std::vector<MachineInstr*> CallRetInstrListType; //---------------------------------------------------------------------------- diff --git a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h index 9fc3c64fe9..0ae5b34178 100644 --- a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h +++ b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h @@ -31,7 +31,7 @@ class Value; class Function; class Instruction; -typedef std::hash_map<const Value*, LiveRange*> LiveRangeMapType; +typedef hash_map<const Value*, LiveRange*> LiveRangeMapType; typedef std::vector<MachineInstr*> CallRetInstrListType; //---------------------------------------------------------------------------- |