Merge pull request #728 from DanAlbert/tuple-stlport
Fix a test to compile when tuple isn't available.
This commit is contained in:
commit
3447fc31b4
|
@ -211,7 +211,9 @@ using ::testing::internal::Strings;
|
||||||
using ::testing::internal::UniversalPrint;
|
using ::testing::internal::UniversalPrint;
|
||||||
using ::testing::internal::UniversalPrinter;
|
using ::testing::internal::UniversalPrinter;
|
||||||
using ::testing::internal::UniversalTersePrint;
|
using ::testing::internal::UniversalTersePrint;
|
||||||
|
#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
|
||||||
using ::testing::internal::UniversalTersePrintTupleFieldsToStrings;
|
using ::testing::internal::UniversalTersePrintTupleFieldsToStrings;
|
||||||
|
#endif
|
||||||
using ::testing::internal::string;
|
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
|
||||||
|
|
Loading…
Reference in New Issue
Block a user