diff options
author | Chris <chrisjohnsonmail@gmail.com> | 2019-01-03 21:15:19 -0600 |
---|---|---|
committer | Chris <chrisjohnsonmail@gmail.com> | 2019-01-03 21:15:19 -0600 |
commit | fd1c7976aee83718db9934d0f5063a52e10f5db6 (patch) | |
tree | 81403e3fcf0190773dc3e7dbb42bb7c51795c74e /googlemock/src/gmock-internal-utils.cc | |
parent | 23533009b872e4cb6ae93471ff4e9280a2d51f62 (diff) | |
parent | 0ffa5f9779fc3a1b18d4931484b46825d952821d (diff) | |
download | googletest-fd1c7976aee83718db9934d0f5063a52e10f5db6.tar.gz googletest-fd1c7976aee83718db9934d0f5063a52e10f5db6.tar.bz2 googletest-fd1c7976aee83718db9934d0f5063a52e10f5db6.zip |
Merge branch 'chore/fix_library_json' of https://github.com/ciband/googletest 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:"; |