diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-03 16:31:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 16:31:59 -0400 |
| commit | 98687b7847eb357b5bea1c7114bc35703b36f8e1 (patch) | |
| tree | 30c44c145e799a6f440c55a2dae026a3a7af15fb | |
| parent | 18be0124572f732e130bc93ec4526d02364b7172 (diff) | |
| parent | 7d955430d1f5fa3652000e407f2a46a9bfccbca3 (diff) | |
| download | googletest-98687b7847eb357b5bea1c7114bc35703b36f8e1.tar.gz googletest-98687b7847eb357b5bea1c7114bc35703b36f8e1.tar.bz2 googletest-98687b7847eb357b5bea1c7114bc35703b36f8e1.zip | |
Merge branch 'master' into int3
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 3791592b..58995a4f 100644 --- 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_ } |