commit f1376b3a24f1efff8bd9e0eda97d54800e090475
author Aurimas Liutikas <aurimas@google.com> Tue Feb 28 22:54:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 28 22:54:42 2017 +0000
tree 6678b2996fac05dbf7781a309cf0fe54e0b16302
parent 89ebbfb9a9383239ea7a4824aabf966b896b66cf
parent c0074f6e81857c5471bfc5ea0f847e74b236af1c

Merge "Pull in two patches from protobuf upstream to suppress warnings"

src/google/protobuf/generated_message_reflection.h

diff --git a/src/google/protobuf/generated_message_reflection.h b/src/google/protobuf/generated_message_reflection.h
index b6671ad..e0e041a 100644
--- a/src/google/protobuf/generated_message_reflection.h
+++ b/src/google/protobuf/generated_message_reflection.h
@@ -491,6 +491,8 @@
 template<typename To, typename From>
 inline To dynamic_cast_if_available(From from) {
 #if defined(GOOGLE_PROTOBUF_NO_RTTI) || (defined(_MSC_VER)&&!defined(_CPPRTTI))
+  // Avoid the compiler warning about unused variables.
+  (void)from;
   return NULL;
 #else
   return dynamic_cast<To>(from);

src/google/protobuf/wire_format.h

diff --git a/src/google/protobuf/wire_format.h b/src/google/protobuf/wire_format.h
index 9f26eb2..c13ff5e 100644
--- a/src/google/protobuf/wire_format.h
+++ b/src/google/protobuf/wire_format.h
@@ -325,6 +325,9 @@
     const char* field_name) {
 #ifdef GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
   WireFormat::VerifyUTF8StringFallback(data, size, op, field_name);
+#else
+  // Avoid the compiler warning about unused variables.
+  (void)data; (void)size; (void)op; (void)field_name;
 #endif
 }