summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2014-02-13 19:51:13 +0000
committerReid Kleckner <reid@kleckner.net>2014-02-13 19:51:13 +0000
commit0f679177e141868dfa4aa4aab23f10a0c67c3340 (patch)
tree216b2585b0ca39bfb9f62a708d762157ae764bdf /llvm
parent6bb55ba42b02fb7cd1ec10d005a4c8611c312370 (diff)
downloadbcm5719-llvm-0f679177e141868dfa4aa4aab23f10a0c67c3340.tar.gz
bcm5719-llvm-0f679177e141868dfa4aa4aab23f10a0c67c3340.zip
Tweak an _MSC_VER ifdef to use typename with clang in a unittest
In theory, Clang should figure out how to parse this correctly without typename, but since this is the last TU that Clang falls back on in the self-host, I'm going to compromise and check for __clang__. And now Clang can self-host on -win32 without fallback! The 'check' and 'check-clang' targets both pass. llvm-svn: 201358
Diffstat (limited to 'llvm')
-rw-r--r--llvm/unittests/ADT/DenseMapTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/unittests/ADT/DenseMapTest.cpp b/llvm/unittests/ADT/DenseMapTest.cpp
index 15eb6988f66..fa5d0f2e9ea 100644
--- a/llvm/unittests/ADT/DenseMapTest.cpp
+++ b/llvm/unittests/ADT/DenseMapTest.cpp
@@ -119,7 +119,7 @@ TYPED_TEST(DenseMapTest, EmptyIntMapTest) {
// Lookup tests
EXPECT_FALSE(this->Map.count(this->getKey()));
EXPECT_TRUE(this->Map.find(this->getKey()) == this->Map.end());
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) || defined(__clang__)
EXPECT_EQ(typename TypeParam::mapped_type(),
this->Map.lookup(this->getKey()));
#else
OpenPOWER on IntegriCloud