*** empty log message ***

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3058 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Target/TargetSchedInfo.h b/include/llvm/Target/TargetSchedInfo.h
index ba065cba094d07d01bf455d3e7cca0af7f190e0c..a08bd9981504da96d900fc81f93826d3a7d4674e 100644 (file)
--- a/include/llvm/Target/TargetSchedInfo.h
+++ b/include/llvm/Target/TargetSchedInfo.h
@@ -245,14 +245,14 @@ public:
   
   inline  int  getMinIssueGap          (MachineOpCode fromOp,
                                         MachineOpCode toOp)   const {
-    std::hash_map<OpCodePair,int>::const_iterator
+    hash_map<OpCodePair,int>::const_iterator
       I = issueGaps.find(OpCodePair(fromOp, toOp));
     return (I == issueGaps.end())? 0 : (*I).second;
   }
   
   inline const std::vector<MachineOpCode>*
                getConflictList(MachineOpCode opCode) const {
-    std::hash_map<MachineOpCode, std::vector<MachineOpCode> >::const_iterator
+    hash_map<MachineOpCode, std::vector<MachineOpCode> >::const_iterator
       I = conflictLists.find(opCode);
     return (I == conflictLists.end())? NULL : & (*I).second;
   }
@@ -286,8 +286,8 @@ protected:
   unsigned                numIssueDeltas;
   
   std::vector<InstrRUsage>      instrRUsages;   // indexed by opcode
-  std::hash_map<OpCodePair,int> issueGaps;      // indexed by opcode pair
-  std::hash_map<MachineOpCode, std::vector<MachineOpCode> >
+  hash_map<OpCodePair,int> issueGaps;      // indexed by opcode pair
+  hash_map<MachineOpCode, std::vector<MachineOpCode> >
                           conflictLists;       // indexed by opcode
 };
 

diff --git a/lib/CodeGen/InstrSched/SchedPriorities.h b/lib/CodeGen/InstrSched/SchedPriorities.h
index b01c1a43d6803b6dd0f3bd26fcadf728390cac35..4d763d21c5fdafd9ed741dc4c2d323ba49827779 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedPriorities.h
+++ b/lib/CodeGen/InstrSched/SchedPriorities.h
@@ -157,13 +157,13 @@ private:
   cycles_t curTime;
   const SchedGraph* graph;
   FunctionLiveVarInfo &methodLiveVarInfo;
-  std::hash_map<const MachineInstr*, bool> lastUseMap;
+  hash_map<const MachineInstr*, bool> lastUseMap;
   std::vector<cycles_t> nodeDelayVec;
   std::vector<cycles_t> nodeEarliestUseVec;
   std::vector<cycles_t> earliestReadyTimeForNode;
   cycles_t earliestReadyTime;
   NodeHeap candsAsHeap;                                // candidate nodes, ready to go
-  std::hash_set<const SchedGraphNode*> candsAsSet;//same entries as candsAsHeap,
+  hash_set<const SchedGraphNode*> candsAsSet;   //same entries as candsAsHeap,
                                                //   but as set for fast lookup
   std::vector<candIndex> mcands;                // holds pointers into cands
   candIndex nextToTry;                         // next cand after the last

diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.h b/lib/Target/SparcV9/InstrSched/SchedPriorities.h
index b01c1a43d6803b6dd0f3bd26fcadf728390cac35..4d763d21c5fdafd9ed741dc4c2d323ba49827779 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedPriorities.h
+++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.h
@@ -157,13 +157,13 @@ private:
   cycles_t curTime;
   const SchedGraph* graph;
   FunctionLiveVarInfo &methodLiveVarInfo;
-  std::hash_map<const MachineInstr*, bool> lastUseMap;
+  hash_map<const MachineInstr*, bool> lastUseMap;
   std::vector<cycles_t> nodeDelayVec;
   std::vector<cycles_t> nodeEarliestUseVec;
   std::vector<cycles_t> earliestReadyTimeForNode;
   cycles_t earliestReadyTime;
   NodeHeap candsAsHeap;                                // candidate nodes, ready to go
-  std::hash_set<const SchedGraphNode*> candsAsSet;//same entries as candsAsHeap,
+  hash_set<const SchedGraphNode*> candsAsSet;   //same entries as candsAsHeap,
                                                //   but as set for fast lookup
   std::vector<candIndex> mcands;                // holds pointers into cands
   candIndex nextToTry;                         // next cand after the last