Use `llvm::next' instead of `next' to make VC++ 2010 happy.
authorOscar Fuentes <ofv@wanadoo.es>
Sun, 30 May 2010 13:14:21 +0000 (13:14 +0000)
committerOscar Fuentes <ofv@wanadoo.es>
Sun, 30 May 2010 13:14:21 +0000 (13:14 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105168 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/LatencyPriorityQueue.cpp
lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp

index 03b4eab93dca955d410d18be50086caef7dee7c1..b9527fafbee8f4b9b0d5316d62152d1a8cee68ce 100644 (file)
@@ -118,7 +118,7 @@ void LatencyPriorityQueue::AdjustPriorityOfUnscheduledPreds(SUnit *SU) {
 SUnit *LatencyPriorityQueue::pop() {
   if (empty()) return NULL;
   std::vector<SUnit *>::iterator Best = Queue.begin();
-  for (std::vector<SUnit *>::iterator I = next(Queue.begin()),
+  for (std::vector<SUnit *>::iterator I = llvm::next(Queue.begin()),
        E = Queue.end(); I != E; ++I)
     if (Picker(*Best, *I))
       Best = I;
index ca723bea8873e403757414837686800533d93d51..f5d4d658850f0b06eb23b159ab819caf97e048e8 100644 (file)
@@ -1116,7 +1116,7 @@ namespace {
     SUnit *pop() {
       if (empty()) return NULL;
       std::vector<SUnit *>::iterator Best = Queue.begin();
-      for (std::vector<SUnit *>::iterator I = next(Queue.begin()),
+      for (std::vector<SUnit *>::iterator I = llvm::next(Queue.begin()),
            E = Queue.end(); I != E; ++I)
         if (Picker(*Best, *I))
           Best = I;