From 1c3a0f91aff884be45d6bf079cf143758a332dc2 Mon Sep 17 00:00:00 2001 From: Yuriy Chernyshov Date: Fri, 16 Apr 2021 10:25:17 +0300 Subject: [PATCH 1/2] Fix -Wunused-parameter in map fields --- src/google/protobuf/compiler/cpp/cpp_map_field.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/google/protobuf/compiler/cpp/cpp_map_field.cc b/src/google/protobuf/compiler/cpp/cpp_map_field.cc index c9c30e0c635b..0a7f7ec43dfa 100644 --- a/src/google/protobuf/compiler/cpp/cpp_map_field.cc +++ b/src/google/protobuf/compiler/cpp/cpp_map_field.cc @@ -229,7 +229,10 @@ void MapFieldGenerator::GenerateSerializeWithCachedSizesToArray( if (utf8_check) { format( "struct Utf8Check {\n" - " static void Check(ConstPtr p) {\n"); + " static void Check(ConstPtr p) {\n" + // p may be unused when GetUtf8CheckMode evaluates to kNone, + // thus disabling the validation. + " (void)p;\n"); format.Indent(); format.Indent(); if (string_key) { From 615bb01360dd6e451f9556636d397cb7bd868ef7 Mon Sep 17 00:00:00 2001 From: Yuriy Chernyshov Date: Fri, 16 Apr 2021 20:12:38 +0300 Subject: [PATCH 2/2] Fix tabs --- src/google/protobuf/compiler/cpp/cpp_map_field.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/google/protobuf/compiler/cpp/cpp_map_field.cc b/src/google/protobuf/compiler/cpp/cpp_map_field.cc index 0a7f7ec43dfa..5fdad90e27f6 100644 --- a/src/google/protobuf/compiler/cpp/cpp_map_field.cc +++ b/src/google/protobuf/compiler/cpp/cpp_map_field.cc @@ -230,9 +230,9 @@ void MapFieldGenerator::GenerateSerializeWithCachedSizesToArray( format( "struct Utf8Check {\n" " static void Check(ConstPtr p) {\n" - // p may be unused when GetUtf8CheckMode evaluates to kNone, - // thus disabling the validation. - " (void)p;\n"); + // p may be unused when GetUtf8CheckMode evaluates to kNone, + // thus disabling the validation. + " (void)p;\n"); format.Indent(); format.Indent(); if (string_key) {