projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ADT/PointerIntPairTest.cpp: Appease msc17.
[oota-llvm.git]
/
unittests
/
ADT
/
PointerIntPairTest.cpp
diff --git
a/unittests/ADT/PointerIntPairTest.cpp
b/unittests/ADT/PointerIntPairTest.cpp
index 3da31e7dfe7bfc56c33d63e75b4e8e02d4e9f8fc..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 {
@@
-61,14
+62,15
@@
TEST_F(PointerIntPairTest, ManyUnusedBits) {
PointerIntPair<Fixnum31, 1, bool, FixnumPointerTraits> pair;
EXPECT_EQ((uintptr_t)0, pair.getPointer().Value);
PointerIntPair<Fixnum31, 1, bool, FixnumPointerTraits> 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);
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<decltype(pair)>::NumLowBitsAvailable);
}
EXPECT_EQ(FixnumPointerTraits::NumLowBitsAvailable - 1,
PointerLikeTypeTraits<decltype(pair)>::NumLowBitsAvailable);
}
+#endif
} // end anonymous namespace
} // end anonymous namespace