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

* Fix -Wunused-parameter in map<string, int> fields * Fix tabs
4 years ago · 0f25590028
parent 8babb3bae7
commit 0f25590028
1 changed files with 4 additions and 1 deletions
--- 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) {