summaryrefslogtreecommitdiff
path: root/include/llvm
diff options
context:
space:
mode:
authorAlkis Evlogimenos <alkis@evlogimenos.com>2004-09-03 18:19:51 +0000
committerAlkis Evlogimenos <alkis@evlogimenos.com>2004-09-03 18:19:51 +0000
commit20aa474f8fbebde588edc101b90e834df28ce4ce (patch)
treeb164de8ce2a8013f8996b831ba998e930f55182c /include/llvm
parentceca90415f982efe844b37b0cb3e5a228a0b7c57 (diff)
downloadllvm-20aa474f8fbebde588edc101b90e834df28ce4ce.tar.gz
llvm-20aa474f8fbebde588edc101b90e834df28ce4ce.tar.bz2
llvm-20aa474f8fbebde588edc101b90e834df28ce4ce.tar.xz
Fixes to make LLVM compile with vc7.1.
Patch contributed by Paolo Invernizzi! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16152 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm')
-rw-r--r--include/llvm/Analysis/IntervalIterator.h2
-rw-r--r--include/llvm/ExecutionEngine/ExecutionEngine.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/llvm/Analysis/IntervalIterator.h b/include/llvm/Analysis/IntervalIterator.h
index 091959f25f..6250d94a96 100644
--- a/include/llvm/Analysis/IntervalIterator.h
+++ b/include/llvm/Analysis/IntervalIterator.h
@@ -177,7 +177,7 @@ private:
E = GT::child_end(Node); I != E; ++I)
ProcessNode(Int, getSourceGraphNode(OrigContainer, *I));
- IntStack.push(make_pair(Int, succ_begin(Int)));
+ IntStack.push(std::make_pair(Int, succ_begin(Int)));
return true;
}
diff --git a/include/llvm/ExecutionEngine/ExecutionEngine.h b/include/llvm/ExecutionEngine/ExecutionEngine.h
index 2e4b3deda6..884d6b2df7 100644
--- a/include/llvm/ExecutionEngine/ExecutionEngine.h
+++ b/include/llvm/ExecutionEngine/ExecutionEngine.h
@@ -18,6 +18,7 @@
#include <vector>
#include <map>
#include <cassert>
+#include <string>
namespace llvm {