commit 4566a1da7dd83ad573f1778068b0b432ec0e9afc
author Aurimas Liutikas <aurimas@google.com> Tue Feb 28 15:08:07 2017 -0800
committer Aurimas Liutikas <aurimas@google.com> Tue Feb 28 15:08:07 2017 -0800
tree 43b1e7f8b4eaecc7e4e285e4535d448ba43b5975
parent 6fd8f88ff5927e48a5836d451b7620855d19b4d9
parent 4bb8a91952f859be74b8938d821aabfd0a0f6e20

resolve merge conflicts of 4bb8a91 to master

Change-Id: I0611d987875444dd5debfe53a423ef4f069a2241

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 ed4e033..4f25d4b 100644
--- a/src/google/protobuf/generated_message_reflection.h
+++ b/src/google/protobuf/generated_message_reflection.h
@@ -635,6 +635,8 @@
 inline To dynamic_cast_if_available(From from) {
 #if defined(GOOGLE_PROTOBUF_NO_RTTI) || defined(__GXX_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 941be75..5b41aad 100644
--- a/src/google/protobuf/wire_format.h
+++ b/src/google/protobuf/wire_format.h
@@ -326,6 +326,9 @@
 #ifdef GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
   WireFormatLite::VerifyUtf8String(
       data, size, static_cast<WireFormatLite::Operation>(op), field_name);
+#else
+  // Avoid the compiler warning about unused variables.
+  (void)data; (void)size; (void)op; (void)field_name;
 #endif
 }