diff options
Diffstat (limited to 'googletest/test/googletest-port-test.cc')
| -rw-r--r-- | googletest/test/googletest-port-test.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/googletest/test/googletest-port-test.cc b/googletest/test/googletest-port-test.cc index 39b643b6..6cb791e5 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); |
