mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 04:30:23 +00:00
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<T1*, T2*>(something, 0) fail to compile. This is because the template<class U, class V> 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112257 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
d8d36e61fd
commit
a87c163355
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user