google/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-02 00:57:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removes uses of GTEST_HAS_STD_STRING.

Browse Source
This commit is contained in:
zhanyong.wan
2009-12-16 23:36:08 +00:00
parent 5a3c1691a1
commit 39bf784f83
6 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/gmock/internal/gmock-port.h
View File

@@ -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