summaryrefslogtreecommitdiffstats
path: root/googletest/test/googletest-port-test.cc
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2019-04-01 16:06:49 (GMT)
committerGennadiy Civil <misterg@google.com>2019-04-01 19:05:10 (GMT)
commitd9825431313a8ce466489cfc19f93820aee319ee (patch)
tree1e990b270e58ee75ca914c08eb7e0bcbb711737d /googletest/test/googletest-port-test.cc
parent5b752b1947bbb4df571848a1afad00f9b06f30e0 (diff)
downloadgoogletest-d9825431313a8ce466489cfc19f93820aee319ee.zip
googletest-d9825431313a8ce466489cfc19f93820aee319ee.tar.gz
googletest-d9825431313a8ce466489cfc19f93820aee319ee.tar.bz2
Googletest export
Remove support for "global" ::string and ::wstring types. This support existed for legacy codebases that existed from before namespaces where a thing. It is no longer necessary. PiperOrigin-RevId: 241335738
Diffstat (limited to 'googletest/test/googletest-port-test.cc')
-rw-r--r--googletest/test/googletest-port-test.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/googletest/test/googletest-port-test.cc b/googletest/test/googletest-port-test.cc
index 39b643b..6cb791e 100644
--- a/googletest/test/googletest-port-test.cc
+++ b/googletest/test/googletest-port-test.cc
@@ -388,12 +388,7 @@ class RETest : public ::testing::Test {};
// Defines StringTypes as the list of all string types that class RE
// supports.
-typedef testing::Types<
- ::std::string,
-# if GTEST_HAS_GLOBAL_STRING
- ::string,
-# endif // GTEST_HAS_GLOBAL_STRING
- const char*> StringTypes;
+typedef testing::Types< ::std::string, const char*> StringTypes;
TYPED_TEST_SUITE(RETest, StringTypes);