*** empty log message ***
llvm-svn: 3058
diff --git a/llvm/include/llvm/Target/TargetSchedInfo.h b/llvm/include/llvm/Target/TargetSchedInfo.h
index ba065cb..a08bd99 100644
--- a/llvm/include/llvm/Target/TargetSchedInfo.h
+++ b/llvm/include/llvm/Target/TargetSchedInfo.h
@@ -245,14 +245,14 @@
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 @@
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/llvm/lib/CodeGen/InstrSched/SchedPriorities.h b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
index b01c1a4..4d763d2 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
+++ b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
@@ -157,13 +157,13 @@
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