diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2016-11-02 17:54:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 17:54:19 (GMT) |
| commit | 3447fc31b4eea1fbcb86fa0e2f5d9ed9f38776bf (patch) | |
| tree | 9d3aefae0b1577f9cca10908488fea164bd87601 /googletest/test | |
| parent | ecd530865cefdfa7dea58e84f6aa1b548950363d (diff) | |
| parent | 3429113886a93087047143f1b5a92efc78e1397f (diff) | |
| download | googletest-3447fc31b4eea1fbcb86fa0e2f5d9ed9f38776bf.zip googletest-3447fc31b4eea1fbcb86fa0e2f5d9ed9f38776bf.tar.gz googletest-3447fc31b4eea1fbcb86fa0e2f5d9ed9f38776bf.tar.bz2 | |
Merge pull request #728 from DanAlbert/tuple-stlport
Fix a test to compile when tuple isn't available.
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest-printers_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc index 3e97cc2..af69f28 100644 --- a/googletest/test/gtest-printers_test.cc +++ b/googletest/test/gtest-printers_test.cc @@ -211,7 +211,9 @@ using ::testing::internal::Strings; using ::testing::internal::UniversalPrint; using ::testing::internal::UniversalPrinter; using ::testing::internal::UniversalTersePrint; +#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ using ::testing::internal::UniversalTersePrintTupleFieldsToStrings; +#endif using ::testing::internal::string; // The hash_* classes are not part of the C++ standard. STLport |