commit 0f25590028d90f5e525574b16a7b0f8a620cd63d
author Yuriy Chernyshov <thegeorg@yandex-team.ru> Sat Apr 17 01:52:10 2021 +0300
committer GitHub <noreply@github.com> Fri Apr 16 15:52:10 2021 -0700
tree 0a90800dd21828f338190c473a48a723934f1845
parent 8babb3bae7564e38147dbdf87bc182f6bec4b472

Fix -Wunused-parameter in map<string, int> fields (fixes #8494) (#8500)

* Fix -Wunused-parameter in map<string, int> fields

* Fix tabs

src/google/protobuf/compiler/cpp/cpp_map_field.cc

diff --git a/src/google/protobuf/compiler/cpp/cpp_map_field.cc b/src/google/protobuf/compiler/cpp/cpp_map_field.cc
index 44c9138..b1e3c1e 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 @@
   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) {