From d050e456317f751c567d9100b5d3a6ca357a6469 Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Tue, 9 Jul 2019 15:24:19 +0000 Subject: [PATCH] [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 --- llvm/unittests/ADT/DenseMapTest.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/llvm/unittests/ADT/DenseMapTest.cpp b/llvm/unittests/ADT/DenseMapTest.cpp index 383c2a59a24b..7e85ce7011fd 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