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/internal/gtest-death-test-internal.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/internal/gtest-death-test-internal.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-death-test-internal.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/googletest/include/gtest/internal/gtest-death-test-internal.h b/googletest/include/gtest/internal/gtest-death-test-internal.h index 0bf1fcf..68bd353 100644 --- a/googletest/include/gtest/internal/gtest-death-test-internal.h +++ b/googletest/include/gtest/internal/gtest-death-test-internal.h @@ -176,12 +176,6 @@ inline Matcher<const ::std::string&> MakeDeathTestMatcher( const ::std::string& regex) { return ContainsRegex(regex); } -#if GTEST_HAS_GLOBAL_STRING -inline Matcher<const ::std::string&> MakeDeathTestMatcher( - const ::string& regex) { - return ContainsRegex(regex); -} -#endif // If a Matcher<const ::std::string&> is passed to EXPECT_DEATH (etc.), it's // used directly. |