diff options
Diffstat (limited to 'include/gmock/internal/gmock-port.h')
| -rw-r--r-- | include/gmock/internal/gmock-port.h | 4 |
1 files changed, 1 insertions, 3 deletions
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 |