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/text_format.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/google/protobuf/text_format.cc') 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()) { -- cgit v1.2.3