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/io/tokenizer.h | |
parent | e7f2937962283d69fd1153ebca46b615fca4a2a2 (diff) | |
download | protobuf-c5553a3d18f80132b9079c5504bc0aa1f7f950a0.tar.gz protobuf-c5553a3d18f80132b9079c5504bc0aa1f7f950a0.tar.bz2 protobuf-c5553a3d18f80132b9079c5504bc0aa1f7f950a0.zip |
Down-integrate pending changes from internal repository after previous release.
Diffstat (limited to 'src/google/protobuf/io/tokenizer.h')
-rw-r--r-- | src/google/protobuf/io/tokenizer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/io/tokenizer.h b/src/google/protobuf/io/tokenizer.h index d85b82f9..6b727d9f 100644 --- a/src/google/protobuf/io/tokenizer.h +++ b/src/google/protobuf/io/tokenizer.h @@ -67,7 +67,8 @@ class LIBPROTOBUF_EXPORT ErrorCollector { // Indicates that there was a warning in the input at the given line and // column numbers. The numbers are zero-based, so you may want to add // 1 to each before printing them. - virtual void AddWarning(int line, int column, const string& message) { } + virtual void AddWarning(int /* line */, int /* column */, + const string& /* message */) { } private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ErrorCollector); |