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/text_format.cc | |
| 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/text_format.cc')
| -rw-r--r-- | src/google/protobuf/text_format.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/text_format.cc b/src/google/protobuf/text_format.cc index cabb99ed..b2ea7ee8 100644 --- a/src/google/protobuf/text_format.cc +++ b/src/google/protobuf/text_format.cc @@ -1075,7 +1075,7 @@ bool TextFormat::Parser::MergeFromString(const string& input, return Merge(&input_stream, output); } -bool TextFormat::Parser::MergeUsingImpl(io::ZeroCopyInputStream* input, +bool TextFormat::Parser::MergeUsingImpl(io::ZeroCopyInputStream* /* input */, Message* output, ParserImpl* parser_impl) { if (!parser_impl->Parse(output)) return false; @@ -1280,8 +1280,8 @@ void TextFormat::Printer::PrintShortRepeatedField( } } -void TextFormat::Printer::PrintFieldName(const Message& message, - const Reflection* reflection, +void TextFormat::Printer::PrintFieldName(const Message& /* message */, + const Reflection* /* reflection */, const FieldDescriptor* field, TextGenerator& generator) const { if (field->is_extension()) { |