From 788a6079e100b8247e609aec5e58edb6c837bd43 Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Fri, 27 Aug 2010 02:49:45 +0000 Subject: Fix the msvs 2010 build. The Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 implements parts of C++0x based on the draft standard. An old version of the draft had a bug that makes std::pair(something, 0) fail to compile. This is because the template pair(U&& x, V&& y) constructor is selected, even though it later fails to implicitly convert U and V to frist_type and second_type. This has been fixed in n3090, but it seems that Microsoft is not going to update msvc. llvm-svn: 112257 --- llvm/tools/llvm-diff/DifferenceEngine.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'llvm/tools/llvm-diff') diff --git a/llvm/tools/llvm-diff/DifferenceEngine.h b/llvm/tools/llvm-diff/DifferenceEngine.h index bc331317344..1609bd5c108 100644 --- a/llvm/tools/llvm-diff/DifferenceEngine.h +++ b/llvm/tools/llvm-diff/DifferenceEngine.h @@ -79,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 { -- cgit v1.2.3