Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto-generate files after cl/567293489

Browse Source
pull/14147/head
Protobuf Team Bot 1 year ago
parent 1de33336cd
commit f7f42e3f0f
5 changed files with 46 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/google/protobuf/any.pb.cc
  2. 33
      src/google/protobuf/api.pb.cc
  3. 7
      src/google/protobuf/source_context.pb.cc
  4. 50
      src/google/protobuf/type.pb.cc
  5. 14
      src/google/protobuf/wrappers.pb.cc

10
src/google/protobuf/any.pb.cc
Unescape View File

@ -345,13 +345,11 @@ PROTOBUF_NOINLINE bool Any::IsInitialized() const {
} }
void Any::InternalSwap(Any* PROTOBUF_RESTRICT other) { void Any::InternalSwap(Any* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_url_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_url_, &other->_impl_.type_url_, arena);
&other->_impl_.type_url_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.value_, &other->_impl_.value_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.value_, lhs_arena,
&other->_impl_.value_, rhs_arena);
} }
::google::protobuf::Metadata Any::GetMetadata() const { ::google::protobuf::Metadata Any::GetMetadata() const {

33
src/google/protobuf/api.pb.cc
Unescape View File

@ -613,17 +613,15 @@ PROTOBUF_NOINLINE bool Api::IsInitialized() const {
} }
void Api::InternalSwap(Api* PROTOBUF_RESTRICT other) { void Api::InternalSwap(Api* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
_impl_.methods_.InternalSwap(&other->_impl_.methods_); _impl_.methods_.InternalSwap(&other->_impl_.methods_);
_impl_.options_.InternalSwap(&other->_impl_.options_); _impl_.options_.InternalSwap(&other->_impl_.options_);
_impl_.mixins_.InternalSwap(&other->_impl_.mixins_); _impl_.mixins_.InternalSwap(&other->_impl_.mixins_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
&other->_impl_.name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.version_, &other->_impl_.version_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.version_, lhs_arena,
&other->_impl_.version_, rhs_arena);
::google::protobuf::internal::memswap< ::google::protobuf::internal::memswap<
PROTOBUF_FIELD_OFFSET(Api, _impl_.syntax_) PROTOBUF_FIELD_OFFSET(Api, _impl_.syntax_)
+ sizeof(Api::_impl_.syntax_) + sizeof(Api::_impl_.syntax_)
@ -982,16 +980,13 @@ PROTOBUF_NOINLINE bool Method::IsInitialized() const {
} }
void Method::InternalSwap(Method* PROTOBUF_RESTRICT other) { void Method::InternalSwap(Method* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
_impl_.options_.InternalSwap(&other->_impl_.options_); _impl_.options_.InternalSwap(&other->_impl_.options_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
&other->_impl_.name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.request_type_url_, &other->_impl_.request_type_url_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.request_type_url_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.response_type_url_, &other->_impl_.response_type_url_, arena);
&other->_impl_.request_type_url_, rhs_arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.response_type_url_, lhs_arena,
&other->_impl_.response_type_url_, rhs_arena);
::google::protobuf::internal::memswap< ::google::protobuf::internal::memswap<
PROTOBUF_FIELD_OFFSET(Method, _impl_.syntax_) PROTOBUF_FIELD_OFFSET(Method, _impl_.syntax_)
+ sizeof(Method::_impl_.syntax_) + sizeof(Method::_impl_.syntax_)
@ -1212,13 +1207,11 @@ PROTOBUF_NOINLINE bool Mixin::IsInitialized() const {
} }
void Mixin::InternalSwap(Mixin* PROTOBUF_RESTRICT other) { void Mixin::InternalSwap(Mixin* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
&other->_impl_.name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.root_, &other->_impl_.root_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.root_, lhs_arena,
&other->_impl_.root_, rhs_arena);
} }
::google::protobuf::Metadata Mixin::GetMetadata() const { ::google::protobuf::Metadata Mixin::GetMetadata() const {

7
src/google/protobuf/source_context.pb.cc
Unescape View File

@ -296,11 +296,10 @@ PROTOBUF_NOINLINE bool SourceContext::IsInitialized() const {
} }
void SourceContext::InternalSwap(SourceContext* PROTOBUF_RESTRICT other) { void SourceContext::InternalSwap(SourceContext* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.file_name_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.file_name_, &other->_impl_.file_name_, arena);
&other->_impl_.file_name_, rhs_arena);
} }
::google::protobuf::Metadata SourceContext::GetMetadata() const { ::google::protobuf::Metadata SourceContext::GetMetadata() const {

50
src/google/protobuf/type.pb.cc
Unescape View File

@ -792,17 +792,15 @@ PROTOBUF_NOINLINE bool Type::IsInitialized() const {
} }
void Type::InternalSwap(Type* PROTOBUF_RESTRICT other) { void Type::InternalSwap(Type* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
_impl_.fields_.InternalSwap(&other->_impl_.fields_); _impl_.fields_.InternalSwap(&other->_impl_.fields_);
_impl_.oneofs_.InternalSwap(&other->_impl_.oneofs_); _impl_.oneofs_.InternalSwap(&other->_impl_.oneofs_);
_impl_.options_.InternalSwap(&other->_impl_.options_); _impl_.options_.InternalSwap(&other->_impl_.options_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
&other->_impl_.name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, &other->_impl_.edition_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, lhs_arena,
&other->_impl_.edition_, rhs_arena);
::google::protobuf::internal::memswap< ::google::protobuf::internal::memswap<
PROTOBUF_FIELD_OFFSET(Type, _impl_.syntax_) PROTOBUF_FIELD_OFFSET(Type, _impl_.syntax_)
+ sizeof(Type::_impl_.syntax_) + sizeof(Type::_impl_.syntax_)
@ -1235,18 +1233,14 @@ PROTOBUF_NOINLINE bool Field::IsInitialized() const {
} }
void Field::InternalSwap(Field* PROTOBUF_RESTRICT other) { void Field::InternalSwap(Field* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
_impl_.options_.InternalSwap(&other->_impl_.options_); _impl_.options_.InternalSwap(&other->_impl_.options_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
&other->_impl_.name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_url_, &other->_impl_.type_url_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_url_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.json_name_, &other->_impl_.json_name_, arena);
&other->_impl_.type_url_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.default_value_, &other->_impl_.default_value_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.json_name_, lhs_arena,
&other->_impl_.json_name_, rhs_arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.default_value_, lhs_arena,
&other->_impl_.default_value_, rhs_arena);
::google::protobuf::internal::memswap< ::google::protobuf::internal::memswap<
PROTOBUF_FIELD_OFFSET(Field, _impl_.packed_) PROTOBUF_FIELD_OFFSET(Field, _impl_.packed_)
+ sizeof(Field::_impl_.packed_) + sizeof(Field::_impl_.packed_)
@ -1604,16 +1598,14 @@ PROTOBUF_NOINLINE bool Enum::IsInitialized() const {
} }
void Enum::InternalSwap(Enum* PROTOBUF_RESTRICT other) { void Enum::InternalSwap(Enum* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
_impl_.enumvalue_.InternalSwap(&other->_impl_.enumvalue_); _impl_.enumvalue_.InternalSwap(&other->_impl_.enumvalue_);
_impl_.options_.InternalSwap(&other->_impl_.options_); _impl_.options_.InternalSwap(&other->_impl_.options_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
&other->_impl_.name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, &other->_impl_.edition_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, lhs_arena,
&other->_impl_.edition_, rhs_arena);
::google::protobuf::internal::memswap< ::google::protobuf::internal::memswap<
PROTOBUF_FIELD_OFFSET(Enum, _impl_.syntax_) PROTOBUF_FIELD_OFFSET(Enum, _impl_.syntax_)
+ sizeof(Enum::_impl_.syntax_) + sizeof(Enum::_impl_.syntax_)
@ -1857,12 +1849,11 @@ PROTOBUF_NOINLINE bool EnumValue::IsInitialized() const {
} }
void EnumValue::InternalSwap(EnumValue* PROTOBUF_RESTRICT other) { void EnumValue::InternalSwap(EnumValue* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
_impl_.options_.InternalSwap(&other->_impl_.options_); _impl_.options_.InternalSwap(&other->_impl_.options_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
&other->_impl_.name_, rhs_arena);
swap(_impl_.number_, other->_impl_.number_); swap(_impl_.number_, other->_impl_.number_);
} }
@ -2104,12 +2095,11 @@ PROTOBUF_NOINLINE bool Option::IsInitialized() const {
} }
void Option::InternalSwap(Option* PROTOBUF_RESTRICT other) { void Option::InternalSwap(Option* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
&other->_impl_.name_, rhs_arena);
swap(_impl_.value_, other->_impl_.value_); swap(_impl_.value_, other->_impl_.value_);
} }

14
src/google/protobuf/wrappers.pb.cc
Unescape View File

@ -1761,11 +1761,10 @@ PROTOBUF_NOINLINE bool StringValue::IsInitialized() const {
} }
void StringValue::InternalSwap(StringValue* PROTOBUF_RESTRICT other) { void StringValue::InternalSwap(StringValue* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.value_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.value_, &other->_impl_.value_, arena);
&other->_impl_.value_, rhs_arena);
} }
::google::protobuf::Metadata StringValue::GetMetadata() const { ::google::protobuf::Metadata StringValue::GetMetadata() const {
@ -1947,11 +1946,10 @@ PROTOBUF_NOINLINE bool BytesValue::IsInitialized() const {
} }
void BytesValue::InternalSwap(BytesValue* PROTOBUF_RESTRICT other) { void BytesValue::InternalSwap(BytesValue* PROTOBUF_RESTRICT other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation(); auto* arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation(); ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation());
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.value_, lhs_arena, ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.value_, &other->_impl_.value_, arena);
&other->_impl_.value_, rhs_arena);
} }
::google::protobuf::Metadata BytesValue::GetMetadata() const { ::google::protobuf::Metadata BytesValue::GetMetadata() const {

Write Preview
Loading…
Cancel
Save