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