Merge branch 'master' into int3
This commit is contained in:
		
						commit
						98687b7847
					
				@ -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_
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user