Index: include/llvm/ADT/PostOrderIterator.h =================================================================== RCS file: /var/cvs/llvm/llvm/include/llvm/ADT/PostOrderIterator.h,v retrieving revision 1.15 diff -u -r1.15 PostOrderIterator.h --- include/llvm/ADT/PostOrderIterator.h 1 Sep 2004 22:55:34 -0000 1.15 +++ include/llvm/ADT/PostOrderIterator.h 28 Sep 2004 13:33:51 -0000 @@ -18,6 +18,7 @@ #include "llvm/ADT/GraphTraits.h" #include "llvm/ADT/iterator" +#include #include #include @@ -39,14 +40,14 @@ NodeType *BB = *VisitStack.top().second++; if (!Visited.count(BB)) { // If the block is not visited... Visited.insert(BB); - VisitStack.push(make_pair(BB, GT::child_begin(BB))); + VisitStack.push(std::make_pair(BB, GT::child_begin(BB))); } } } inline po_iterator(NodeType *BB) { Visited.insert(BB); - VisitStack.push(make_pair(BB, GT::child_begin(BB))); + VisitStack.push(std::make_pair(BB, GT::child_begin(BB))); traverseChild(); } inline po_iterator() { /* End is when stack is empty */ } Index: lib/CodeGen/InstrSched/SchedGraphCommon.cpp =================================================================== RCS file: /var/cvs/llvm/llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp,v retrieving revision 1.7 diff -u -r1.7 SchedGraphCommon.cpp --- lib/CodeGen/InstrSched/SchedGraphCommon.cpp 1 Sep 2004 22:55:35 -0000 1.7 +++ lib/CodeGen/InstrSched/SchedGraphCommon.cpp 28 Sep 2004 13:33:52 -0000 @@ -14,6 +14,7 @@ #include "llvm/CodeGen/SchedGraphCommon.h" #include "llvm/ADT/STLExtras.h" +#include #include namespace llvm { Index: lib/CodeGen/ModuloScheduling/MSchedGraph.cpp =================================================================== RCS file: /var/cvs/llvm/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp,v retrieving revision 1.7 diff -u -r1.7 MSchedGraph.cpp --- lib/CodeGen/ModuloScheduling/MSchedGraph.cpp 1 Sep 2004 22:55:35 -0000 1.7 +++ lib/CodeGen/ModuloScheduling/MSchedGraph.cpp 28 Sep 2004 13:33:52 -0000 @@ -17,6 +17,7 @@ #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Support/Debug.h" +#include #include using namespace llvm; @@ -67,7 +68,7 @@ bool MSchedGraphNode::isPredecessor(MSchedGraphNode *pred) { - if(find( Predecessors.begin(), Predecessors.end(), pred) != Predecessors.end()) + if(std::find( Predecessors.begin(), Predecessors.end(), pred) != Predecessors.end()) return true; else return false; Index: lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp =================================================================== RCS file: /var/cvs/llvm/llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp,v retrieving revision 1.27 diff -u -r1.27 ModuloScheduling.cpp --- lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp 1 Sep 2004 22:55:35 -0000 1.27 +++ lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp 28 Sep 2004 13:33:52 -0000 @@ -24,6 +24,7 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/GraphWriter.h" #include "llvm/ADT/StringExtras.h" +#include #include #include #include @@ -580,7 +581,7 @@ if(R->second.size() == recurrence.size()) { for(std::vector::const_iterator node = R->second.begin(), end = R->second.end(); node != end; ++node) { - if(find(recurrence.begin(), recurrence.end(), *node) == recurrence.end()) { + if(std::find(recurrence.begin(), recurrence.end(), *node) == recurrence.end()) { all_same = all_same && false; break; } @@ -623,7 +624,7 @@ std::vector &visitedNodes, int II) { - if(find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) { + if(std::find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) { std::vector recurrence; bool first = true; int delay = 0; @@ -714,7 +715,7 @@ for(std::vector::const_iterator N = I->second.begin(), NE = I->second.end(); N != NE; ++N) { bool found = false; for(std::vector >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) { - if(find(PO->begin(), PO->end(), *N) != PO->end()) + if(std::find(PO->begin(), PO->end(), *N) != PO->end()) found = true; } if(!found) { @@ -728,16 +729,16 @@ //Check if we are supposed to ignore this edge or not if(!ignoreEdge(*P, *N)) //Check if already in this recurrence - if(find(I->second.begin(), I->second.end(), *P) == I->second.end()) { + if(std::find(I->second.begin(), I->second.end(), *P) == I->second.end()) { //Also need to check if in partial order bool predFound = false; for(std::vector >::iterator PO = partialOrder.begin(), PEND = partialOrder.end(); PO != PEND; ++PO) { - if(find(PO->begin(), PO->end(), *P) != PO->end()) + if(std::find(PO->begin(), PO->end(), *P) != PO->end()) predFound = true; } if(!predFound) - if(find(new_recurrence.begin(), new_recurrence.end(), *P) == new_recurrence.end()) + if(std::find(new_recurrence.begin(), new_recurrence.end(), *P) == new_recurrence.end()) new_recurrence.push_back(*P); } @@ -756,7 +757,7 @@ bool found = false; //Check if its already in our partial order, if not add it to the final vector for(std::vector >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) { - if(find(PO->begin(), PO->end(), I->first) != PO->end()) + if(std::find(PO->begin(), PO->end(), I->first) != PO->end()) found = true; } if(!found) @@ -772,7 +773,7 @@ void ModuloSchedulingPass::predIntersect(std::vector &CurrentSet, std::vector &IntersectResult) { //Sort CurrentSet so we can use lowerbound - sort(CurrentSet.begin(), CurrentSet.end()); + std::sort(CurrentSet.begin(), CurrentSet.end()); for(unsigned j=0; j < FinalNodeOrder.size(); ++j) { for(MSchedGraphNode::pred_iterator P = FinalNodeOrder[j]->pred_begin(), @@ -782,9 +783,9 @@ if(ignoreEdge(*P,FinalNodeOrder[j])) continue; - if(find(CurrentSet.begin(), + if(std::find(CurrentSet.begin(), CurrentSet.end(), *P) != CurrentSet.end()) - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) IntersectResult.push_back(*P); } } @@ -793,7 +794,7 @@ void ModuloSchedulingPass::succIntersect(std::vector &CurrentSet, std::vector &IntersectResult) { //Sort CurrentSet so we can use lowerbound - sort(CurrentSet.begin(), CurrentSet.end()); + std::sort(CurrentSet.begin(), CurrentSet.end()); for(unsigned j=0; j < FinalNodeOrder.size(); ++j) { for(MSchedGraphNode::succ_iterator P = FinalNodeOrder[j]->succ_begin(), @@ -803,9 +804,9 @@ if(ignoreEdge(FinalNodeOrder[j],*P)) continue; - if(find(CurrentSet.begin(), + if(std::find(CurrentSet.begin(), CurrentSet.end(), *P) != CurrentSet.end()) - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) IntersectResult.push_back(*P); } } @@ -914,13 +915,13 @@ } //Append our node with greatest height to the NodeOrder - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestHeightNode) == FinalNodeOrder.end()) { + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestHeightNode) == FinalNodeOrder.end()) { DEBUG(std::cerr << "Adding node to Final Order: " << *highestHeightNode << "\n"); FinalNodeOrder.push_back(highestHeightNode); } //Remove V from IntersectOrder - IntersectCurrent.erase(find(IntersectCurrent.begin(), + IntersectCurrent.erase(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), highestHeightNode)); @@ -929,11 +930,11 @@ E = highestHeightNode->succ_end(); P != E; ++P) { //if(lower_bound(CurrentSet->begin(), // CurrentSet->end(), *P) != CurrentSet->end()) { - if(find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { + if(std::find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { if(ignoreEdge(highestHeightNode, *P)) continue; //If not already in Intersect, add - if(find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) + if(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) IntersectCurrent.push_back(*P); } } @@ -984,12 +985,12 @@ //Append highest depth node to the NodeOrder - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestDepthNode) == FinalNodeOrder.end()) { + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestDepthNode) == FinalNodeOrder.end()) { DEBUG(std::cerr << "Adding node to Final Order: " << *highestDepthNode << "\n"); FinalNodeOrder.push_back(highestDepthNode); } //Remove heightestDepthNode from IntersectOrder - IntersectCurrent.erase(find(IntersectCurrent.begin(), + IntersectCurrent.erase(std::find(IntersectCurrent.begin(), IntersectCurrent.end(),highestDepthNode)); @@ -998,13 +999,13 @@ E = highestDepthNode->pred_end(); P != E; ++P) { //if(lower_bound(CurrentSet->begin(), // CurrentSet->end(), *P) != CurrentSet->end()) { - if(find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { + if(std::find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { if(ignoreEdge(*P, highestDepthNode)) continue; //If not already in Intersect, add - if(find(IntersectCurrent.begin(), + if(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) IntersectCurrent.push_back(*P); } Index: lib/Support/DynamicLinker.cpp =================================================================== RCS file: /var/cvs/llvm/llvm/lib/Support/DynamicLinker.cpp,v retrieving revision 1.8 diff -u -r1.8 DynamicLinker.cpp --- lib/Support/DynamicLinker.cpp 1 Sep 2004 22:55:35 -0000 1.8 +++ lib/Support/DynamicLinker.cpp 28 Sep 2004 13:33:53 -0000 @@ -21,6 +21,7 @@ #include "llvm/Support/DynamicLinker.h" #include "llvm/Config/dlfcn.h" #include "llvm/Config/windows.h" +#include #include #include using namespace llvm; Index: lib/Transforms/ExprTypeConvert.cpp =================================================================== RCS file: /var/cvs/llvm/llvm/lib/Transforms/ExprTypeConvert.cpp,v retrieving revision 1.98 diff -u -r1.98 ExprTypeConvert.cpp --- lib/Transforms/ExprTypeConvert.cpp 1 Sep 2004 22:55:36 -0000 1.98 +++ lib/Transforms/ExprTypeConvert.cpp 28 Sep 2004 13:33:53 -0000 @@ -828,7 +828,7 @@ } case Instruction::Call: { - User::op_iterator OI = find(I->op_begin(), I->op_end(), V); + User::op_iterator OI = std::find(I->op_begin(), I->op_end(), V); assert (OI != I->op_end() && "Not using value!"); unsigned OpNum = OI - I->op_begin(); @@ -1206,7 +1206,7 @@ } else { // Changing an argument, must be in vararg area std::vector::iterator OI = - find(Params.begin(), Params.end(), OldVal); + std::find(Params.begin(), Params.end(), OldVal); assert (OI != Params.end() && "Not using value!"); *OI = NewVal;