Add includes and use std:: for standard library calls to make code

compile on windows. This patch was contributed by Paolo Invernizzi.

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

diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h
index 8ae46768b5a06d1ae8e8ad780a0f713fca893d21..961be340f7166d40f971e9da296bd4e357029386 100644 (file)
--- a/include/llvm/ADT/PostOrderIterator.h
+++ b/include/llvm/ADT/PostOrderIterator.h
@@ -39,14 +39,14 @@ class po_iterator : public forward_iterator<typename GT::NodeType, ptrdiff_t> {
       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 */ }

diff --git a/lib/CodeGen/InstrSched/SchedGraphCommon.cpp b/lib/CodeGen/InstrSched/SchedGraphCommon.cpp
index 0ad5f5844e7e3754231b895261020723cd63690f..9cae7c616cb89bcd0c207533648eb92ac869c343 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedGraphCommon.cpp
+++ b/lib/CodeGen/InstrSched/SchedGraphCommon.cpp
@@ -14,6 +14,7 @@
 
 #include "llvm/CodeGen/SchedGraphCommon.h"
 #include "llvm/ADT/STLExtras.h"
+#include <algorithm>
 #include <iostream>
 
 namespace llvm {

diff --git a/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp b/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp
index 5bdcc9afcf28dd2707819056ddbec5adb504448e..17b38553685ba59a47c742fa10e7415c2afdb54a 100644 (file)
--- a/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp
+++ b/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp
@@ -18,6 +18,7 @@
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Support/Debug.h"
 #include <cstdlib>
+#include <algorithm>
 using namespace llvm;
 
 MSchedGraphNode::MSchedGraphNode(const MachineInstr* inst, 
@@ -67,7 +68,7 @@ bool MSchedGraphNode::isSuccessor(MSchedGraphNode *succ) {
 
 
 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;

diff --git a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
index 9ad1e4ce4bd677ca2b87432f15876d570b07fd85..10d7e9bf5757ccd7d00f72b9ff93efce969768f4 100644 (file)
--- a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
+++ b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
@@ -25,6 +25,7 @@
 #include "llvm/Support/GraphWriter.h"
 #include "llvm/ADT/StringExtras.h"
 #include <cmath>
+#include <algorithm>
 #include <fstream>
 #include <sstream>
 #include <utility>
@@ -580,7 +581,7 @@ void ModuloSchedulingPass::addReccurrence(std::vector<MSchedGraphNode*> &recurre
     if(R->second.size() == recurrence.size()) {
       
       for(std::vector<MSchedGraphNode*>::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 @@ void ModuloSchedulingPass::findAllReccurrences(MSchedGraphNode *node,
                                               std::vector<MSchedGraphNode*> &visitedNodes,
                                               int II) {
 
-  if(find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) {
+  if(std::find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) {
     std::vector<MSchedGraphNode*> recurrence;
     bool first = true;
     int delay = 0;
@@ -714,7 +715,7 @@ void ModuloSchedulingPass::computePartialOrder() {
     for(std::vector<MSchedGraphNode*>::const_iterator N = I->second.begin(), NE = I->second.end(); N != NE; ++N) {
       bool found = false;
       for(std::vector<std::vector<MSchedGraphNode*> >::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 @@ void ModuloSchedulingPass::computePartialOrder() {
            //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<std::vector<MSchedGraphNode*> >::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 @@ void ModuloSchedulingPass::computePartialOrder() {
     bool found = false;
     //Check if its already in our partial order, if not add it to the final vector
     for(std::vector<std::vector<MSchedGraphNode*> >::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::computePartialOrder() {
 void ModuloSchedulingPass::predIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &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 @@ void ModuloSchedulingPass::predIntersect(std::vector<MSchedGraphNode*> &CurrentS
       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::predIntersect(std::vector<MSchedGraphNode*> &CurrentS
 void ModuloSchedulingPass::succIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &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 @@ void ModuloSchedulingPass::succIntersect(std::vector<MSchedGraphNode*> &CurrentS
       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 @@ void ModuloSchedulingPass::orderNodes() {
          }
          
          //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 @@ void ModuloSchedulingPass::orderNodes() {
                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 @@ void ModuloSchedulingPass::orderNodes() {
          
 
          //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 @@ void ModuloSchedulingPass::orderNodes() {
                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);
            }

diff --git a/lib/Support/DynamicLinker.cpp b/lib/Support/DynamicLinker.cpp
index a6593034c7e6776c985ae1d4dffae66085739e4e..1ebe3f2e41222676fc70ffcea516e5776e5deec1 100644 (file)
--- a/lib/Support/DynamicLinker.cpp
+++ b/lib/Support/DynamicLinker.cpp
@@ -21,8 +21,9 @@
 #include "llvm/Support/DynamicLinker.h"
 #include "llvm/Config/dlfcn.h"
 #include "llvm/Config/windows.h"
-#include <cassert>
 #include <vector>
+#include <cassert>
+#include <cstdio>
 using namespace llvm;
 
 #if defined(HAVE_WINDOWS_H)

diff --git a/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp b/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp
index 0ad5f5844e7e3754231b895261020723cd63690f..9cae7c616cb89bcd0c207533648eb92ac869c343 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp
+++ b/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp
@@ -14,6 +14,7 @@
 
 #include "llvm/CodeGen/SchedGraphCommon.h"
 #include "llvm/ADT/STLExtras.h"
+#include <algorithm>
 #include <iostream>
 
 namespace llvm {

diff --git a/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp b/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp
index 5bdcc9afcf28dd2707819056ddbec5adb504448e..17b38553685ba59a47c742fa10e7415c2afdb54a 100644 (file)
--- a/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp
+++ b/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp
@@ -18,6 +18,7 @@
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Support/Debug.h"
 #include <cstdlib>
+#include <algorithm>
 using namespace llvm;
 
 MSchedGraphNode::MSchedGraphNode(const MachineInstr* inst, 
@@ -67,7 +68,7 @@ bool MSchedGraphNode::isSuccessor(MSchedGraphNode *succ) {
 
 
 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;

diff --git a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
index 9ad1e4ce4bd677ca2b87432f15876d570b07fd85..10d7e9bf5757ccd7d00f72b9ff93efce969768f4 100644 (file)
--- a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
+++ b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
@@ -25,6 +25,7 @@
 #include "llvm/Support/GraphWriter.h"
 #include "llvm/ADT/StringExtras.h"
 #include <cmath>
+#include <algorithm>
 #include <fstream>
 #include <sstream>
 #include <utility>
@@ -580,7 +581,7 @@ void ModuloSchedulingPass::addReccurrence(std::vector<MSchedGraphNode*> &recurre
     if(R->second.size() == recurrence.size()) {
       
       for(std::vector<MSchedGraphNode*>::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 @@ void ModuloSchedulingPass::findAllReccurrences(MSchedGraphNode *node,
                                               std::vector<MSchedGraphNode*> &visitedNodes,
                                               int II) {
 
-  if(find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) {
+  if(std::find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) {
     std::vector<MSchedGraphNode*> recurrence;
     bool first = true;
     int delay = 0;
@@ -714,7 +715,7 @@ void ModuloSchedulingPass::computePartialOrder() {
     for(std::vector<MSchedGraphNode*>::const_iterator N = I->second.begin(), NE = I->second.end(); N != NE; ++N) {
       bool found = false;
       for(std::vector<std::vector<MSchedGraphNode*> >::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 @@ void ModuloSchedulingPass::computePartialOrder() {
            //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<std::vector<MSchedGraphNode*> >::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 @@ void ModuloSchedulingPass::computePartialOrder() {
     bool found = false;
     //Check if its already in our partial order, if not add it to the final vector
     for(std::vector<std::vector<MSchedGraphNode*> >::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::computePartialOrder() {
 void ModuloSchedulingPass::predIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &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 @@ void ModuloSchedulingPass::predIntersect(std::vector<MSchedGraphNode*> &CurrentS
       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::predIntersect(std::vector<MSchedGraphNode*> &CurrentS
 void ModuloSchedulingPass::succIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &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 @@ void ModuloSchedulingPass::succIntersect(std::vector<MSchedGraphNode*> &CurrentS
       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 @@ void ModuloSchedulingPass::orderNodes() {
          }
          
          //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 @@ void ModuloSchedulingPass::orderNodes() {
                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 @@ void ModuloSchedulingPass::orderNodes() {
          
 
          //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 @@ void ModuloSchedulingPass::orderNodes() {
                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);
            }

diff --git a/lib/Transforms/ExprTypeConvert.cpp b/lib/Transforms/ExprTypeConvert.cpp
index 779e23c1992685c5bbf8ec8e93dd3f562ff55162..72733570d2b61978d8d5479b0e66f233f78ffd99 100644 (file)
--- a/lib/Transforms/ExprTypeConvert.cpp
+++ b/lib/Transforms/ExprTypeConvert.cpp
@@ -828,7 +828,7 @@ static bool OperandConvertibleToType(User *U, Value *V, const Type *Ty,
   }
 
   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 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
 
     } else {                   // Changing an argument, must be in vararg area
       std::vector<Value*>::iterator OI =
-        find(Params.begin(), Params.end(), OldVal);
+        std::find(Params.begin(), Params.end(), OldVal);
       assert (OI != Params.end() && "Not using value!");
 
       *OI = NewVal;