diff options
author | Abseil Team <absl-team@google.com> | 2019-04-01 16:06:49 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2019-04-01 19:05:10 (GMT) |
commit | d9825431313a8ce466489cfc19f93820aee319ee (patch) | |
tree | 1e990b270e58ee75ca914c08eb7e0bcbb711737d /googletest/include/gtest/gtest.h | |
parent | 5b752b1947bbb4df571848a1afad00f9b06f30e0 (diff) | |
download | googletest-d9825431313a8ce466489cfc19f93820aee319ee.zip googletest-d9825431313a8ce466489cfc19f93820aee319ee.tar.gz googletest-d9825431313a8ce466489cfc19f93820aee319ee.tar.bz2 |
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 'googletest/include/gtest/gtest.h')
-rw-r--r-- | googletest/include/gtest/gtest.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 5211a20..cedef93 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -73,21 +73,6 @@ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ /* class A needs to have dll-interface to be used by clients of class B */) -// Depending on the platform, different string classes are available. -// On Linux, in addition to ::std::string, Google also makes use of -// class ::string, which has the same interface as ::std::string, but -// has a different implementation. -// -// You can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that -// ::string is available AND is a distinct type to ::std::string, or -// define it to 0 to indicate otherwise. -// -// If ::std::string and ::string are the same class on your platform -// due to aliasing, you should define GTEST_HAS_GLOBAL_STRING to 0. -// -// If you do not define GTEST_HAS_GLOBAL_STRING, it is defined -// heuristically. - namespace testing { // Silence C4100 (unreferenced formal parameter) and 4805 @@ -2219,12 +2204,6 @@ class GTEST_API_ ScopedTrace { PushTrace(file, line, message ? message : "(null)"); } -#if GTEST_HAS_GLOBAL_STRING - ScopedTrace(const char* file, int line, const ::string& message) { - PushTrace(file, line, message); - } -#endif - ScopedTrace(const char* file, int line, const std::string& message) { PushTrace(file, line, message); } |