Fix the msvs 2010 build.

[oota-llvm.git] / tools / llvm-diff / DifferenceEngine.h

diff --git a/tools/llvm-diff/DifferenceEngine.h b/tools/llvm-diff/DifferenceEngine.h
index 9d0ebecc53d152fff629b8745b82d1b95084bd8c..1609bd5c108820c1bd29590db53ede1de5d72d31 100644 (file)
--- a/tools/llvm-diff/DifferenceEngine.h
+++ b/tools/llvm-diff/DifferenceEngine.h
@@ -15,17 +15,19 @@
 #ifndef _LLVM_DIFFERENCE_ENGINE_H_
 #define _LLVM_DIFFERENCE_ENGINE_H_
 
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringRef.h"
+
 #include <utility>
-#include <llvm/ADT/SmallVector.h>
-#include <llvm/ADT/StringRef.h>
 
 namespace llvm {
+  class Function;
+  class GlobalValue;
+  class Instruction;
   class LLVMContext;
   class Module;
-  class Function;
   class Twine;
   class Value;
-  class GlobalValue;
 
   /// A class for performing structural comparisons of LLVM assembly.
   class DifferenceEngine {
@@ -77,8 +79,14 @@ namespace llvm {
       void addMatch(Instruction *L, Instruction *R) {
         Diff.push_back(DiffRecord(L, R));
       }
-      void addLeft(Instruction *L) { Diff.push_back(DiffRecord(L, 0)); }
-      void addRight(Instruction *R) { Diff.push_back(DiffRecord(0, R)); }
+      void addLeft(Instruction *L) {
+        // HACK: VS 2010 has a bug in the stdlib that requires this.
+        Diff.push_back(DiffRecord(L, DiffRecord::second_type(0)));
+      }
+      void addRight(Instruction *R) {
+        // HACK: VS 2010 has a bug in the stdlib that requires this.
+        Diff.push_back(DiffRecord(DiffRecord::first_type(0), R));
+      }
 
       unsigned getNumLines() const { return Diff.size(); }
       DiffChange getLineKind(unsigned I) const {