diff options
| author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2019-01-03 21:13:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 21:13:20 -0600 |
| commit | 0ffa5f9779fc3a1b18d4931484b46825d952821d (patch) | |
| tree | f31698c81378165e2fe639e93d6f54b252b1e2c2 /googlemock/src/gmock-internal-utils.cc | |
| parent | 0c0ca90382457859785a97bea5695093d72097dd (diff) | |
| parent | 3880b13e4c0b04ca88f69b9c93da6058bd836c34 (diff) | |
| download | googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.gz googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.bz2 googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.zip | |
Merge branch 'master' into chore/fix_library_json
Diffstat (limited to 'googlemock/src/gmock-internal-utils.cc')
| -rw-r--r-- | googlemock/src/gmock-internal-utils.cc | 3 |
1 files changed, 0 insertions, 3 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:"; |