[llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp PromoteMemoryToRegister.cpp

[Alkis Evlogimenos]

Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.50 -> 1.51
PromoteMemoryToRegister.cpp updated: 1.66 -> 1.67
---
Log message:

Fixes to make LLVM compile with vc7.1.

Patch contributed by Paolo Invernizzi!


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

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.50 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.51
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.50	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Fri Sep  3 13:19:51 2004
@@ -49,7 +49,7 @@
   // with incompatible values coming in from the two edges!
   //
   for (pred_iterator PI = pred_begin(Succ), PE = pred_end(Succ); PI != PE; ++PI)
-    if (find(BBPreds.begin(), BBPreds.end(), *PI) != BBPreds.end()) {
+    if (std::find(BBPreds.begin(), BBPreds.end(), *PI) != BBPreds.end()) {
       // Loop over all of the PHI nodes checking to see if there are
       // incompatible values coming in.
       for (BasicBlock::iterator I = Succ->begin();


Index: llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
diff -u llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.66 llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.67
--- llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.66	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp	Fri Sep  3 13:19:51 2004
@@ -24,6 +24,7 @@
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/StableBasicBlockNumbering.h"
 #include "llvm/ADT/StringExtras.h"
+#include <algorithm>
 using namespace llvm;
 
 /// isAllocaPromotable - Return true if this alloca is legal for promotion.