Merge pull request #1541 from gennadiycivil/master

Upstream, 191344765

Merge pull request #1541 from gennadiycivil/master
Upstream, 191344765
7d955430 · Gennadiy Civil · GitHub · ac783bd7 · 75ea13de · 7d955430
Unverified Commit 7d955430 authored Apr 03, 2018 by Gennadiy Civil Committed by GitHub Apr 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

googletest/test/gtest_unittest.cc googletest/test/gtest_unittest.cc +1 -1

No files found.
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -7572,7 +7572,7 @@ TEST(IsHashTable, Basic) {
  EXPECT_TRUE(testing::internal::IsHashTable<std::unordered_set<int>>::value);
 #endif  // GTEST_LANG_CXX11
 #if GTEST_HAS_HASH_SET_
-  EXPECT_TRUE(testing::internal::IsHashTable<hash_set<int>>::value);
+  EXPECT_TRUE(testing::internal::IsHashTable<__gnu_cxx::hash_set<int>>::value);
 #endif  // GTEST_HAS_HASH_SET_
 }