diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2017-02-28 15:08:07 -0800 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2017-02-28 15:08:07 -0800 |
| commit | 4566a1da7dd83ad573f1778068b0b432ec0e9afc (patch) | |
| tree | 43b1e7f8b4eaecc7e4e285e4535d448ba43b5975 | |
| parent | 6fd8f88ff5927e48a5836d451b7620855d19b4d9 (diff) | |
| parent | 4bb8a91952f859be74b8938d821aabfd0a0f6e20 (diff) | |
| download | platform_external_protobuf-oreo-dev.tar.gz platform_external_protobuf-oreo-dev.tar.bz2 platform_external_protobuf-oreo-dev.zip | |
resolve merge conflicts of 4bb8a91 to masterandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
Change-Id: I0611d987875444dd5debfe53a423ef4f069a2241
| -rw-r--r-- | src/google/protobuf/generated_message_reflection.h | 2 | ||||
| -rw-r--r-- | src/google/protobuf/wire_format.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/google/protobuf/generated_message_reflection.h b/src/google/protobuf/generated_message_reflection.h index ed4e03348..4f25d4b3e 100644 --- a/src/google/protobuf/generated_message_reflection.h +++ b/src/google/protobuf/generated_message_reflection.h @@ -635,6 +635,8 @@ template<typename To, typename From> 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); diff --git a/src/google/protobuf/wire_format.h b/src/google/protobuf/wire_format.h index 941be75ba..5b41aadf1 100644 --- a/src/google/protobuf/wire_format.h +++ b/src/google/protobuf/wire_format.h @@ -326,6 +326,9 @@ inline void WireFormat::VerifyUTF8StringNamedField( #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 } |