diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-03 16:28:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 16:28:53 -0400 |
| commit | 7d955430d1f5fa3652000e407f2a46a9bfccbca3 (patch) | |
| tree | 79a99de025fac66049f6917c9f273d2d7a75d943 | |
| parent | ac783bd787a3009e1a9440b3f7a94ef19f84de06 (diff) | |
| parent | 75ea13deb2a646bbc70ff398f4ffaff9738cbdea (diff) | |
| download | googletest-7d955430d1f5fa3652000e407f2a46a9bfccbca3.tar.gz googletest-7d955430d1f5fa3652000e407f2a46a9bfccbca3.tar.bz2 googletest-7d955430d1f5fa3652000e407f2a46a9bfccbca3.zip | |
Merge pull request #1541 from gennadiycivil/master
Upstream, 191344765
| -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_ } |