Fix VC++ build errors.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23431 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp
index d5153ca..ae38830 100644
--- a/utils/TableGen/DAGISelEmitter.cpp
+++ b/utils/TableGen/DAGISelEmitter.cpp
@@ -15,6 +15,7 @@
#include "Record.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/Debug.h"
+#include <algorithm>
#include <set>
using namespace llvm;
@@ -1128,6 +1129,7 @@
} else {
N->dump();
assert(0 && "Unknown node in result pattern!");
+ return ~0U;
}
}
diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index fb2c37e..ac39ecf 100644
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -212,10 +212,10 @@
RelativePath="..\..\include\llvm\CodeGen\IntrinsicLowering.h">
</File>
<File
- RelativePath="..\..\lib\CodeGen\LiveInterval.h">
+ RelativePath="..\..\include\llvm\CodeGen\LiveInterval.h">
</File>
<File
- RelativePath="..\..\lib\CodeGen\LiveIntervalAnalysis.h">
+ RelativePath="..\..\include\llvm\CodeGen\LiveIntervalAnalysis.h">
</File>
<File
RelativePath="..\..\include\llvm\CodeGen\LiveVariables.h">