Merge pull request #8408 from PatriosTheGreat/master

Fix -Wsuggest-destructor-override for generated C++ proto classes.
protocolbuffers · Mar 18, 2021 · f579403 · f579403
2 parents 4c5465e + 53b0cce
commit f579403
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 58 deletions.
diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc
@@ -1092,7 +1092,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* printer) {
 
   format(
       "inline $classname$() : $classname$(nullptr) {}\n"
-      "virtual ~$classname$();\n"
+      "~$classname$() override;\n"
       "explicit constexpr "
       "$classname$(::$proto_ns$::internal::ConstantInitialized);\n"
       "\n"

diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h