diff options
| author | Abseil Team <absl-team@google.com> | 2018-12-28 06:03:51 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-01-02 16:51:33 -0500 |
| commit | f8b1c1af17750189b83c58f360c85268c0d95105 (patch) | |
| tree | 5785da224e6e5f05ecd044721e87138b681932a1 /googlemock/src | |
| parent | 933e5df283727911161f8fb56cc4773b08c12d3d (diff) | |
| download | googletest-f8b1c1af17750189b83c58f360c85268c0d95105.tar.gz googletest-f8b1c1af17750189b83c58f360c85268c0d95105.tar.bz2 googletest-f8b1c1af17750189b83c58f360c85268c0d95105.zip | |
Googletest export
Remove the #ifs for old, unsupported and buggy compilers:
* old versions of GCC & MSVC
* Symbian
PiperOrigin-RevId: 227116941
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-internal-utils.cc | 3 | ||||
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc index 937d830a..15946623 100644 --- a/googlemock/src/gmock-internal-utils.cc +++ b/googlemock/src/gmock-internal-utils.cc @@ -154,9 +154,6 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message, // Ensures that logs from different threads don't interleave. MutexLock l(&g_log_mutex); - // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is a - // macro. - if (severity == kWarning) { // Prints a GMOCK WARNING marker to make the warnings easily searchable. std::cout << "\nGMOCK WARNING:"; diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 5db774ed..b3d0cca2 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -592,9 +592,6 @@ class MockObjectRegistry { // object alive. Therefore we report any living object as test // failure, unless the user explicitly asked us to ignore it. ~MockObjectRegistry() { - // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is - // a macro. - if (!GMOCK_FLAG(catch_leaked_mocks)) return; |