Merge pull request #13090 from fowles/23.x

Add dllexport_decl for generated default instance. (#13085)
protocolbuffers · Jun 16, 2023 · 62d7b37 · 62d7b37
2 parents 528e673 + 3312fc2
commit 62d7b37
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 61 deletions.
diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
diff --git a/src/google/protobuf/compiler/cpp/file.cc b/src/google/protobuf/compiler/cpp/file.cc
@@ -556,7 +556,7 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx, io::Printer* p) {
             };
           };
 
-          PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
+          PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT$ dllexport_decl$
               PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 const $type$ $name$;
         )cc");
   }
@@ -579,7 +579,7 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx, io::Printer* p) {
           };
         };
 
-        PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
+        PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT$ dllexport_decl$
             PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 $type$ $name$;
       )cc");
 

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