diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-03-03 07:00:58 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-03-03 07:00:58 +0000 |
| commit | edf24a8be491b35f77951614d242458cf2c54669 (patch) | |
| tree | 46972f34a2aec92f90851bf9a3cedb5938dc31a5 | |
| parent | 2aaf3fcbc0761ede1e9624493a927f6772db4a37 (diff) | |
| download | llvm-edf24a8be491b35f77951614d242458cf2c54669.tar.gz llvm-edf24a8be491b35f77951614d242458cf2c54669.tar.bz2 llvm-edf24a8be491b35f77951614d242458cf2c54669.tar.xz | |
unittests/ADT/HashingTest.cpp: Temporarily disable a new test introduced in r151891, to appease msvc.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151970 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | unittests/ADT/HashingTest.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/unittests/ADT/HashingTest.cpp b/unittests/ADT/HashingTest.cpp index 449b6afae2..e68cffd909 100644 --- a/unittests/ADT/HashingTest.cpp +++ b/unittests/ADT/HashingTest.cpp @@ -42,6 +42,7 @@ using namespace llvm; namespace { +#if _MSC_VER != 1600 struct NonPOD { uint64_t x, y; NonPOD(uint64_t x, uint64_t y) : x(x), y(y) {} @@ -50,6 +51,7 @@ struct NonPOD { return hash_combine(obj.x, obj.y); } }; +#endif TEST(HashingTest, HashValueBasicTest) { @@ -84,6 +86,7 @@ TEST(HashingTest, HashValueBasicTest) { EXPECT_EQ(hash_value(std::make_pair(42, std::make_pair(43, 44))), hash_value(std::make_pair(std::make_pair(42, 43), 44))); +#if _MSC_VER != 1600 // Ensure that pairs which have padding bytes *inside* them don't get treated // this way. EXPECT_EQ(hash_combine('0', hash_combine(1ull, '2')), @@ -93,6 +96,7 @@ TEST(HashingTest, HashValueBasicTest) { NonPOD obj1(1, 2), obj2(3, 4), obj3(5, 6); EXPECT_EQ(hash_combine(obj1, hash_combine(obj2, obj3)), hash_value(std::make_pair(obj1, std::make_pair(obj2, obj3)))); +#endif } template <typename T, size_t N> T *begin(T (&arr)[N]) { return arr; } |