diff options
| author | Robin Lindén <dev@robinlinden.eu> | 2018-11-10 15:27:33 +0100 |
|---|---|---|
| committer | Robin Lindén <dev@robinlinden.eu> | 2018-11-10 15:27:33 +0100 |
| commit | c43603f288f40f21998a98f7e74c4206323f417e (patch) | |
| tree | 971a14178bfed4bf8c5fcd782c5a019df4435147 | |
| parent | 826656b25f62ed0a2fadc7c5dde303616e621c08 (diff) | |
| download | googletest-c43603f288f40f21998a98f7e74c4206323f417e.tar.gz googletest-c43603f288f40f21998a98f7e74c4206323f417e.tar.bz2 googletest-c43603f288f40f21998a98f7e74c4206323f417e.zip | |
Remove GTEST_HAS_HASH_SET/MAP check
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 9 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 9989b6b5..998be27b 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -598,15 +598,6 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; # include <time.h> // NOLINT #endif -// Determines if hash_map/hash_set are available. -// Only used for testing against those containers. -#if !defined(GTEST_HAS_HASH_MAP_) -# if defined(_MSC_VER) && (_MSC_VER < 1900) -# define GTEST_HAS_HASH_MAP_ 1 // Indicates that hash_map is available. -# define GTEST_HAS_HASH_SET_ 1 // Indicates that hash_set is available. -# endif // _MSC_VER -#endif // !defined(GTEST_HAS_HASH_MAP_) - // Determines whether clone(2) is supported. // Usually it will only be available on Linux, excluding // Linux on the Itanium architecture. diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 27f9d867..04dd87dc 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -7277,9 +7277,6 @@ TEST(IsHashTable, Basic) { EXPECT_FALSE(testing::internal::IsHashTable<NotReallyAHashTable>::value); EXPECT_FALSE(testing::internal::IsHashTable<std::vector<int>>::value); EXPECT_TRUE(testing::internal::IsHashTable<std::unordered_set<int>>::value); -#if GTEST_HAS_HASH_SET_ - EXPECT_TRUE(testing::internal::IsHashTable<__gnu_cxx::hash_set<int>>::value); -#endif // GTEST_HAS_HASH_SET_ } // Tests ArrayEq(). |