Skip to content

Commit 62d7b37

Browse files
authored
Merge pull request #13090 from fowles/23.x
Add dllexport_decl for generated default instance. (#13085)
2 parents 528e673 + 3312fc2 commit 62d7b37

File tree

13 files changed

+61
-61
lines changed

13 files changed

+61
-61
lines changed

src/google/protobuf/any.pb.cc

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.cc

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/file.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx, io::Printer* p) {
556556
};
557557
};
558558
559-
PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
559+
PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT$ dllexport_decl$
560560
PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 const $type$ $name$;
561561
)cc");
562562
}
@@ -579,7 +579,7 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx, io::Printer* p) {
579579
};
580580
};
581581
582-
PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
582+
PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT$ dllexport_decl$
583583
PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 $type$ $name$;
584584
)cc");
585585

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

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.cc

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

src/google/protobuf/duration.pb.cc

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.cc

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.cc

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.cc

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)