merges-3
This commit is contained in:
parent
73bf41299d
commit
8385928428
|
@ -239,7 +239,7 @@ using ::testing::internal::UniversalTersePrint;
|
||||||
#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
|
#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
|
||||||
using ::testing::internal::UniversalTersePrintTupleFieldsToStrings;
|
using ::testing::internal::UniversalTersePrintTupleFieldsToStrings;
|
||||||
#endif
|
#endif
|
||||||
using ::testing::internal::string;
|
|
||||||
|
|
||||||
// The hash_* classes are not part of the C++ standard. STLport
|
// The hash_* classes are not part of the C++ standard. STLport
|
||||||
// defines them in namespace std. MSVC defines them in ::stdext. GCC
|
// defines them in namespace std. MSVC defines them in ::stdext. GCC
|
||||||
|
|
Loading…
Reference in New Issue
Block a user