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

diff --git a/unittests/ADT/PointerIntPairTest.cpp b/unittests/ADT/PointerIntPairTest.cpp
index 3c472b2791971f7819278f1256dfaf4816fcf023..296d47590d788c7717ebb88d927f7510c4dab864 100644 (file)
--- a/unittests/ADT/PointerIntPairTest.cpp
+++ b/unittests/ADT/PointerIntPairTest.cpp
@@ -19,7 +19,7 @@ class PointerIntPairTest : public testing::Test {
 };
 
 TEST_F(PointerIntPairTest, GetSet) {
 };
 
 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());
 
   EXPECT_EQ(this, Pair.getPointer());
   EXPECT_EQ(1U, Pair.getInt());
 


@@ -42,6 +42,7 @@ TEST_F(PointerIntPairTest, DefaultInitialize) {
   EXPECT_EQ(0U, Pair.getInt());
 }
 
   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 {
 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);
 }
   EXPECT_EQ(FixnumPointerTraits::NumLowBitsAvailable - 1,
             PointerLikeTypeTraits<decltype(pair)>::NumLowBitsAvailable);
 }

+#endif

 
 } // end anonymous namespace
 
 } // end anonymous namespace