Merge branch 'master' into int3

This commit is contained in:
Gennadiy Civil 2018-04-03 16:31:59 -04:00 committed by GitHub
commit 98687b7847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7572,7 +7572,7 @@ TEST(IsHashTable, Basic) {
EXPECT_TRUE(testing::internal::IsHashTable<std::unordered_set<int>>::value); EXPECT_TRUE(testing::internal::IsHashTable<std::unordered_set<int>>::value);
#endif // GTEST_LANG_CXX11 #endif // GTEST_LANG_CXX11
#if GTEST_HAS_HASH_SET_ #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_ #endif // GTEST_HAS_HASH_SET_
} }