From 804ff192731d217fc82d4e63070dda060de02ebe Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Mon, 10 Mar 2014 02:33:17 +0000 Subject: [PATCH] ADT/PointerIntPairTest.cpp: Appease msc17. - Use constructor instead of initializer list. - Disable ManyUnusedBits for now. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203436 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/ADT/PointerIntPairTest.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unittests/ADT/PointerIntPairTest.cpp b/unittests/ADT/PointerIntPairTest.cpp index 3c472b27919..296d47590d7 100644 --- a/unittests/ADT/PointerIntPairTest.cpp +++ b/unittests/ADT/PointerIntPairTest.cpp @@ -19,7 +19,7 @@ class PointerIntPairTest : public testing::Test { }; TEST_F(PointerIntPairTest, GetSet) { - PointerIntPair Pair{this, 1U}; + PointerIntPair Pair(this, 1U); EXPECT_EQ(this, Pair.getPointer()); EXPECT_EQ(1U, Pair.getInt()); @@ -42,6 +42,7 @@ TEST_F(PointerIntPairTest, DefaultInitialize) { EXPECT_EQ(0U, Pair.getInt()); } +#if !(defined(_MSC_VER) && _MSC_VER==1700) TEST_F(PointerIntPairTest, ManyUnusedBits) { // In real code this would be a word-sized integer limited to 31 bits. struct Fixnum31 { @@ -70,5 +71,6 @@ TEST_F(PointerIntPairTest, ManyUnusedBits) { EXPECT_EQ(FixnumPointerTraits::NumLowBitsAvailable - 1, PointerLikeTypeTraits::NumLowBitsAvailable); } +#endif } // end anonymous namespace -- 2.34.1