summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Pilgrim <llvm-dev@redking.me.uk>2019-07-09 15:24:19 +0000
committerSimon Pilgrim <llvm-dev@redking.me.uk>2019-07-09 15:24:19 +0000
commitd050e456317f751c567d9100b5d3a6ca357a6469 (patch)
tree2a3b3e4af8700ae8691477640b066ffdfa25a3d7
parente625eb9defc4dfa9c67704c0a5044b81d4807007 (diff)
downloadbcm5719-llvm-d050e456317f751c567d9100b5d3a6ca357a6469.tar.gz
bcm5719-llvm-d050e456317f751c567d9100b5d3a6ca357a6469.zip
[ADT] Remove MSVC-only "no two-phase name lookup" typename path.
Now that we've dropped VS2015 support (D64326) we can use the regular codepath as VS2017+ correctly handles it llvm-svn: 365502
-rw-r--r--llvm/unittests/ADT/DenseMapTest.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/llvm/unittests/ADT/DenseMapTest.cpp b/llvm/unittests/ADT/DenseMapTest.cpp
index 383c2a59a24..7e85ce7011f 100644
--- a/llvm/unittests/ADT/DenseMapTest.cpp
+++ b/llvm/unittests/ADT/DenseMapTest.cpp
@@ -119,17 +119,8 @@ TYPED_TEST(DenseMapTest, EmptyIntMapTest) {
// Lookup tests
EXPECT_FALSE(this->Map.count(this->getKey()));
EXPECT_TRUE(this->Map.find(this->getKey()) == this->Map.end());
-#if !defined(_MSC_VER) || defined(__clang__)
EXPECT_EQ(typename TypeParam::mapped_type(),
this->Map.lookup(this->getKey()));
-#else
- // MSVC, at least old versions, cannot parse the typename to disambiguate
- // TypeParam::mapped_type as a type. However, because MSVC doesn't implement
- // two-phase name lookup, it also doesn't require the typename. Deal with
- // this mutual incompatibility through specialized code.
- EXPECT_EQ(TypeParam::mapped_type(),
- this->Map.lookup(this->getKey()));
-#endif
}
// Constant map tests
OpenPOWER on IntegriCloud