diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-12-16 23:36:08 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-12-16 23:36:08 +0000 |
| commit | 39bf784f839a9ffeb5f2d943435783633c5c0a6d (patch) | |
| tree | 6256fa31fda0398260dcf2f82feb2a0500638147 /test | |
| parent | 5a3c1691a1508577a69fd3111db15e43414918e6 (diff) | |
| download | googletest-39bf784f839a9ffeb5f2d943435783633c5c0a6d.tar.gz googletest-39bf784f839a9ffeb5f2d943435783633c5c0a6d.tar.bz2 googletest-39bf784f839a9ffeb5f2d943435783633c5c0a6d.zip | |
Removes uses of GTEST_HAS_STD_STRING.
Diffstat (limited to 'test')
| -rw-r--r-- | test/gmock-actions_test.cc | 4 | ||||
| -rw-r--r-- | test/gmock-printers_test.cc | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc index 1be4a16c..ea3c3100 100644 --- a/test/gmock-actions_test.cc +++ b/test/gmock-actions_test.cc @@ -165,9 +165,7 @@ TEST(BuiltInDefaultValueTest, IsEmptyStringForString) { EXPECT_EQ("", BuiltInDefaultValue< ::string>::Get()); #endif // GTEST_HAS_GLOBAL_STRING -#if GTEST_HAS_STD_STRING EXPECT_EQ("", BuiltInDefaultValue< ::std::string>::Get()); -#endif // GTEST_HAS_STD_STRING } // Tests that BuiltInDefaultValue<T>::Exists() returns true when T is a @@ -177,9 +175,7 @@ TEST(BuiltInDefaultValueTest, ExistsForString) { EXPECT_TRUE(BuiltInDefaultValue< ::string>::Exists()); #endif // GTEST_HAS_GLOBAL_STRING -#if GTEST_HAS_STD_STRING EXPECT_TRUE(BuiltInDefaultValue< ::std::string>::Exists()); -#endif // GTEST_HAS_STD_STRING } // Tests that BuiltInDefaultValue<const T>::Get() returns the same diff --git a/test/gmock-printers_test.cc b/test/gmock-printers_test.cc index e1956202..abfa923c 100644 --- a/test/gmock-printers_test.cc +++ b/test/gmock-printers_test.cc @@ -560,7 +560,6 @@ TEST(PrintStringTest, StringInGlobalNamespace) { } #endif // GTEST_HAS_GLOBAL_STRING -#if GTEST_HAS_STD_STRING // ::std::string. TEST(PrintStringTest, StringInStdNamespace) { const char s[] = "'\"\?\\\a\b\f\n\0\r\t\v\x7F\xFF a"; @@ -568,7 +567,6 @@ TEST(PrintStringTest, StringInStdNamespace) { EXPECT_EQ("\"'\\\"\\?\\\\\\a\\b\\f\\n\\0\\r\\t\\v\\x7F\\xFF a\\0\"", Print(str)); } -#endif // GTEST_HAS_STD_STRING // Tests printing ::wstring and ::std::wstring. |