summaryrefslogtreecommitdiffstats
path: root/googlemock/src/gmock-internal-utils.cc
diff options
context:
space:
mode:
authorChris Johnson <chrisjohnsonmail@gmail.com>2019-08-27 23:00:04 (GMT)
committerGitHub <noreply@github.com>2019-08-27 23:00:04 (GMT)
commit85f059f03d56ce82cf8f68cf7505b695a0c730c2 (patch)
treee715b911578e831d7a3fdf46bbf2bdbece4fafc3 /googlemock/src/gmock-internal-utils.cc
parent130e5aa86a7a71501cf8fa7cd6f507928f01bd79 (diff)
parentfdd6a1dc8c74bf37211c14a1b2e4b64755bb3380 (diff)
downloadgoogletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.zip
googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.gz
googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.bz2
Merge pull request #3 from google/master
Update master
Diffstat (limited to 'googlemock/src/gmock-internal-utils.cc')
-rw-r--r--googlemock/src/gmock-internal-utils.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc
index 937d830..1292e1d 100644
--- a/googlemock/src/gmock-internal-utils.cc
+++ b/googlemock/src/gmock-internal-utils.cc
@@ -123,7 +123,7 @@ GTEST_API_ FailureReporterInterface* GetFailureReporter() {
// Protects global resources (stdout in particular) used by Log().
static GTEST_DEFINE_STATIC_MUTEX_(g_log_mutex);
-// Returns true iff a log with the given severity is visible according
+// Returns true if a log with the given severity is visible according
// to the --gmock_verbose flag.
GTEST_API_ bool LogIsVisible(LogSeverity severity) {
if (GMOCK_FLAG(verbose) == kInfoVerbosity) {
@@ -139,7 +139,7 @@ GTEST_API_ bool LogIsVisible(LogSeverity severity) {
}
}
-// Prints the given message to stdout iff 'severity' >= the level
+// Prints the given message to stdout if 'severity' >= the level
// specified by the --gmock_verbose flag. If stack_frames_to_skip >=
// 0, also prints the stack trace excluding the top
// stack_frames_to_skip frames. In opt mode, any positive
@@ -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:";