[llvm-commits] CVS: llvm/lib/CodeGen/RegAllocLinearScan.cpp LiveIntervalAnalysis.cpp

[Alkis Evlogimenos]

Changes in directory llvm/lib/CodeGen:

RegAllocLinearScan.cpp updated: 1.94 -> 1.95
LiveIntervalAnalysis.cpp updated: 1.122 -> 1.123
---
Log message:

Fixes to make LLVM compile with vc7.1.

Patch contributed by Paolo Invernizzi!


---
Diffs of the changes:  (+3 -2)

Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.94 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.95
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.94	Thu Sep  2 16:23:32 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Fri Sep  3 13:19:51 2004
@@ -470,7 +470,7 @@
     // is active or inactive to properly update the PhysRegTracker
     // and the VirtRegMap
     IntervalPtrs::iterator it;
-    if ((it = find(active_.begin(), active_.end(), i)) != active_.end()) {
+    if ((it = std::find(active_.begin(), active_.end(), i)) != active_.end()) {
       active_.erase(it);
       if (MRegisterInfo::isPhysicalRegister(i->reg)) {
         prt_->delRegUse(i->reg);
@@ -483,7 +483,7 @@
         vrm_->clearVirt(i->reg);
       }
     }
-    else if ((it = find(inactive_.begin(), inactive_.end(), i)) != inactive_.end()) {
+    else if ((it = std::find(inactive_.begin(), inactive_.end(), i)) != inactive_.end()) {
       inactive_.erase(it);
       if (MRegisterInfo::isPhysicalRegister(i->reg))
         unhandled_.push(i);


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.122 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.123
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.122	Wed Sep  1 17:55:35 2004
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Fri Sep  3 13:19:51 2004
@@ -33,6 +33,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "VirtRegMap.h"
 #include <cmath>
+#include <algorithm>
 
 using namespace llvm;