X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=unittests%2FADT%2FPointerIntPairTest.cpp;h=296d47590d788c7717ebb88d927f7510c4dab864;hp=3da31e7dfe7bfc56c33d63e75b4e8e02d4e9f8fc;hb=804ff192731d217fc82d4e63070dda060de02ebe;hpb=bc3b24269eabf6e9e54598c82ede3c741d8a6e61;ds=sidebyside diff --git a/unittests/ADT/PointerIntPairTest.cpp b/unittests/ADT/PointerIntPairTest.cpp index 3da31e7dfe7..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 { @@ -61,14 +62,15 @@ TEST_F(PointerIntPairTest, ManyUnusedBits) { PointerIntPair pair; EXPECT_EQ((uintptr_t)0, pair.getPointer().Value); - EXPECT_EQ(false, pair.getInt()); + EXPECT_FALSE(pair.getInt()); pair.setPointerAndInt({ 0x7FFFFFFF }, true ); EXPECT_EQ((uintptr_t)0x7FFFFFFF, pair.getPointer().Value); - EXPECT_EQ(true, pair.getInt()); + EXPECT_TRUE(pair.getInt()); EXPECT_EQ(FixnumPointerTraits::NumLowBitsAvailable - 1, PointerLikeTypeTraits::NumLowBitsAvailable); } +#endif } // end anonymous namespace