[llvm] r203436 - ADT/PointerIntPairTest.cpp: Appease msc17.

NAKAMURA Takumi geek4civic at gmail.com
Sun Mar 9 19:33:17 PDT 2014


Author: chapuni
Date: Sun Mar  9 21:33:17 2014
New Revision: 203436

URL: http://llvm.org/viewvc/llvm-project?rev=203436&view=rev
Log:
ADT/PointerIntPairTest.cpp: Appease msc17.

  - Use constructor instead of initializer list.
  - Disable ManyUnusedBits for now.

Modified:
    llvm/trunk/unittests/ADT/PointerIntPairTest.cpp

Modified: llvm/trunk/unittests/ADT/PointerIntPairTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/PointerIntPairTest.cpp?rev=203436&r1=203435&r2=203436&view=diff
==============================================================================
--- llvm/trunk/unittests/ADT/PointerIntPairTest.cpp (original)
+++ llvm/trunk/unittests/ADT/PointerIntPairTest.cpp Sun Mar  9 21:33:17 2014
@@ -19,7 +19,7 @@ class PointerIntPairTest : public testin
 };
 
 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, DefaultInitia
   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, ManyUnusedBit
   EXPECT_EQ(FixnumPointerTraits::NumLowBitsAvailable - 1,
             PointerLikeTypeTraits<decltype(pair)>::NumLowBitsAvailable);
 }
+#endif
 
 } // end anonymous namespace





More information about the llvm-commits mailing list