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/generated_message_reflection.cc | |
| parent | e7f2937962283d69fd1153ebca46b615fca4a2a2 (diff) | |
Down-integrate pending changes from internal repository after previous release.
Diffstat (limited to 'src/google/protobuf/generated_message_reflection.cc')
| -rw-r--r-- | src/google/protobuf/generated_message_reflection.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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); |