From 8ed7da87a64835c0d70b5c02bfa9eb3daf97e1fb Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 12 Sep 2024 16:19:55 +0000 Subject: [PATCH] Auto-generate files after cl/673871913 --- src/google/protobuf/any.pb.h | 16 ++--- src/google/protobuf/api.pb.h | 56 +++++++---------- src/google/protobuf/source_context.pb.h | 8 +-- src/google/protobuf/type.pb.h | 80 ++++++++++--------------- src/google/protobuf/wrappers.pb.h | 16 ++--- 5 files changed, 66 insertions(+), 110 deletions(-) diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 87650f0842..5cfbcdf482 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -395,11 +395,9 @@ inline std::string* Any::release_type_url() { inline void Any::set_allocated_type_url(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.type_url_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.type_url_.IsDefault()) { - _impl_.type_url_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.type_url_.IsDefault()) { + _impl_.type_url_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Any.type_url) } @@ -445,11 +443,9 @@ inline std::string* Any::release_value() { inline void Any::set_allocated_value(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.value_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.value_.IsDefault()) { - _impl_.value_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.value_.IsDefault()) { + _impl_.value_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Any.value) } diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 65ac80ad03..c28877ad14 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -939,11 +939,9 @@ inline std::string* Api::release_name() { inline void Api::set_allocated_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Api.name) } @@ -1083,11 +1081,9 @@ inline std::string* Api::release_version() { inline void Api::set_allocated_version(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.version_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.version_.IsDefault()) { - _impl_.version_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.version_.IsDefault()) { + _impl_.version_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Api.version) } @@ -1299,11 +1295,9 @@ inline std::string* Method::release_name() { inline void Method::set_allocated_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.name) } @@ -1349,11 +1343,9 @@ inline std::string* Method::release_request_type_url() { inline void Method::set_allocated_request_type_url(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.request_type_url_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.request_type_url_.IsDefault()) { - _impl_.request_type_url_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.request_type_url_.IsDefault()) { + _impl_.request_type_url_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.request_type_url) } @@ -1421,11 +1413,9 @@ inline std::string* Method::release_response_type_url() { inline void Method::set_allocated_response_type_url(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.response_type_url_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.response_type_url_.IsDefault()) { - _impl_.response_type_url_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.response_type_url_.IsDefault()) { + _impl_.response_type_url_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.response_type_url) } @@ -1564,11 +1554,9 @@ inline std::string* Mixin::release_name() { inline void Mixin::set_allocated_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Mixin.name) } @@ -1614,11 +1602,9 @@ inline std::string* Mixin::release_root() { inline void Mixin::set_allocated_root(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.root_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.root_.IsDefault()) { - _impl_.root_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.root_.IsDefault()) { + _impl_.root_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Mixin.root) } diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 02e6f262a9..819025eab5 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -321,11 +321,9 @@ inline std::string* SourceContext::release_file_name() { inline void SourceContext::set_allocated_file_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.file_name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.file_name_.IsDefault()) { - _impl_.file_name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.file_name_.IsDefault()) { + _impl_.file_name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceContext.file_name) } diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 4473cfd95f..c7018c660f 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -1682,11 +1682,9 @@ inline std::string* Type::release_name() { inline void Type::set_allocated_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Type.name) } @@ -2007,11 +2005,9 @@ inline std::string* Type::release_edition() { inline void Type::set_allocated_edition(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.edition_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.edition_.IsDefault()) { - _impl_.edition_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.edition_.IsDefault()) { + _impl_.edition_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Type.edition) } @@ -2127,11 +2123,9 @@ inline std::string* Field::release_name() { inline void Field::set_allocated_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.name) } @@ -2177,11 +2171,9 @@ inline std::string* Field::release_type_url() { inline void Field::set_allocated_type_url(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.type_url_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.type_url_.IsDefault()) { - _impl_.type_url_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.type_url_.IsDefault()) { + _impl_.type_url_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.type_url) } @@ -2320,11 +2312,9 @@ inline std::string* Field::release_json_name() { inline void Field::set_allocated_json_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.json_name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.json_name_.IsDefault()) { - _impl_.json_name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.json_name_.IsDefault()) { + _impl_.json_name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.json_name) } @@ -2370,11 +2360,9 @@ inline std::string* Field::release_default_value() { inline void Field::set_allocated_default_value(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.default_value_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.default_value_.IsDefault()) { - _impl_.default_value_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.default_value_.IsDefault()) { + _impl_.default_value_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.default_value) } @@ -2424,11 +2412,9 @@ inline std::string* Enum::release_name() { inline void Enum::set_allocated_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Enum.name) } @@ -2685,11 +2671,9 @@ inline std::string* Enum::release_edition() { inline void Enum::set_allocated_edition(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.edition_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.edition_.IsDefault()) { - _impl_.edition_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.edition_.IsDefault()) { + _impl_.edition_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Enum.edition) } @@ -2739,11 +2723,9 @@ inline std::string* EnumValue::release_name() { inline void EnumValue::set_allocated_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValue.name) } @@ -2864,11 +2846,9 @@ inline std::string* Option::release_name() { inline void Option::set_allocated_name(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Option.name) } diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 91f8c5d036..f29302c17e 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -2069,11 +2069,9 @@ inline std::string* StringValue::release_value() { inline void StringValue::set_allocated_value(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.value_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.value_.IsDefault()) { - _impl_.value_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.value_.IsDefault()) { + _impl_.value_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.StringValue.value) } @@ -2123,11 +2121,9 @@ inline std::string* BytesValue::release_value() { inline void BytesValue::set_allocated_value(std::string* value) { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.value_.SetAllocated(value, GetArena()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.value_.IsDefault()) { - _impl_.value_.Set("", GetArena()); - } - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.value_.IsDefault()) { + _impl_.value_.Set("", GetArena()); + } // @@protoc_insertion_point(field_set_allocated:google.protobuf.BytesValue.value) }