From c5553a3d18f80132b9079c5504bc0aa1f7f950a0 Mon Sep 17 00:00:00 2001 From: "liujisi@google.com" Date: Wed, 28 May 2014 21:48:28 +0000 Subject: Down-integrate pending changes from internal repository after previous release. --- 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 e6045026..a4de6363 100644 --- a/src/google/protobuf/stubs/common.cc +++ b/src/google/protobuf/stubs/common.cc @@ -115,8 +115,8 @@ void DefaultLogHandler(LogLevel level, const char* filename, int line, fflush(stderr); // Needed on MSVC. } -void NullLogHandler(LogLevel level, const char* filename, int line, - const string& message) { +void NullLogHandler(LogLevel /* level */, const char* /* filename */, + int /* line */, const string& /* message */) { // Nothing. } -- cgit v1.2.3