commit 2f4d8a1b744e2e62dcd68b7cb7159000e5751975
author Austin Schuh <austin@peloton-tech.com> Fri Oct 31 16:27:55 2014 -0700
committer Jeff Davidson <jpd@google.com> Wed May 20 10:38:52 2015 -0700
tree 93405474cde2e2c86ad04b56a2715499c721142e
parent 4d8b123b8985b3f87a640be2d9a1b4b730b5fdca

Fixed Unused Parameter warning in headers.

Cherry-pick of:
https://github.com/google/protobuf/commit/918e3ee8b46a0f79f97ed0197de08bd61fa5f053

Bug: 21303860
Signed-off-by: Jeff Davidson <jpd@google.com>
Change-Id: I2690e676cde4c512412f3ccc15d9f50e59c88213

src/google/protobuf/descriptor.h

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 @@
     // 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:

src/google/protobuf/message.h

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 @@
   // 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;
   }
 

src/google/protobuf/repeated_field.h

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 @@
 }
 
 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;
 }