Skip to content

Commit f579403

Browse files
authored
Merge pull request #8408 from PatriosTheGreat/master
Fix -Wsuggest-destructor-override for generated C++ proto classes.
2 parents 4c5465e + 53b0cce commit f579403

File tree

13 files changed

+58
-58
lines changed

13 files changed

+58
-58
lines changed

src/google/protobuf/any.pb.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/api.pb.h

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* printer) {
10921092

10931093
format(
10941094
"inline $classname$() : $classname$(nullptr) {}\n"
1095-
"virtual ~$classname$();\n"
1095+
"~$classname$() override;\n"
10961096
"explicit constexpr "
10971097
"$classname$(::$proto_ns$::internal::ConstantInitialized);\n"
10981098
"\n"

src/google/protobuf/compiler/plugin.pb.h

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/descriptor.pb.h

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/duration.pb.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/empty.pb.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/field_mask.pb.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/source_context.pb.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)