diff options
| author | Sam Roth <s-roth@onu.edu> | 2017-01-23 13:49:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 13:49:32 -0500 |
| commit | 3134af23d713a1f85cb122b30353ebdefa2bdccc (patch) | |
| tree | 9f161324a4ea595247300ac5ad4bfa7fc2bcc4ae /googletest/test/gtest-printers_test.cc | |
| parent | 32b4a9b39079ca4bf4ff539246302652d86e777f (diff) | |
| parent | 5e7fd50e17b6edf1cadff973d0ec68966cf3265e (diff) | |
| download | googletest-3134af23d713a1f85cb122b30353ebdefa2bdccc.tar.gz googletest-3134af23d713a1f85cb122b30353ebdefa2bdccc.tar.bz2 googletest-3134af23d713a1f85cb122b30353ebdefa2bdccc.zip | |
Merge pull request #1 from google/master
Syncing my branch
Diffstat (limited to 'googletest/test/gtest-printers_test.cc')
| -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 3e97cc24..af69f282 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 |