diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-03-05 19:17:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 19:17:40 (GMT) |
| commit | 731dbc4a7879b66a14e41c3fbb14101cb30865eb (patch) | |
| tree | 0d53f6f7ff003ad62c1a423e4954b4afb067abfc /googletest/test | |
| parent | c3a007f3cf1ac6d2aff1fde2119ab6862c57b2ef (diff) | |
| parent | 94d78ea14b706bc46f35fc4ec93cb9ce2054b722 (diff) | |
| download | googletest-731dbc4a7879b66a14e41c3fbb14101cb30865eb.zip googletest-731dbc4a7879b66a14e41c3fbb14101cb30865eb.tar.gz googletest-731dbc4a7879b66a14e41c3fbb14101cb30865eb.tar.bz2 | |
Merge pull request #1490 from gennadiycivil/master
merges-4
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest-printers_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc index 60a8d03..cd7c5d3 100644 --- a/googletest/test/gtest-printers_test.cc +++ b/googletest/test/gtest-printers_test.cc @@ -239,7 +239,7 @@ 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 // defines them in namespace std. MSVC defines them in ::stdext. GCC |