commit b622c11f775e0fb147a5487bc4345b813f5a47f0
author Jeff Cohen <jeffc@jolt-lang.org> Mon Mar 05 00:00:42 2007 +0000
committer Jeff Cohen <jeffc@jolt-lang.org> Mon Mar 05 00:00:42 2007 +0000
tree a749bc824452c7d96d1f99328e9761cd68e85a7d
parent 2fbcc0714c505fa6573709e987489cb6f698ab61

Unbreak VC++ build.

llvm-svn: 34917

llvm/lib/Analysis/ConstantFolding.cpp

diff --git a/llvm/lib/Analysis/ConstantFolding.cpp b/llvm/lib/Analysis/ConstantFolding.cpp
index 01aedda..1288674 100644
--- a/llvm/lib/Analysis/ConstantFolding.cpp
+++ b/llvm/lib/Analysis/ConstantFolding.cpp
@@ -72,8 +72,8 @@
         // N = N + Offset
         Offset += TD.getStructLayout(ST)->getElementOffset(CI->getZExtValue());
       } else {
-        const SequentialType *ST = cast<SequentialType>(*GTI);
-        Offset += TD.getTypeSize(ST->getElementType())*CI->getSExtValue();
+        const SequentialType *SQT = cast<SequentialType>(*GTI);
+        Offset += TD.getTypeSize(SQT->getElementType())*CI->getSExtValue();
       }
     }
     return true;

llvm/lib/Analysis/IPA/Andersens.cpp

diff --git a/llvm/lib/Analysis/IPA/Andersens.cpp b/llvm/lib/Analysis/IPA/Andersens.cpp
index 52b1919..0a281c8 100644
--- a/llvm/lib/Analysis/IPA/Andersens.cpp
+++ b/llvm/lib/Analysis/IPA/Andersens.cpp
@@ -62,6 +62,7 @@
 #include "llvm/Analysis/Passes.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/Statistic.h"
+#include <algorithm>
 #include <set>
 using namespace llvm;