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/generated_message_reflection.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/google/protobuf/generated_message_reflection.cc') diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc index fb9cead6..33297ed1 100644 --- a/src/google/protobuf/generated_message_reflection.cc +++ b/src/google/protobuf/generated_message_reflection.cc @@ -777,7 +777,7 @@ string GeneratedMessageReflection::GetString( const string& GeneratedMessageReflection::GetStringReference( const Message& message, - const FieldDescriptor* field, string* scratch) const { + const FieldDescriptor* field, string* /* scratch */) const { USAGE_CHECK_ALL(GetStringReference, SINGULAR, STRING); if (field->is_extension()) { return GetExtensionSet(message).GetString(field->number(), @@ -838,7 +838,7 @@ string GeneratedMessageReflection::GetRepeatedString( const string& GeneratedMessageReflection::GetRepeatedStringReference( const Message& message, const FieldDescriptor* field, - int index, string* scratch) const { + int index, string* /* scratch */) const { USAGE_CHECK_ALL(GetRepeatedStringReference, REPEATED, STRING); if (field->is_extension()) { return GetExtensionSet(message).GetRepeatedString(field->number(), index); -- cgit v1.2.3