X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=unittests%2FADT%2FPointerIntPairTest.cpp;h=296d47590d788c7717ebb88d927f7510c4dab864;hp=3c472b2791971f7819278f1256dfaf4816fcf023;hb=804ff192731d217fc82d4e63070dda060de02ebe;hpb=2195ed675a215ee801233e0c76202f4c4da17a44

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<PointerIntPairTest *, 2> Pair{this, 1U};
+  PointerIntPair<PointerIntPairTest *, 2> 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<decltype(pair)>::NumLowBitsAvailable);
 }
+#endif
 
 } // end anonymous namespace