Add manual tag to //objectivec:gen_wkt_sources since it should only be run internally by regenerate_stale_files.sh Fixes https://github.com/protocolbuffers/protobuf/issues/12609 PiperOrigin-RevId: 528535687
diff --git a/objectivec/BUILD.bazel b/objectivec/BUILD.bazel index 0965de5..87f1ec0 100644 --- a/objectivec/BUILD.bazel +++ b/objectivec/BUILD.bazel
@@ -45,6 +45,7 @@ for ext in _OBJC_EXTS ]), exec_tools = ["//:protoc"], + tags = ["manual"], ) staleness_test(
diff --git a/src/google/protobuf/compiler/cpp/helpers.h b/src/google/protobuf/compiler/cpp/helpers.h index d9ccb8d..4f09e1f 100644 --- a/src/google/protobuf/compiler/cpp/helpers.h +++ b/src/google/protobuf/compiler/cpp/helpers.h
@@ -119,10 +119,10 @@ std::string Namespace(const Descriptor* d, const Options& options); std::string Namespace(const FieldDescriptor* d, const Options& options); std::string Namespace(const EnumDescriptor* d, const Options& options); -PROTOC_EXPORT std::string Namespace(const FileDescriptor* d); -PROTOC_EXPORT std::string Namespace(const Descriptor* d); -PROTOC_EXPORT std::string Namespace(const FieldDescriptor* d); -PROTOC_EXPORT std::string Namespace(const EnumDescriptor* d); +std::string Namespace(const FileDescriptor* d); +std::string Namespace(const Descriptor* d); +std::string Namespace(const FieldDescriptor* d); +std::string Namespace(const EnumDescriptor* d); class MessageSCCAnalyzer; @@ -136,14 +136,14 @@ bool HasTrivialSwap(const FieldDescriptor* field, const Options& options, MessageSCCAnalyzer* scc_analyzer); -PROTOC_EXPORT std::string ClassName(const Descriptor* descriptor); -PROTOC_EXPORT std::string ClassName(const EnumDescriptor* enum_descriptor); +std::string ClassName(const Descriptor* descriptor); +std::string ClassName(const EnumDescriptor* enum_descriptor); std::string QualifiedClassName(const Descriptor* d, const Options& options); std::string QualifiedClassName(const EnumDescriptor* d, const Options& options); -PROTOC_EXPORT std::string QualifiedClassName(const Descriptor* d); -PROTOC_EXPORT std::string QualifiedClassName(const EnumDescriptor* d); +std::string QualifiedClassName(const Descriptor* d); +std::string QualifiedClassName(const EnumDescriptor* d); // DEPRECATED just use ClassName or QualifiedClassName, a boolean is very // unreadable at the callsite. @@ -215,7 +215,7 @@ // The name is coerced to lower-case to emulate proto1 behavior. People // should be using lowercase-with-underscores style for proto field names // anyway, so normally this just returns field->name(). -PROTOC_EXPORT std::string FieldName(const FieldDescriptor* field); +std::string FieldName(const FieldDescriptor* field); // Returns the (unqualified) private member name for this field in C++ code. std::string FieldMemberName(const FieldDescriptor* field, bool split);
diff --git a/src/google/protobuf/compiler/cpp/names.h b/src/google/protobuf/compiler/cpp/names.h index 7afc769..1506493 100644 --- a/src/google/protobuf/compiler/cpp/names.h +++ b/src/google/protobuf/compiler/cpp/names.h
@@ -57,10 +57,10 @@ // message Baz { message Moo {} } // Then the qualified namespace for Moo would be: // ::foo::bar -PROTOC_EXPORT std::string Namespace(const FileDescriptor* d); -PROTOC_EXPORT std::string Namespace(const Descriptor* d); -PROTOC_EXPORT std::string Namespace(const FieldDescriptor* d); -PROTOC_EXPORT std::string Namespace(const EnumDescriptor* d); +std::string Namespace(const FileDescriptor* d); +std::string Namespace(const Descriptor* d); +std::string Namespace(const FieldDescriptor* d); +std::string Namespace(const EnumDescriptor* d); // Returns the unqualified C++ name. // @@ -69,8 +69,8 @@ // message Baz { message Moo {} } // Then the non-qualified version would be: // Baz_Moo -PROTOC_EXPORT std::string ClassName(const Descriptor* descriptor); -PROTOC_EXPORT std::string ClassName(const EnumDescriptor* enum_descriptor); +std::string ClassName(const Descriptor* descriptor); +std::string ClassName(const EnumDescriptor* enum_descriptor); // Returns the fully qualified C++ name. // @@ -79,26 +79,25 @@ // message Baz { message Moo {} } // Then the qualified ClassName for Moo would be: // ::foo::bar::Baz_Moo -PROTOC_EXPORT std::string QualifiedClassName(const Descriptor* d); -PROTOC_EXPORT std::string QualifiedClassName(const EnumDescriptor* d); -PROTOC_EXPORT std::string QualifiedExtensionName(const FieldDescriptor* d); +std::string QualifiedClassName(const Descriptor* d); +std::string QualifiedClassName(const EnumDescriptor* d); +std::string QualifiedExtensionName(const FieldDescriptor* d); // Get the (unqualified) name that should be used for this field in C++ code. // The name is coerced to lower-case to emulate proto1 behavior. People // should be using lowercase-with-underscores style for proto field names // anyway, so normally this just returns field->name(). -PROTOC_EXPORT std::string FieldName(const FieldDescriptor* field); +std::string FieldName(const FieldDescriptor* field); // Requires that this field is in a oneof. Returns the (unqualified) case // constant for this field. -PROTOC_EXPORT std::string OneofCaseConstantName(const FieldDescriptor* field); +std::string OneofCaseConstantName(const FieldDescriptor* field); // Returns the quafilied case constant for this field. -PROTOC_EXPORT std::string QualifiedOneofCaseConstantName( - const FieldDescriptor* field); +std::string QualifiedOneofCaseConstantName(const FieldDescriptor* field); // Get the (unqualified) name that should be used for this enum value in C++ // code. -PROTOC_EXPORT std::string EnumValueName(const EnumValueDescriptor* enum_value); +std::string EnumValueName(const EnumValueDescriptor* enum_value); // Strips ".proto" or ".protodevel" from the end of a filename. PROTOC_EXPORT std::string StripProto(absl::string_view filename);