summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-03-05 18:51:39 (GMT)
committerGennadiy Civil <misterg@google.com>2018-03-05 18:51:39 (GMT)
commit83859284289f4c05bc9d8d98aa7db95fb2c608d6 (patch)
tree0d53f6f7ff003ad62c1a423e4954b4afb067abfc /googletest
parent73bf41299d197296e2a7f07d6c7c5c330f9b99d8 (diff)
downloadgoogletest-83859284289f4c05bc9d8d98aa7db95fb2c608d6.zip
googletest-83859284289f4c05bc9d8d98aa7db95fb2c608d6.tar.gz
googletest-83859284289f4c05bc9d8d98aa7db95fb2c608d6.tar.bz2
merges-3
Diffstat (limited to 'googletest')
-rw-r--r--googletest/test/gtest-printers_test.cc2
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