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 /include/gmock | |
| 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 'include/gmock')
| -rw-r--r-- | include/gmock/gmock-actions.h | 2 | ||||
| -rw-r--r-- | include/gmock/gmock-printers.h | 2 | ||||
| -rw-r--r-- | include/gmock/internal/gmock-port.h | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h index 214b2912..d965e108 100644 --- a/include/gmock/gmock-actions.h +++ b/include/gmock/gmock-actions.h @@ -117,9 +117,7 @@ GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(void, ); // NOLINT #if GTEST_HAS_GLOBAL_STRING GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::string, ""); #endif // GTEST_HAS_GLOBAL_STRING -#if GTEST_HAS_STD_STRING GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::std::string, ""); -#endif // GTEST_HAS_STD_STRING GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(bool, false); GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned char, '\0'); GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed char, '\0'); diff --git a/include/gmock/gmock-printers.h b/include/gmock/gmock-printers.h index 9f024d0c..cda3545a 100644 --- a/include/gmock/gmock-printers.h +++ b/include/gmock/gmock-printers.h @@ -409,12 +409,10 @@ inline void PrintTo(const ::string& s, ::std::ostream* os) { } #endif // GTEST_HAS_GLOBAL_STRING -#if GTEST_HAS_STD_STRING void PrintStringTo(const ::std::string&s, ::std::ostream* os); inline void PrintTo(const ::std::string& s, ::std::ostream* os) { PrintStringTo(s, os); } -#endif // GTEST_HAS_STD_STRING // Overloads for ::wstring and ::std::wstring. #if GTEST_HAS_GLOBAL_WSTRING diff --git a/include/gmock/internal/gmock-port.h b/include/gmock/internal/gmock-port.h index 649f838f..27b67a5c 100644 --- a/include/gmock/internal/gmock-port.h +++ b/include/gmock/internal/gmock-port.h @@ -198,10 +198,8 @@ struct CompileAssert { #if GTEST_HAS_GLOBAL_STRING typedef ::string string; -#elif GTEST_HAS_STD_STRING -typedef ::std::string string; #else -#error "Google Mock requires ::std::string to compile." +typedef ::std::string string; #endif // GTEST_HAS_GLOBAL_STRING #if GTEST_HAS_GLOBAL_WSTRING |