diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/descriptor.h | 10 | ||||
| -rw-r--r-- | src/google/protobuf/message.h | 12 | ||||
| -rw-r--r-- | src/google/protobuf/repeated_field.h | 3 |
3 files changed, 13 insertions, 12 deletions
diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h index 361943d..fef4780 100644 --- a/src/google/protobuf/descriptor.h +++ b/src/google/protobuf/descriptor.h @@ -1280,11 +1280,11 @@ class LIBPROTOBUF_EXPORT DescriptorPool { // Reports a warning in the FileDescriptorProto. Use this function if the // problem occured should NOT interrupt building the FileDescriptorProto. virtual void AddWarning( - const string& filename, // File name in which the error occurred. - const string& element_name, // Full name of the erroneous element. - const Message* descriptor, // Descriptor of the erroneous element. - ErrorLocation location, // One of the location constants, above. - const string& message // Human-readable error message. + const string& /*filename*/, // File name in which the error occurred. + const string& /*element_name*/, // Full name of the erroneous element. + const Message* /*descriptor*/, // Descriptor of the erroneous element. + ErrorLocation /*location*/, // One of the location constants, above. + const string& /*message*/ // Human-readable error message. ) {} private: diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h index 87a89ef..ff2fcd8 100644 --- a/src/google/protobuf/message.h +++ b/src/google/protobuf/message.h @@ -389,19 +389,19 @@ class LIBPROTOBUF_EXPORT Reflection { // is set, false otherwise. // TODO(jieluo) - make it pure virtual after updating all // the subclasses. - virtual bool HasOneof(const Message& message, - const OneofDescriptor* oneof_descriptor) const { + virtual bool HasOneof(const Message& /*message*/, + const OneofDescriptor* /*oneof_descriptor*/) const { return false; } - virtual void ClearOneof(Message* message, - const OneofDescriptor* oneof_descriptor) const {} + virtual void ClearOneof(Message* /*message*/, + const OneofDescriptor* /*oneof_descriptor*/) const {} // Returns the field descriptor if the oneof is set. NULL otherwise. // TODO(jieluo) - make it pure virtual. virtual const FieldDescriptor* GetOneofFieldDescriptor( - const Message& message, - const OneofDescriptor* oneof_descriptor) const { + const Message& /*message*/, + const OneofDescriptor* /*oneof_descriptor*/) const { return NULL; } diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index 5005183..816ea68 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -83,7 +83,8 @@ inline int CalculateReserve(Iter begin, Iter end, std::forward_iterator_tag) { } template <typename Iter> -inline int CalculateReserve(Iter begin, Iter end, std::input_iterator_tag) { +inline int CalculateReserve(Iter /*begin*/, Iter /*end*/, + std::input_iterator_tag) { return -1; } |