diff options
| author | Abseil Team <absl-team@google.com> | 2019-04-01 12:06:49 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-04-01 15:05:10 -0400 |
| commit | d9825431313a8ce466489cfc19f93820aee319ee (patch) | |
| tree | 1e990b270e58ee75ca914c08eb7e0bcbb711737d /googlemock/include/gmock/gmock-actions.h | |
| parent | 5b752b1947bbb4df571848a1afad00f9b06f30e0 (diff) | |
| download | googletest-d9825431313a8ce466489cfc19f93820aee319ee.tar.gz googletest-d9825431313a8ce466489cfc19f93820aee319ee.tar.bz2 googletest-d9825431313a8ce466489cfc19f93820aee319ee.zip | |
Googletest export
Remove support for "global" ::string and ::wstring types.
This support existed for legacy codebases that existed from before namespaces
where a thing. It is no longer necessary.
PiperOrigin-RevId: 241335738
Diffstat (limited to 'googlemock/include/gmock/gmock-actions.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-actions.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h index 8513e01f..37727c09 100644 --- a/googlemock/include/gmock/gmock-actions.h +++ b/googlemock/include/gmock/gmock-actions.h @@ -139,9 +139,6 @@ class BuiltInDefaultValue<T*> { } 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 GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::std::string, ""); GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(bool, false); GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned char, '\0'); |