summaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/message.h
diff options
context:
space:
mode:
authorAustin Schuh <austin@peloton-tech.com>2014-10-31 16:27:55 -0700
committerJeff Davidson <jpd@google.com>2015-05-20 10:38:52 -0700
commit2f4d8a1b744e2e62dcd68b7cb7159000e5751975 (patch)
tree93405474cde2e2c86ad04b56a2715499c721142e /src/google/protobuf/message.h
parent4d8b123b8985b3f87a640be2d9a1b4b730b5fdca (diff)
downloadexternal_protobuf-5479ff8ac71663a8467d4ef43e1ea15d6558563c.zip
external_protobuf-5479ff8ac71663a8467d4ef43e1ea15d6558563c.tar.gz
external_protobuf-5479ff8ac71663a8467d4ef43e1ea15d6558563c.tar.bz2
Cherry-pick of: https://github.com/google/protobuf/commit/918e3ee8b46a0f79f97ed0197de08bd61fa5f053 Bug: 21303860 Signed-off-by: Jeff Davidson <jpd@google.com> Change-Id: I2690e676cde4c512412f3ccc15d9f50e59c88213
Diffstat (limited to 'src/google/protobuf/message.h')
-rw-r--r--src/google/protobuf/message.h12
1 files changed, 6 insertions, 6 deletions
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;
}