From 728aa760fdb0e0ddfe1f6a6c0f48a5d625189c8d Mon Sep 17 00:00:00 2001 From: "liujisi@google.com" Date: Wed, 19 Dec 2012 02:37:59 +0000 Subject: Down-integrate form internal opensource branch --- src/google/protobuf/stubs/common.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/google/protobuf/stubs/common.cc') diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc index 0112d992..e6045026 100644 --- a/src/google/protobuf/stubs/common.cc +++ b/src/google/protobuf/stubs/common.cc @@ -183,11 +183,11 @@ void LogMessage::Finish() { if (level_ != LOGLEVEL_FATAL) { InitLogSilencerCountOnce(); MutexLock lock(log_silencer_count_mutex_); - suppress = internal::log_silencer_count_ > 0; + suppress = log_silencer_count_ > 0; } if (!suppress) { - internal::log_handler_(level_, filename_, line_, message_); + log_handler_(level_, filename_, line_, message_); } if (level_ == LOGLEVEL_FATAL) { -- cgit v1.2.3