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/message.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/google/protobuf/message.cc') diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index ab7efa99..0c305d56 100644 --- a/src/google/protobuf/message.cc +++ b/src/google/protobuf/message.cc @@ -149,7 +149,7 @@ int Message::ByteSize() const { return size; } -void Message::SetCachedSize(int size) const { +void Message::SetCachedSize(int /* size */) const { GOOGLE_LOG(FATAL) << "Message class \"" << GetDescriptor()->full_name() << "\" implements neither SetCachedSize() nor ByteSize(). " "Must implement one or the other."; @@ -216,7 +216,8 @@ HANDLE_TYPE(bool, FieldDescriptor::CPPTYPE_BOOL, -1); #undef HANDLE_TYPE void* Reflection::MutableRawRepeatedString( - Message* message, const FieldDescriptor* field, bool is_string) const { + Message* message, const FieldDescriptor* field, + bool /* is_string */) const { return MutableRawRepeatedField(message, field, FieldDescriptor::CPPTYPE_STRING, FieldOptions::STRING, NULL); } -- cgit v1.2.3