diff options
author | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-05-28 21:48:28 +0000 |
---|---|---|
committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-05-28 21:48:28 +0000 |
commit | c5553a3d18f80132b9079c5504bc0aa1f7f950a0 (patch) | |
tree | d3c955211f6f58b74acf17ed8a98fb98f268ab3f /src/google/protobuf/stubs/common.cc | |
parent | e7f2937962283d69fd1153ebca46b615fca4a2a2 (diff) |
Down-integrate pending changes from internal repository after previous release.
Diffstat (limited to 'src/google/protobuf/stubs/common.cc')
-rw-r--r-- | src/google/protobuf/stubs/common.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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. } |