From b67dc23cd12e14bc1970d959e959e05964e4d5b0 Mon Sep 17 00:00:00 2001 From: DragonAura Date: Sun, 30 Oct 2022 04:29:14 +0800 Subject: [PATCH] refactor(CAPI): :art: protos generated using newer gRPC --- CAPI/proto/Message2Clients.grpc.pb.cc | 25 - CAPI/proto/Message2Clients.grpc.pb.h | 35 - CAPI/proto/Message2Clients.pb.cc | 1618 ++++++++++++------------- CAPI/proto/Message2Clients.pb.h | 812 +++++++------ CAPI/proto/Message2Server.grpc.pb.cc | 25 - CAPI/proto/Message2Server.grpc.pb.h | 35 - CAPI/proto/Message2Server.pb.cc | 746 ++++++------ CAPI/proto/Message2Server.pb.h | 321 ++--- CAPI/proto/MessageType.grpc.pb.cc | 25 - CAPI/proto/MessageType.grpc.pb.h | 35 - CAPI/proto/MessageType.pb.cc | 20 +- CAPI/proto/MessageType.pb.h | 10 +- CAPI/proto/Services.pb.cc | 22 +- CAPI/proto/Services.pb.h | 10 +- dependency/proto/cpp_output.sh | 3 - 15 files changed, 1749 insertions(+), 1993 deletions(-) delete mode 100644 CAPI/proto/Message2Clients.grpc.pb.cc delete mode 100644 CAPI/proto/Message2Clients.grpc.pb.h delete mode 100644 CAPI/proto/Message2Server.grpc.pb.cc delete mode 100644 CAPI/proto/Message2Server.grpc.pb.h delete mode 100644 CAPI/proto/MessageType.grpc.pb.cc delete mode 100644 CAPI/proto/MessageType.grpc.pb.h diff --git a/CAPI/proto/Message2Clients.grpc.pb.cc b/CAPI/proto/Message2Clients.grpc.pb.cc deleted file mode 100644 index 84a0ce5..0000000 --- a/CAPI/proto/Message2Clients.grpc.pb.cc +++ /dev/null @@ -1,25 +0,0 @@ -// Generated by the gRPC C++ plugin. -// If you make any local change, they will be lost. -// source: Message2Clients.proto - -#include "Message2Clients.pb.h" -#include "Message2Clients.grpc.pb.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -namespace protobuf -{ - -} // namespace protobuf diff --git a/CAPI/proto/Message2Clients.grpc.pb.h b/CAPI/proto/Message2Clients.grpc.pb.h deleted file mode 100644 index 17c055d..0000000 --- a/CAPI/proto/Message2Clients.grpc.pb.h +++ /dev/null @@ -1,35 +0,0 @@ -// Generated by the gRPC C++ plugin. -// If you make any local change, they will be lost. -// source: Message2Clients.proto -// Original file comments: -// Message2Client -#ifndef GRPC_Message2Clients_2eproto__INCLUDED -#define GRPC_Message2Clients_2eproto__INCLUDED - -#include "Message2Clients.pb.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace protobuf -{ - -} // namespace protobuf - -#endif // GRPC_Message2Clients_2eproto__INCLUDED diff --git a/CAPI/proto/Message2Clients.pb.cc b/CAPI/proto/Message2Clients.pb.cc index 46b06b7..fdf445e 100644 --- a/CAPI/proto/Message2Clients.pb.cc +++ b/CAPI/proto/Message2Clients.pb.cc @@ -16,41 +16,23 @@ #include PROTOBUF_PRAGMA_INIT_SEG + +namespace _pb = ::PROTOBUF_NAMESPACE_ID; +namespace _pbi = _pb::internal; + namespace protobuf { - constexpr MessageOfHuman::MessageOfHuman( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_CONSTEXPR MessageOfHuman::MessageOfHuman( + ::_pbi::ConstantInitialized ) : - buff_(), - _buff_cached_byte_size_(0), - x_(0), - y_(0), - speed_(0), - life_(0), - time_until_skill_available_(0), - hanged_time_(0), - place_(0) - - , - prop_(0) - - , - human_type_(0) - - , - guid_(int64_t{0}), - chair_time_(0), - on_chair_(false), - on_ground_(false), - view_range_(0), - ground_time_(0), - player_id_(int64_t{0}) + _impl_{ + /*decltype(_impl_.buff_)*/ {}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, /*decltype(_impl_.x_)*/ 0, /*decltype(_impl_.y_)*/ 0, /*decltype(_impl_.speed_)*/ 0, /*decltype(_impl_.life_)*/ 0, /*decltype(_impl_.time_until_skill_available_)*/ 0, /*decltype(_impl_.hanged_time_)*/ 0, /*decltype(_impl_.place_)*/ 0, /*decltype(_impl_.prop_)*/ 0, /*decltype(_impl_.human_type_)*/ 0, /*decltype(_impl_.guid_)*/ int64_t{0}, /*decltype(_impl_.chair_time_)*/ 0, /*decltype(_impl_.on_chair_)*/ false, /*decltype(_impl_.on_ground_)*/ false, /*decltype(_impl_.view_range_)*/ 0, /*decltype(_impl_.ground_time_)*/ 0, /*decltype(_impl_.player_id_)*/ int64_t{0}, /*decltype(_impl_._cached_size_)*/ {}} { } struct MessageOfHumanDefaultTypeInternal { - constexpr MessageOfHumanDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MessageOfHumanDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MessageOfHumanDefaultTypeInternal() @@ -61,36 +43,18 @@ namespace protobuf MessageOfHuman _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MessageOfHumanDefaultTypeInternal _MessageOfHuman_default_instance_; - constexpr MessageOfButcher::MessageOfButcher( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageOfHumanDefaultTypeInternal _MessageOfHuman_default_instance_; + PROTOBUF_CONSTEXPR MessageOfButcher::MessageOfButcher( + ::_pbi::ConstantInitialized ) : - buff_(), - _buff_cached_byte_size_(0), - x_(0), - y_(0), - speed_(0), - damage_(0), - time_until_skill_available_(0), - place_(0) - - , - prop_(0) - - , - guid_(int64_t{0}), - butcher_type_(0) - - , - movable_(false), - playerid_(int64_t{0}), - view_range_(0) + _impl_{ + /*decltype(_impl_.buff_)*/ {}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, /*decltype(_impl_.x_)*/ 0, /*decltype(_impl_.y_)*/ 0, /*decltype(_impl_.speed_)*/ 0, /*decltype(_impl_.damage_)*/ 0, /*decltype(_impl_.time_until_skill_available_)*/ 0, /*decltype(_impl_.place_)*/ 0, /*decltype(_impl_.prop_)*/ 0, /*decltype(_impl_.guid_)*/ int64_t{0}, /*decltype(_impl_.butcher_type_)*/ 0, /*decltype(_impl_.movable_)*/ false, /*decltype(_impl_.playerid_)*/ int64_t{0}, /*decltype(_impl_.view_range_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}} { } struct MessageOfButcherDefaultTypeInternal { - constexpr MessageOfButcherDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MessageOfButcherDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MessageOfButcherDefaultTypeInternal() @@ -101,28 +65,18 @@ namespace protobuf MessageOfButcher _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MessageOfButcherDefaultTypeInternal _MessageOfButcher_default_instance_; - constexpr MessageOfProp::MessageOfProp( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageOfButcherDefaultTypeInternal _MessageOfButcher_default_instance_; + PROTOBUF_CONSTEXPR MessageOfProp::MessageOfProp( + ::_pbi::ConstantInitialized ) : - type_(0) - - , - x_(0), - facing_direction_(0), - y_(0), - place_(0) - - , - guid_(int64_t{0}), - size_(0), - is_moving_(false) + _impl_{ + /*decltype(_impl_.type_)*/ 0, /*decltype(_impl_.x_)*/ 0, /*decltype(_impl_.facing_direction_)*/ 0, /*decltype(_impl_.y_)*/ 0, /*decltype(_impl_.place_)*/ 0, /*decltype(_impl_.guid_)*/ int64_t{0}, /*decltype(_impl_.size_)*/ 0, /*decltype(_impl_.is_moving_)*/ false, /*decltype(_impl_._cached_size_)*/ {}} { } struct MessageOfPropDefaultTypeInternal { - constexpr MessageOfPropDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MessageOfPropDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MessageOfPropDefaultTypeInternal() @@ -133,23 +87,18 @@ namespace protobuf MessageOfProp _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MessageOfPropDefaultTypeInternal _MessageOfProp_default_instance_; - constexpr MessageOfPickedProp::MessageOfPickedProp( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageOfPropDefaultTypeInternal _MessageOfProp_default_instance_; + PROTOBUF_CONSTEXPR MessageOfPickedProp::MessageOfPickedProp( + ::_pbi::ConstantInitialized ) : - type_(0) - - , - x_(0), - facing_direction_(0), - mapping_id_(int64_t{0}), - y_(0) + _impl_{ + /*decltype(_impl_.type_)*/ 0, /*decltype(_impl_.x_)*/ 0, /*decltype(_impl_.facing_direction_)*/ 0, /*decltype(_impl_.mapping_id_)*/ int64_t{0}, /*decltype(_impl_.y_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}} { } struct MessageOfPickedPropDefaultTypeInternal { - constexpr MessageOfPickedPropDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MessageOfPickedPropDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MessageOfPickedPropDefaultTypeInternal() @@ -160,18 +109,18 @@ namespace protobuf MessageOfPickedProp _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MessageOfPickedPropDefaultTypeInternal _MessageOfPickedProp_default_instance_; - constexpr MessageOfMap_Row::MessageOfMap_Row( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageOfPickedPropDefaultTypeInternal _MessageOfPickedProp_default_instance_; + PROTOBUF_CONSTEXPR MessageOfMap_Row::MessageOfMap_Row( + ::_pbi::ConstantInitialized ) : - col_(), - _col_cached_byte_size_(0) + _impl_{ + /*decltype(_impl_.col_)*/ {}, /*decltype(_impl_._col_cached_byte_size_)*/ {0}, /*decltype(_impl_._cached_size_)*/ {}} { } struct MessageOfMap_RowDefaultTypeInternal { - constexpr MessageOfMap_RowDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MessageOfMap_RowDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MessageOfMap_RowDefaultTypeInternal() @@ -182,17 +131,18 @@ namespace protobuf MessageOfMap_Row _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MessageOfMap_RowDefaultTypeInternal _MessageOfMap_Row_default_instance_; - constexpr MessageOfMap::MessageOfMap( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageOfMap_RowDefaultTypeInternal _MessageOfMap_Row_default_instance_; + PROTOBUF_CONSTEXPR MessageOfMap::MessageOfMap( + ::_pbi::ConstantInitialized ) : - row_() + _impl_{ + /*decltype(_impl_.row_)*/ {}, /*decltype(_impl_._cached_size_)*/ {}} { } struct MessageOfMapDefaultTypeInternal { - constexpr MessageOfMapDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MessageOfMapDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MessageOfMapDefaultTypeInternal() @@ -203,20 +153,18 @@ namespace protobuf MessageOfMap _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MessageOfMapDefaultTypeInternal _MessageOfMap_default_instance_; - constexpr MessageToClient::MessageToClient( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageOfMapDefaultTypeInternal _MessageOfMap_default_instance_; + PROTOBUF_CONSTEXPR MessageToClient::MessageToClient( + ::_pbi::ConstantInitialized ) : - human_message_(), - butcher_message_(), - prop_message_(), - map_massage_(nullptr) + _impl_{ + /*decltype(_impl_.human_message_)*/ {}, /*decltype(_impl_.butcher_message_)*/ {}, /*decltype(_impl_.prop_message_)*/ {}, /*decltype(_impl_.map_massage_)*/ nullptr, /*decltype(_impl_._cached_size_)*/ {}} { } struct MessageToClientDefaultTypeInternal { - constexpr MessageToClientDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MessageToClientDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MessageToClientDefaultTypeInternal() @@ -227,18 +175,18 @@ namespace protobuf MessageToClient _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MessageToClientDefaultTypeInternal _MessageToClient_default_instance_; - constexpr MoveRes::MoveRes( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageToClientDefaultTypeInternal _MessageToClient_default_instance_; + PROTOBUF_CONSTEXPR MoveRes::MoveRes( + ::_pbi::ConstantInitialized ) : - actual_speed_(int64_t{0}), - actual_angle_(0) + _impl_{ + /*decltype(_impl_.actual_speed_)*/ int64_t{0}, /*decltype(_impl_.actual_angle_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}} { } struct MoveResDefaultTypeInternal { - constexpr MoveResDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MoveResDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MoveResDefaultTypeInternal() @@ -249,17 +197,18 @@ namespace protobuf MoveRes _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MoveResDefaultTypeInternal _MoveRes_default_instance_; - constexpr BoolRes::BoolRes( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MoveResDefaultTypeInternal _MoveRes_default_instance_; + PROTOBUF_CONSTEXPR BoolRes::BoolRes( + ::_pbi::ConstantInitialized ) : - act_success_(false) + _impl_{ + /*decltype(_impl_.act_success_)*/ false, /*decltype(_impl_._cached_size_)*/ {}} { } struct BoolResDefaultTypeInternal { - constexpr BoolResDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR BoolResDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~BoolResDefaultTypeInternal() @@ -270,19 +219,18 @@ namespace protobuf BoolRes _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT BoolResDefaultTypeInternal _BoolRes_default_instance_; - constexpr MsgRes::MsgRes( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BoolResDefaultTypeInternal _BoolRes_default_instance_; + PROTOBUF_CONSTEXPR MsgRes::MsgRes( + ::_pbi::ConstantInitialized ) : - message_received_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string), - from_player_id_(int64_t{0}), - have_message_(false) + _impl_{ + /*decltype(_impl_.message_received_)*/ {&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}, /*decltype(_impl_.from_player_id_)*/ int64_t{0}, /*decltype(_impl_.have_message_)*/ false, /*decltype(_impl_._cached_size_)*/ {}} { } struct MsgResDefaultTypeInternal { - constexpr MsgResDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MsgResDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MsgResDefaultTypeInternal() @@ -293,11 +241,11 @@ namespace protobuf MsgRes _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MsgResDefaultTypeInternal _MsgRes_default_instance_; + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MsgResDefaultTypeInternal _MsgRes_default_instance_; } // namespace protobuf -static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_Message2Clients_2eproto[10]; -static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_Message2Clients_2eproto = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_Message2Clients_2eproto = nullptr; +static ::_pb::Metadata file_level_metadata_Message2Clients_2eproto[10]; +static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_Message2Clients_2eproto = nullptr; +static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_Message2Clients_2eproto = nullptr; const uint32_t TableStruct_Message2Clients_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ @@ -306,117 +254,117 @@ const uint32_t TableStruct_Message2Clients_2eproto::offsets[] PROTOBUF_SECTION_V ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, x_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, y_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, speed_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, life_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, hanged_time_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, time_until_skill_available_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, place_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, prop_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, human_type_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, guid_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, on_chair_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, chair_time_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, on_ground_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, ground_time_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, player_id_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, view_range_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, buff_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.x_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.y_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.speed_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.life_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.hanged_time_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.time_until_skill_available_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.place_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.prop_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.human_type_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.guid_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.on_chair_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.chair_time_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.on_ground_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.ground_time_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.player_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.view_range_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.buff_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, x_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, y_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, speed_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, damage_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, time_until_skill_available_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, place_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, prop_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, butcher_type_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, guid_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, movable_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, playerid_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, view_range_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, buff_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.x_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.y_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.speed_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.damage_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.time_until_skill_available_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.place_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.prop_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.butcher_type_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.guid_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.movable_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.playerid_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.view_range_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.buff_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, type_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, x_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, y_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, facing_direction_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, guid_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, place_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, size_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, is_moving_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _impl_.type_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _impl_.x_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _impl_.y_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _impl_.facing_direction_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _impl_.guid_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _impl_.place_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _impl_.size_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _impl_.is_moving_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, type_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, x_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, y_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, facing_direction_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, mapping_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, _impl_.type_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, _impl_.x_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, _impl_.y_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, _impl_.facing_direction_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfPickedProp, _impl_.mapping_id_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfMap_Row, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfMap_Row, col_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfMap_Row, _impl_.col_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfMap, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfMap, row_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfMap, _impl_.row_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, human_message_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, butcher_message_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, prop_message_), - PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, map_massage_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.human_message_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.butcher_message_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.prop_message_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.map_massage_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MoveRes, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MoveRes, actual_speed_), - PROTOBUF_FIELD_OFFSET(::protobuf::MoveRes, actual_angle_), + PROTOBUF_FIELD_OFFSET(::protobuf::MoveRes, _impl_.actual_speed_), + PROTOBUF_FIELD_OFFSET(::protobuf::MoveRes, _impl_.actual_angle_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::BoolRes, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::BoolRes, act_success_), + PROTOBUF_FIELD_OFFSET(::protobuf::BoolRes, _impl_.act_success_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MsgRes, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MsgRes, have_message_), - PROTOBUF_FIELD_OFFSET(::protobuf::MsgRes, from_player_id_), - PROTOBUF_FIELD_OFFSET(::protobuf::MsgRes, message_received_), + PROTOBUF_FIELD_OFFSET(::protobuf::MsgRes, _impl_.have_message_), + PROTOBUF_FIELD_OFFSET(::protobuf::MsgRes, _impl_.from_player_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::MsgRes, _impl_.message_received_), }; -static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { {0, -1, -1, sizeof(::protobuf::MessageOfHuman)}, {23, -1, -1, sizeof(::protobuf::MessageOfButcher)}, {42, -1, -1, sizeof(::protobuf::MessageOfProp)}, @@ -429,17 +377,17 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOB {106, -1, -1, sizeof(::protobuf::MsgRes)}, }; -static ::PROTOBUF_NAMESPACE_ID::Message const* const file_default_instances[] = { - reinterpret_cast(&::protobuf::_MessageOfHuman_default_instance_), - reinterpret_cast(&::protobuf::_MessageOfButcher_default_instance_), - reinterpret_cast(&::protobuf::_MessageOfProp_default_instance_), - reinterpret_cast(&::protobuf::_MessageOfPickedProp_default_instance_), - reinterpret_cast(&::protobuf::_MessageOfMap_Row_default_instance_), - reinterpret_cast(&::protobuf::_MessageOfMap_default_instance_), - reinterpret_cast(&::protobuf::_MessageToClient_default_instance_), - reinterpret_cast(&::protobuf::_MoveRes_default_instance_), - reinterpret_cast(&::protobuf::_BoolRes_default_instance_), - reinterpret_cast(&::protobuf::_MsgRes_default_instance_), +static const ::_pb::Message* const file_default_instances[] = { + &::protobuf::_MessageOfHuman_default_instance_._instance, + &::protobuf::_MessageOfButcher_default_instance_._instance, + &::protobuf::_MessageOfProp_default_instance_._instance, + &::protobuf::_MessageOfPickedProp_default_instance_._instance, + &::protobuf::_MessageOfMap_Row_default_instance_._instance, + &::protobuf::_MessageOfMap_default_instance_._instance, + &::protobuf::_MessageToClient_default_instance_._instance, + &::protobuf::_MoveRes_default_instance_._instance, + &::protobuf::_BoolRes_default_instance_._instance, + &::protobuf::_MsgRes_default_instance_._instance, }; const char descriptor_table_protodef_Message2Clients_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = @@ -483,11 +431,11 @@ const char descriptor_table_protodef_Message2Clients_2eproto[] PROTOBUF_SECTION_ "s\022\023\n\013act_success\030\001 \001(\010\"P\n\006MsgRes\022\024\n\014have" "_message\030\001 \001(\010\022\026\n\016from_player_id\030\002 \001(\003\022\030" "\n\020message_received\030\003 \001(\tb\006proto3"; -static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable* const descriptor_table_Message2Clients_2eproto_deps[1] = { +static const ::_pbi::DescriptorTable* const descriptor_table_Message2Clients_2eproto_deps[1] = { &::descriptor_table_MessageType_2eproto, }; -static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_Message2Clients_2eproto_once; -const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Message2Clients_2eproto = { +static ::_pbi::once_flag descriptor_table_Message2Clients_2eproto_once; +const ::_pbi::DescriptorTable descriptor_table_Message2Clients_2eproto = { false, false, 1592, @@ -504,13 +452,13 @@ const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Messag file_level_enum_descriptors_Message2Clients_2eproto, file_level_service_descriptors_Message2Clients_2eproto, }; -PROTOBUF_ATTRIBUTE_WEAK const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable* descriptor_table_Message2Clients_2eproto_getter() +PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_Message2Clients_2eproto_getter() { return &descriptor_table_Message2Clients_2eproto; } // Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY static ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptorsRunner dynamic_init_dummy_Message2Clients_2eproto(&descriptor_table_Message2Clients_2eproto); +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_Message2Clients_2eproto(&descriptor_table_Message2Clients_2eproto); namespace protobuf { @@ -522,55 +470,54 @@ namespace protobuf }; MessageOfHuman::MessageOfHuman(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : - ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned), - buff_(arena) + ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MessageOfHuman) } MessageOfHuman::MessageOfHuman(const MessageOfHuman& from) : - ::PROTOBUF_NAMESPACE_ID::Message(), - buff_(from.buff_) + ::PROTOBUF_NAMESPACE_ID::Message() { + MessageOfHuman* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.buff_){from._impl_.buff_}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){}, decltype(_impl_.y_){}, decltype(_impl_.speed_){}, decltype(_impl_.life_){}, decltype(_impl_.time_until_skill_available_){}, decltype(_impl_.hanged_time_){}, decltype(_impl_.place_){}, decltype(_impl_.prop_){}, decltype(_impl_.human_type_){}, decltype(_impl_.guid_){}, decltype(_impl_.chair_time_){}, decltype(_impl_.on_chair_){}, decltype(_impl_.on_ground_){}, decltype(_impl_.view_range_){}, decltype(_impl_.ground_time_){}, decltype(_impl_.player_id_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&x_, &from.x_, static_cast(reinterpret_cast(&player_id_) - reinterpret_cast(&x_)) + sizeof(player_id_)); + ::memcpy(&_impl_.x_, &from._impl_.x_, static_cast(reinterpret_cast(&_impl_.player_id_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.player_id_)); // @@protoc_insertion_point(copy_constructor:protobuf.MessageOfHuman) } - inline void MessageOfHuman::SharedCtor() + inline void MessageOfHuman::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&x_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&player_id_) - reinterpret_cast(&x_)) + sizeof(player_id_)); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.buff_){arena}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){0}, decltype(_impl_.y_){0}, decltype(_impl_.speed_){0}, decltype(_impl_.life_){0}, decltype(_impl_.time_until_skill_available_){0}, decltype(_impl_.hanged_time_){0}, decltype(_impl_.place_){0}, decltype(_impl_.prop_){0}, decltype(_impl_.human_type_){0}, decltype(_impl_.guid_){int64_t{0}}, decltype(_impl_.chair_time_){0}, decltype(_impl_.on_chair_){false}, decltype(_impl_.on_ground_){false}, decltype(_impl_.view_range_){0}, decltype(_impl_.ground_time_){0}, decltype(_impl_.player_id_){int64_t{0}}, /*decltype(_impl_._cached_size_)*/ {}}; } MessageOfHuman::~MessageOfHuman() { // @@protoc_insertion_point(destructor:protobuf.MessageOfHuman) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MessageOfHuman::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.buff_.~RepeatedField(); } - void MessageOfHuman::ArenaDtor(void* object) - { - MessageOfHuman* _this = reinterpret_cast(object); - (void)_this; - } - void MessageOfHuman::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MessageOfHuman::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MessageOfHuman::Clear() @@ -580,12 +527,12 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - buff_.Clear(); - ::memset(&x_, 0, static_cast(reinterpret_cast(&player_id_) - reinterpret_cast(&x_)) + sizeof(player_id_)); + _impl_.buff_.Clear(); + ::memset(&_impl_.x_, 0, static_cast(reinterpret_cast(&_impl_.player_id_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.player_id_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MessageOfHuman::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MessageOfHuman::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -593,14 +540,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // int32 x = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -610,7 +557,7 @@ namespace protobuf case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { - y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -620,7 +567,7 @@ namespace protobuf case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { - speed_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.speed_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -630,7 +577,7 @@ namespace protobuf case 4: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { - life_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.life_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -640,7 +587,7 @@ namespace protobuf case 5: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { - hanged_time_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.hanged_time_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -650,7 +597,7 @@ namespace protobuf case 6: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 49)) { - time_until_skill_available_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + _impl_.time_until_skill_available_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); ptr += sizeof(double); } else @@ -693,7 +640,7 @@ namespace protobuf case 10: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 80)) { - guid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.guid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -703,7 +650,7 @@ namespace protobuf case 11: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 88)) { - on_chair_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.on_chair_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -713,7 +660,7 @@ namespace protobuf case 12: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 97)) { - chair_time_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + _impl_.chair_time_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); ptr += sizeof(double); } else @@ -723,7 +670,7 @@ namespace protobuf case 13: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 104)) { - on_ground_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.on_ground_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -733,7 +680,7 @@ namespace protobuf case 14: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 113)) { - ground_time_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + _impl_.ground_time_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); ptr += sizeof(double); } else @@ -743,7 +690,7 @@ namespace protobuf case 15: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 120)) { - player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -753,7 +700,7 @@ namespace protobuf case 16: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 128)) { - view_range_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.view_range_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -813,35 +760,35 @@ namespace protobuf if (this->_internal_x() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(1, this->_internal_x(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_x(), target); } // int32 y = 2; if (this->_internal_y() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(2, this->_internal_y(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_y(), target); } // int32 speed = 3; if (this->_internal_speed() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(3, this->_internal_speed(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_speed(), target); } // int32 life = 4; if (this->_internal_life() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(4, this->_internal_life(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(4, this->_internal_life(), target); } // int32 hanged_time = 5; if (this->_internal_hanged_time() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(5, this->_internal_hanged_time(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(5, this->_internal_hanged_time(), target); } // double time_until_skill_available = 6; @@ -852,14 +799,14 @@ namespace protobuf if (raw_time_until_skill_available != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteDoubleToArray(6, this->_internal_time_until_skill_available(), target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(6, this->_internal_time_until_skill_available(), target); } // .protobuf.PlaceType place = 7; if (this->_internal_place() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 7, this->_internal_place(), target ); } @@ -868,7 +815,7 @@ namespace protobuf if (this->_internal_prop() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 8, this->_internal_prop(), target ); } @@ -877,7 +824,7 @@ namespace protobuf if (this->_internal_human_type() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 9, this->_internal_human_type(), target ); } @@ -886,14 +833,14 @@ namespace protobuf if (this->_internal_guid() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(10, this->_internal_guid(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(10, this->_internal_guid(), target); } // bool on_chair = 11; if (this->_internal_on_chair() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(11, this->_internal_on_chair(), target); + target = ::_pbi::WireFormatLite::WriteBoolToArray(11, this->_internal_on_chair(), target); } // double chair_time = 12; @@ -904,14 +851,14 @@ namespace protobuf if (raw_chair_time != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteDoubleToArray(12, this->_internal_chair_time(), target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(12, this->_internal_chair_time(), target); } // bool on_ground = 13; if (this->_internal_on_ground() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(13, this->_internal_on_ground(), target); + target = ::_pbi::WireFormatLite::WriteBoolToArray(13, this->_internal_on_ground(), target); } // double ground_time = 14; @@ -922,37 +869,37 @@ namespace protobuf if (raw_ground_time != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteDoubleToArray(14, this->_internal_ground_time(), target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(14, this->_internal_ground_time(), target); } // int64 player_id = 15; if (this->_internal_player_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(15, this->_internal_player_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(15, this->_internal_player_id(), target); } // int32 view_range = 16; if (this->_internal_view_range() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(16, this->_internal_view_range(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(16, this->_internal_view_range(), target); } // repeated .protobuf.HumanBuffType buff = 17; { - int byte_size = _buff_cached_byte_size_.load(std::memory_order_relaxed); + int byte_size = _impl_._buff_cached_byte_size_.load(std::memory_order_relaxed); if (byte_size > 0) { target = stream->WriteEnumPacked( - 17, buff_, byte_size, target + 17, _impl_.buff_, byte_size, target ); } } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -975,44 +922,42 @@ namespace protobuf unsigned int count = static_cast(this->_internal_buff_size()); for (unsigned int i = 0; i < count; i++) { - data_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize( + data_size += ::_pbi::WireFormatLite::EnumSize( this->_internal_buff(static_cast(i)) ); } if (data_size > 0) { total_size += 2 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( - static_cast(data_size) - ); + ::_pbi::WireFormatLite::Int32Size(static_cast(data_size)); } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(data_size); - _buff_cached_byte_size_.store(cached_size, std::memory_order_relaxed); + int cached_size = ::_pbi::ToCachedSize(data_size); + _impl_._buff_cached_byte_size_.store(cached_size, std::memory_order_relaxed); total_size += data_size; } // int32 x = 1; if (this->_internal_x() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_x()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_x()); } // int32 y = 2; if (this->_internal_y() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_y()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_y()); } // int32 speed = 3; if (this->_internal_speed() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_speed()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_speed()); } // int32 life = 4; if (this->_internal_life() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_life()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_life()); } // double time_until_skill_available = 6; @@ -1028,34 +973,34 @@ namespace protobuf // int32 hanged_time = 5; if (this->_internal_hanged_time() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_hanged_time()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_hanged_time()); } // .protobuf.PlaceType place = 7; if (this->_internal_place() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_place()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_place()); } // .protobuf.PropType prop = 8; if (this->_internal_prop() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_prop()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_prop()); } // .protobuf.HumanType human_type = 9; if (this->_internal_human_type() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_human_type()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_human_type()); } // int64 guid = 10; if (this->_internal_guid() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_guid()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_guid()); } // double chair_time = 12; @@ -1084,7 +1029,7 @@ namespace protobuf if (this->_internal_view_range() != 0) { total_size += 2 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( + ::_pbi::WireFormatLite::Int32Size( this->_internal_view_range() ); } @@ -1102,50 +1047,45 @@ namespace protobuf // int64 player_id = 15; if (this->_internal_player_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MessageOfHuman::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MessageOfHuman::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MessageOfHuman::GetClassData() const { return &_class_data_; } - void MessageOfHuman::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MessageOfHuman::MergeFrom(const MessageOfHuman& from) + void MessageOfHuman::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MessageOfHuman) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; - buff_.MergeFrom(from.buff_); + _this->_impl_.buff_.MergeFrom(from._impl_.buff_); if (from._internal_x() != 0) { - _internal_set_x(from._internal_x()); + _this->_internal_set_x(from._internal_x()); } if (from._internal_y() != 0) { - _internal_set_y(from._internal_y()); + _this->_internal_set_y(from._internal_y()); } if (from._internal_speed() != 0) { - _internal_set_speed(from._internal_speed()); + _this->_internal_set_speed(from._internal_speed()); } if (from._internal_life() != 0) { - _internal_set_life(from._internal_life()); + _this->_internal_set_life(from._internal_life()); } static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); double tmp_time_until_skill_available = from._internal_time_until_skill_available(); @@ -1153,27 +1093,27 @@ namespace protobuf memcpy(&raw_time_until_skill_available, &tmp_time_until_skill_available, sizeof(tmp_time_until_skill_available)); if (raw_time_until_skill_available != 0) { - _internal_set_time_until_skill_available(from._internal_time_until_skill_available()); + _this->_internal_set_time_until_skill_available(from._internal_time_until_skill_available()); } if (from._internal_hanged_time() != 0) { - _internal_set_hanged_time(from._internal_hanged_time()); + _this->_internal_set_hanged_time(from._internal_hanged_time()); } if (from._internal_place() != 0) { - _internal_set_place(from._internal_place()); + _this->_internal_set_place(from._internal_place()); } if (from._internal_prop() != 0) { - _internal_set_prop(from._internal_prop()); + _this->_internal_set_prop(from._internal_prop()); } if (from._internal_human_type() != 0) { - _internal_set_human_type(from._internal_human_type()); + _this->_internal_set_human_type(from._internal_human_type()); } if (from._internal_guid() != 0) { - _internal_set_guid(from._internal_guid()); + _this->_internal_set_guid(from._internal_guid()); } static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); double tmp_chair_time = from._internal_chair_time(); @@ -1181,19 +1121,19 @@ namespace protobuf memcpy(&raw_chair_time, &tmp_chair_time, sizeof(tmp_chair_time)); if (raw_chair_time != 0) { - _internal_set_chair_time(from._internal_chair_time()); + _this->_internal_set_chair_time(from._internal_chair_time()); } if (from._internal_on_chair() != 0) { - _internal_set_on_chair(from._internal_on_chair()); + _this->_internal_set_on_chair(from._internal_on_chair()); } if (from._internal_on_ground() != 0) { - _internal_set_on_ground(from._internal_on_ground()); + _this->_internal_set_on_ground(from._internal_on_ground()); } if (from._internal_view_range() != 0) { - _internal_set_view_range(from._internal_view_range()); + _this->_internal_set_view_range(from._internal_view_range()); } static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); double tmp_ground_time = from._internal_ground_time(); @@ -1201,13 +1141,13 @@ namespace protobuf memcpy(&raw_ground_time, &tmp_ground_time, sizeof(tmp_ground_time)); if (raw_ground_time != 0) { - _internal_set_ground_time(from._internal_ground_time()); + _this->_internal_set_ground_time(from._internal_ground_time()); } if (from._internal_player_id() != 0) { - _internal_set_player_id(from._internal_player_id()); + _this->_internal_set_player_id(from._internal_player_id()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MessageOfHuman::CopyFrom(const MessageOfHuman& from) @@ -1228,17 +1168,17 @@ namespace protobuf { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - buff_.InternalSwap(&other->buff_); + _impl_.buff_.InternalSwap(&other->_impl_.buff_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(MessageOfHuman, player_id_) + sizeof(MessageOfHuman::player_id_) - PROTOBUF_FIELD_OFFSET(MessageOfHuman, x_)>( - reinterpret_cast(&x_), - reinterpret_cast(&other->x_) + PROTOBUF_FIELD_OFFSET(MessageOfHuman, _impl_.player_id_) + sizeof(MessageOfHuman::_impl_.player_id_) - PROTOBUF_FIELD_OFFSET(MessageOfHuman, _impl_.x_)>( + reinterpret_cast(&_impl_.x_), + reinterpret_cast(&other->_impl_.x_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata MessageOfHuman::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[0] ); } @@ -1251,55 +1191,54 @@ namespace protobuf }; MessageOfButcher::MessageOfButcher(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : - ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned), - buff_(arena) + ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MessageOfButcher) } MessageOfButcher::MessageOfButcher(const MessageOfButcher& from) : - ::PROTOBUF_NAMESPACE_ID::Message(), - buff_(from.buff_) + ::PROTOBUF_NAMESPACE_ID::Message() { + MessageOfButcher* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.buff_){from._impl_.buff_}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){}, decltype(_impl_.y_){}, decltype(_impl_.speed_){}, decltype(_impl_.damage_){}, decltype(_impl_.time_until_skill_available_){}, decltype(_impl_.place_){}, decltype(_impl_.prop_){}, decltype(_impl_.guid_){}, decltype(_impl_.butcher_type_){}, decltype(_impl_.movable_){}, decltype(_impl_.playerid_){}, decltype(_impl_.view_range_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&x_, &from.x_, static_cast(reinterpret_cast(&view_range_) - reinterpret_cast(&x_)) + sizeof(view_range_)); + ::memcpy(&_impl_.x_, &from._impl_.x_, static_cast(reinterpret_cast(&_impl_.view_range_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.view_range_)); // @@protoc_insertion_point(copy_constructor:protobuf.MessageOfButcher) } - inline void MessageOfButcher::SharedCtor() + inline void MessageOfButcher::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&x_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&view_range_) - reinterpret_cast(&x_)) + sizeof(view_range_)); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.buff_){arena}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){0}, decltype(_impl_.y_){0}, decltype(_impl_.speed_){0}, decltype(_impl_.damage_){0}, decltype(_impl_.time_until_skill_available_){0}, decltype(_impl_.place_){0}, decltype(_impl_.prop_){0}, decltype(_impl_.guid_){int64_t{0}}, decltype(_impl_.butcher_type_){0}, decltype(_impl_.movable_){false}, decltype(_impl_.playerid_){int64_t{0}}, decltype(_impl_.view_range_){0}, /*decltype(_impl_._cached_size_)*/ {}}; } MessageOfButcher::~MessageOfButcher() { // @@protoc_insertion_point(destructor:protobuf.MessageOfButcher) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MessageOfButcher::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.buff_.~RepeatedField(); } - void MessageOfButcher::ArenaDtor(void* object) - { - MessageOfButcher* _this = reinterpret_cast(object); - (void)_this; - } - void MessageOfButcher::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MessageOfButcher::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MessageOfButcher::Clear() @@ -1309,12 +1248,12 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - buff_.Clear(); - ::memset(&x_, 0, static_cast(reinterpret_cast(&view_range_) - reinterpret_cast(&x_)) + sizeof(view_range_)); + _impl_.buff_.Clear(); + ::memset(&_impl_.x_, 0, static_cast(reinterpret_cast(&_impl_.view_range_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.view_range_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MessageOfButcher::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MessageOfButcher::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -1322,14 +1261,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // int32 x = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -1339,7 +1278,7 @@ namespace protobuf case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { - y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -1349,7 +1288,7 @@ namespace protobuf case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { - speed_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.speed_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -1359,7 +1298,7 @@ namespace protobuf case 4: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { - damage_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.damage_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -1369,7 +1308,7 @@ namespace protobuf case 5: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 41)) { - time_until_skill_available_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + _impl_.time_until_skill_available_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); ptr += sizeof(double); } else @@ -1412,7 +1351,7 @@ namespace protobuf case 9: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 72)) { - guid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.guid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -1422,7 +1361,7 @@ namespace protobuf case 10: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 80)) { - movable_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.movable_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -1432,7 +1371,7 @@ namespace protobuf case 11: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 88)) { - playerid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.playerid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -1442,7 +1381,7 @@ namespace protobuf case 12: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 96)) { - view_range_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.view_range_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -1502,28 +1441,28 @@ namespace protobuf if (this->_internal_x() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(1, this->_internal_x(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_x(), target); } // int32 y = 2; if (this->_internal_y() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(2, this->_internal_y(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_y(), target); } // int32 speed = 3; if (this->_internal_speed() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(3, this->_internal_speed(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_speed(), target); } // int32 damage = 4; if (this->_internal_damage() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(4, this->_internal_damage(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(4, this->_internal_damage(), target); } // double time_until_skill_available = 5; @@ -1534,14 +1473,14 @@ namespace protobuf if (raw_time_until_skill_available != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteDoubleToArray(5, this->_internal_time_until_skill_available(), target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(5, this->_internal_time_until_skill_available(), target); } // .protobuf.PlaceType place = 6; if (this->_internal_place() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 6, this->_internal_place(), target ); } @@ -1550,7 +1489,7 @@ namespace protobuf if (this->_internal_prop() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 7, this->_internal_prop(), target ); } @@ -1559,7 +1498,7 @@ namespace protobuf if (this->_internal_butcher_type() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 8, this->_internal_butcher_type(), target ); } @@ -1568,44 +1507,44 @@ namespace protobuf if (this->_internal_guid() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(9, this->_internal_guid(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(9, this->_internal_guid(), target); } // bool movable = 10; if (this->_internal_movable() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(10, this->_internal_movable(), target); + target = ::_pbi::WireFormatLite::WriteBoolToArray(10, this->_internal_movable(), target); } // int64 playerID = 11; if (this->_internal_playerid() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(11, this->_internal_playerid(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(11, this->_internal_playerid(), target); } // int32 view_range = 12; if (this->_internal_view_range() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(12, this->_internal_view_range(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(12, this->_internal_view_range(), target); } // repeated .protobuf.ButcherBuffType buff = 13; { - int byte_size = _buff_cached_byte_size_.load(std::memory_order_relaxed); + int byte_size = _impl_._buff_cached_byte_size_.load(std::memory_order_relaxed); if (byte_size > 0) { target = stream->WriteEnumPacked( - 13, buff_, byte_size, target + 13, _impl_.buff_, byte_size, target ); } } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -1628,44 +1567,42 @@ namespace protobuf unsigned int count = static_cast(this->_internal_buff_size()); for (unsigned int i = 0; i < count; i++) { - data_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize( + data_size += ::_pbi::WireFormatLite::EnumSize( this->_internal_buff(static_cast(i)) ); } if (data_size > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( - static_cast(data_size) - ); + ::_pbi::WireFormatLite::Int32Size(static_cast(data_size)); } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(data_size); - _buff_cached_byte_size_.store(cached_size, std::memory_order_relaxed); + int cached_size = ::_pbi::ToCachedSize(data_size); + _impl_._buff_cached_byte_size_.store(cached_size, std::memory_order_relaxed); total_size += data_size; } // int32 x = 1; if (this->_internal_x() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_x()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_x()); } // int32 y = 2; if (this->_internal_y() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_y()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_y()); } // int32 speed = 3; if (this->_internal_speed() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_speed()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_speed()); } // int32 damage = 4; if (this->_internal_damage() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_damage()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_damage()); } // double time_until_skill_available = 5; @@ -1682,27 +1619,27 @@ namespace protobuf if (this->_internal_place() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_place()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_place()); } // .protobuf.PropType prop = 7; if (this->_internal_prop() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_prop()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_prop()); } // int64 guid = 9; if (this->_internal_guid() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_guid()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_guid()); } // .protobuf.ButcherType butcher_type = 8; if (this->_internal_butcher_type() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_butcher_type()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_butcher_type()); } // bool movable = 10; @@ -1714,56 +1651,51 @@ namespace protobuf // int64 playerID = 11; if (this->_internal_playerid() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_playerid()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_playerid()); } // int32 view_range = 12; if (this->_internal_view_range() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_view_range()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_view_range()); } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MessageOfButcher::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MessageOfButcher::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MessageOfButcher::GetClassData() const { return &_class_data_; } - void MessageOfButcher::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MessageOfButcher::MergeFrom(const MessageOfButcher& from) + void MessageOfButcher::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MessageOfButcher) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; - buff_.MergeFrom(from.buff_); + _this->_impl_.buff_.MergeFrom(from._impl_.buff_); if (from._internal_x() != 0) { - _internal_set_x(from._internal_x()); + _this->_internal_set_x(from._internal_x()); } if (from._internal_y() != 0) { - _internal_set_y(from._internal_y()); + _this->_internal_set_y(from._internal_y()); } if (from._internal_speed() != 0) { - _internal_set_speed(from._internal_speed()); + _this->_internal_set_speed(from._internal_speed()); } if (from._internal_damage() != 0) { - _internal_set_damage(from._internal_damage()); + _this->_internal_set_damage(from._internal_damage()); } static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); double tmp_time_until_skill_available = from._internal_time_until_skill_available(); @@ -1771,37 +1703,37 @@ namespace protobuf memcpy(&raw_time_until_skill_available, &tmp_time_until_skill_available, sizeof(tmp_time_until_skill_available)); if (raw_time_until_skill_available != 0) { - _internal_set_time_until_skill_available(from._internal_time_until_skill_available()); + _this->_internal_set_time_until_skill_available(from._internal_time_until_skill_available()); } if (from._internal_place() != 0) { - _internal_set_place(from._internal_place()); + _this->_internal_set_place(from._internal_place()); } if (from._internal_prop() != 0) { - _internal_set_prop(from._internal_prop()); + _this->_internal_set_prop(from._internal_prop()); } if (from._internal_guid() != 0) { - _internal_set_guid(from._internal_guid()); + _this->_internal_set_guid(from._internal_guid()); } if (from._internal_butcher_type() != 0) { - _internal_set_butcher_type(from._internal_butcher_type()); + _this->_internal_set_butcher_type(from._internal_butcher_type()); } if (from._internal_movable() != 0) { - _internal_set_movable(from._internal_movable()); + _this->_internal_set_movable(from._internal_movable()); } if (from._internal_playerid() != 0) { - _internal_set_playerid(from._internal_playerid()); + _this->_internal_set_playerid(from._internal_playerid()); } if (from._internal_view_range() != 0) { - _internal_set_view_range(from._internal_view_range()); + _this->_internal_set_view_range(from._internal_view_range()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MessageOfButcher::CopyFrom(const MessageOfButcher& from) @@ -1822,17 +1754,17 @@ namespace protobuf { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - buff_.InternalSwap(&other->buff_); + _impl_.buff_.InternalSwap(&other->_impl_.buff_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(MessageOfButcher, view_range_) + sizeof(MessageOfButcher::view_range_) - PROTOBUF_FIELD_OFFSET(MessageOfButcher, x_)>( - reinterpret_cast(&x_), - reinterpret_cast(&other->x_) + PROTOBUF_FIELD_OFFSET(MessageOfButcher, _impl_.view_range_) + sizeof(MessageOfButcher::_impl_.view_range_) - PROTOBUF_FIELD_OFFSET(MessageOfButcher, _impl_.x_)>( + reinterpret_cast(&_impl_.x_), + reinterpret_cast(&other->_impl_.x_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata MessageOfButcher::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[1] ); } @@ -1847,33 +1779,41 @@ namespace protobuf MessageOfProp::MessageOfProp(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MessageOfProp) } MessageOfProp::MessageOfProp(const MessageOfProp& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + MessageOfProp* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.type_){}, decltype(_impl_.x_){}, decltype(_impl_.facing_direction_){}, decltype(_impl_.y_){}, decltype(_impl_.place_){}, decltype(_impl_.guid_){}, decltype(_impl_.size_){}, decltype(_impl_.is_moving_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&type_, &from.type_, static_cast(reinterpret_cast(&is_moving_) - reinterpret_cast(&type_)) + sizeof(is_moving_)); + ::memcpy(&_impl_.type_, &from._impl_.type_, static_cast(reinterpret_cast(&_impl_.is_moving_) - reinterpret_cast(&_impl_.type_)) + sizeof(_impl_.is_moving_)); // @@protoc_insertion_point(copy_constructor:protobuf.MessageOfProp) } - inline void MessageOfProp::SharedCtor() + inline void MessageOfProp::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&type_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&is_moving_) - reinterpret_cast(&type_)) + sizeof(is_moving_)); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.type_){0}, decltype(_impl_.x_){0}, decltype(_impl_.facing_direction_){0}, decltype(_impl_.y_){0}, decltype(_impl_.place_){0}, decltype(_impl_.guid_){int64_t{0}}, decltype(_impl_.size_){0}, decltype(_impl_.is_moving_){false}, /*decltype(_impl_._cached_size_)*/ {}}; } MessageOfProp::~MessageOfProp() { // @@protoc_insertion_point(destructor:protobuf.MessageOfProp) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MessageOfProp::SharedDtor() @@ -1881,17 +1821,9 @@ namespace protobuf GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); } - void MessageOfProp::ArenaDtor(void* object) - { - MessageOfProp* _this = reinterpret_cast(object); - (void)_this; - } - void MessageOfProp::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MessageOfProp::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MessageOfProp::Clear() @@ -1901,11 +1833,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - ::memset(&type_, 0, static_cast(reinterpret_cast(&is_moving_) - reinterpret_cast(&type_)) + sizeof(is_moving_)); + ::memset(&_impl_.type_, 0, static_cast(reinterpret_cast(&_impl_.is_moving_) - reinterpret_cast(&_impl_.type_)) + sizeof(_impl_.is_moving_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MessageOfProp::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MessageOfProp::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -1913,7 +1845,7 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // .protobuf.PropType type = 1; @@ -1931,7 +1863,7 @@ namespace protobuf case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { - x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -1941,7 +1873,7 @@ namespace protobuf case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { - y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -1951,7 +1883,7 @@ namespace protobuf case 4: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 33)) { - facing_direction_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + _impl_.facing_direction_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); ptr += sizeof(double); } else @@ -1961,7 +1893,7 @@ namespace protobuf case 5: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { - guid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.guid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -1982,7 +1914,7 @@ namespace protobuf case 7: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { - size_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.size_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -1992,7 +1924,7 @@ namespace protobuf case 8: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 64)) { - is_moving_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.is_moving_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -2036,7 +1968,7 @@ namespace protobuf if (this->_internal_type() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 1, this->_internal_type(), target ); } @@ -2045,14 +1977,14 @@ namespace protobuf if (this->_internal_x() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(2, this->_internal_x(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_x(), target); } // int32 y = 3; if (this->_internal_y() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(3, this->_internal_y(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_y(), target); } // double facing_direction = 4; @@ -2063,21 +1995,21 @@ namespace protobuf if (raw_facing_direction != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteDoubleToArray(4, this->_internal_facing_direction(), target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(4, this->_internal_facing_direction(), target); } // int64 guid = 5; if (this->_internal_guid() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(5, this->_internal_guid(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(5, this->_internal_guid(), target); } // .protobuf.PlaceType place = 6; if (this->_internal_place() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 6, this->_internal_place(), target ); } @@ -2086,19 +2018,19 @@ namespace protobuf if (this->_internal_size() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(7, this->_internal_size(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(7, this->_internal_size(), target); } // bool is_moving = 8; if (this->_internal_is_moving() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(8, this->_internal_is_moving(), target); + target = ::_pbi::WireFormatLite::WriteBoolToArray(8, this->_internal_is_moving(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -2119,13 +2051,13 @@ namespace protobuf if (this->_internal_type() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_type()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_type()); } // int32 x = 2; if (this->_internal_x() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_x()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_x()); } // double facing_direction = 4; @@ -2141,26 +2073,26 @@ namespace protobuf // int32 y = 3; if (this->_internal_y() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_y()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_y()); } // .protobuf.PlaceType place = 6; if (this->_internal_place() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_place()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_place()); } // int64 guid = 5; if (this->_internal_guid() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_guid()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_guid()); } // int32 size = 7; if (this->_internal_size() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_size()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_size()); } // bool is_moving = 8; @@ -2169,38 +2101,33 @@ namespace protobuf total_size += 1 + 1; } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MessageOfProp::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MessageOfProp::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MessageOfProp::GetClassData() const { return &_class_data_; } - void MessageOfProp::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MessageOfProp::MergeFrom(const MessageOfProp& from) + void MessageOfProp::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MessageOfProp) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (from._internal_type() != 0) { - _internal_set_type(from._internal_type()); + _this->_internal_set_type(from._internal_type()); } if (from._internal_x() != 0) { - _internal_set_x(from._internal_x()); + _this->_internal_set_x(from._internal_x()); } static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); double tmp_facing_direction = from._internal_facing_direction(); @@ -2208,29 +2135,29 @@ namespace protobuf memcpy(&raw_facing_direction, &tmp_facing_direction, sizeof(tmp_facing_direction)); if (raw_facing_direction != 0) { - _internal_set_facing_direction(from._internal_facing_direction()); + _this->_internal_set_facing_direction(from._internal_facing_direction()); } if (from._internal_y() != 0) { - _internal_set_y(from._internal_y()); + _this->_internal_set_y(from._internal_y()); } if (from._internal_place() != 0) { - _internal_set_place(from._internal_place()); + _this->_internal_set_place(from._internal_place()); } if (from._internal_guid() != 0) { - _internal_set_guid(from._internal_guid()); + _this->_internal_set_guid(from._internal_guid()); } if (from._internal_size() != 0) { - _internal_set_size(from._internal_size()); + _this->_internal_set_size(from._internal_size()); } if (from._internal_is_moving() != 0) { - _internal_set_is_moving(from._internal_is_moving()); + _this->_internal_set_is_moving(from._internal_is_moving()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MessageOfProp::CopyFrom(const MessageOfProp& from) @@ -2252,15 +2179,15 @@ namespace protobuf using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(MessageOfProp, is_moving_) + sizeof(MessageOfProp::is_moving_) - PROTOBUF_FIELD_OFFSET(MessageOfProp, type_)>( - reinterpret_cast(&type_), - reinterpret_cast(&other->type_) + PROTOBUF_FIELD_OFFSET(MessageOfProp, _impl_.is_moving_) + sizeof(MessageOfProp::_impl_.is_moving_) - PROTOBUF_FIELD_OFFSET(MessageOfProp, _impl_.type_)>( + reinterpret_cast(&_impl_.type_), + reinterpret_cast(&other->_impl_.type_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata MessageOfProp::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[2] ); } @@ -2275,33 +2202,41 @@ namespace protobuf MessageOfPickedProp::MessageOfPickedProp(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MessageOfPickedProp) } MessageOfPickedProp::MessageOfPickedProp(const MessageOfPickedProp& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + MessageOfPickedProp* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.type_){}, decltype(_impl_.x_){}, decltype(_impl_.facing_direction_){}, decltype(_impl_.mapping_id_){}, decltype(_impl_.y_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&type_, &from.type_, static_cast(reinterpret_cast(&y_) - reinterpret_cast(&type_)) + sizeof(y_)); + ::memcpy(&_impl_.type_, &from._impl_.type_, static_cast(reinterpret_cast(&_impl_.y_) - reinterpret_cast(&_impl_.type_)) + sizeof(_impl_.y_)); // @@protoc_insertion_point(copy_constructor:protobuf.MessageOfPickedProp) } - inline void MessageOfPickedProp::SharedCtor() + inline void MessageOfPickedProp::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&type_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&y_) - reinterpret_cast(&type_)) + sizeof(y_)); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.type_){0}, decltype(_impl_.x_){0}, decltype(_impl_.facing_direction_){0}, decltype(_impl_.mapping_id_){int64_t{0}}, decltype(_impl_.y_){0}, /*decltype(_impl_._cached_size_)*/ {}}; } MessageOfPickedProp::~MessageOfPickedProp() { // @@protoc_insertion_point(destructor:protobuf.MessageOfPickedProp) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MessageOfPickedProp::SharedDtor() @@ -2309,17 +2244,9 @@ namespace protobuf GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); } - void MessageOfPickedProp::ArenaDtor(void* object) - { - MessageOfPickedProp* _this = reinterpret_cast(object); - (void)_this; - } - void MessageOfPickedProp::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MessageOfPickedProp::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MessageOfPickedProp::Clear() @@ -2329,11 +2256,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - ::memset(&type_, 0, static_cast(reinterpret_cast(&y_) - reinterpret_cast(&type_)) + sizeof(y_)); + ::memset(&_impl_.type_, 0, static_cast(reinterpret_cast(&_impl_.y_) - reinterpret_cast(&_impl_.type_)) + sizeof(_impl_.y_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MessageOfPickedProp::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MessageOfPickedProp::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -2341,7 +2268,7 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // .protobuf.PropType type = 1; @@ -2359,7 +2286,7 @@ namespace protobuf case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { - x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -2369,7 +2296,7 @@ namespace protobuf case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { - y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else @@ -2379,7 +2306,7 @@ namespace protobuf case 4: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 33)) { - facing_direction_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + _impl_.facing_direction_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); ptr += sizeof(double); } else @@ -2389,7 +2316,7 @@ namespace protobuf case 5: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { - mapping_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.mapping_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -2433,7 +2360,7 @@ namespace protobuf if (this->_internal_type() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 1, this->_internal_type(), target ); } @@ -2442,14 +2369,14 @@ namespace protobuf if (this->_internal_x() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(2, this->_internal_x(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_x(), target); } // int32 y = 3; if (this->_internal_y() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(3, this->_internal_y(), target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_y(), target); } // double facing_direction = 4; @@ -2460,19 +2387,19 @@ namespace protobuf if (raw_facing_direction != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteDoubleToArray(4, this->_internal_facing_direction(), target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(4, this->_internal_facing_direction(), target); } // int64 mapping_id = 5; if (this->_internal_mapping_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(5, this->_internal_mapping_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(5, this->_internal_mapping_id(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -2493,13 +2420,13 @@ namespace protobuf if (this->_internal_type() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_type()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_type()); } // int32 x = 2; if (this->_internal_x() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_x()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_x()); } // double facing_direction = 4; @@ -2515,47 +2442,42 @@ namespace protobuf // int64 mapping_id = 5; if (this->_internal_mapping_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_mapping_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_mapping_id()); } // int32 y = 3; if (this->_internal_y() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_y()); + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_y()); } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MessageOfPickedProp::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MessageOfPickedProp::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MessageOfPickedProp::GetClassData() const { return &_class_data_; } - void MessageOfPickedProp::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MessageOfPickedProp::MergeFrom(const MessageOfPickedProp& from) + void MessageOfPickedProp::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MessageOfPickedProp) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (from._internal_type() != 0) { - _internal_set_type(from._internal_type()); + _this->_internal_set_type(from._internal_type()); } if (from._internal_x() != 0) { - _internal_set_x(from._internal_x()); + _this->_internal_set_x(from._internal_x()); } static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); double tmp_facing_direction = from._internal_facing_direction(); @@ -2563,17 +2485,17 @@ namespace protobuf memcpy(&raw_facing_direction, &tmp_facing_direction, sizeof(tmp_facing_direction)); if (raw_facing_direction != 0) { - _internal_set_facing_direction(from._internal_facing_direction()); + _this->_internal_set_facing_direction(from._internal_facing_direction()); } if (from._internal_mapping_id() != 0) { - _internal_set_mapping_id(from._internal_mapping_id()); + _this->_internal_set_mapping_id(from._internal_mapping_id()); } if (from._internal_y() != 0) { - _internal_set_y(from._internal_y()); + _this->_internal_set_y(from._internal_y()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MessageOfPickedProp::CopyFrom(const MessageOfPickedProp& from) @@ -2595,15 +2517,15 @@ namespace protobuf using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(MessageOfPickedProp, y_) + sizeof(MessageOfPickedProp::y_) - PROTOBUF_FIELD_OFFSET(MessageOfPickedProp, type_)>( - reinterpret_cast(&type_), - reinterpret_cast(&other->type_) + PROTOBUF_FIELD_OFFSET(MessageOfPickedProp, _impl_.y_) + sizeof(MessageOfPickedProp::_impl_.y_) - PROTOBUF_FIELD_OFFSET(MessageOfPickedProp, _impl_.type_)>( + reinterpret_cast(&_impl_.type_), + reinterpret_cast(&other->_impl_.type_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata MessageOfPickedProp::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[3] ); } @@ -2616,53 +2538,53 @@ namespace protobuf }; MessageOfMap_Row::MessageOfMap_Row(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : - ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned), - col_(arena) + ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MessageOfMap.Row) } MessageOfMap_Row::MessageOfMap_Row(const MessageOfMap_Row& from) : - ::PROTOBUF_NAMESPACE_ID::Message(), - col_(from.col_) + ::PROTOBUF_NAMESPACE_ID::Message() { + MessageOfMap_Row* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.col_){from._impl_.col_}, /*decltype(_impl_._col_cached_byte_size_)*/ {0}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:protobuf.MessageOfMap.Row) } - inline void MessageOfMap_Row::SharedCtor() + inline void MessageOfMap_Row::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.col_){arena}, /*decltype(_impl_._col_cached_byte_size_)*/ {0}, /*decltype(_impl_._cached_size_)*/ {}}; } MessageOfMap_Row::~MessageOfMap_Row() { // @@protoc_insertion_point(destructor:protobuf.MessageOfMap.Row) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MessageOfMap_Row::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.col_.~RepeatedField(); } - void MessageOfMap_Row::ArenaDtor(void* object) - { - MessageOfMap_Row* _this = reinterpret_cast(object); - (void)_this; - } - void MessageOfMap_Row::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MessageOfMap_Row::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MessageOfMap_Row::Clear() @@ -2672,11 +2594,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - col_.Clear(); + _impl_.col_.Clear(); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MessageOfMap_Row::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MessageOfMap_Row::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -2684,7 +2606,7 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // repeated .protobuf.PlaceType col = 1; @@ -2739,18 +2661,18 @@ namespace protobuf // repeated .protobuf.PlaceType col = 1; { - int byte_size = _col_cached_byte_size_.load(std::memory_order_relaxed); + int byte_size = _impl_._col_cached_byte_size_.load(std::memory_order_relaxed); if (byte_size > 0) { target = stream->WriteEnumPacked( - 1, col_, byte_size, target + 1, _impl_.col_, byte_size, target ); } } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -2773,49 +2695,42 @@ namespace protobuf unsigned int count = static_cast(this->_internal_col_size()); for (unsigned int i = 0; i < count; i++) { - data_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize( + data_size += ::_pbi::WireFormatLite::EnumSize( this->_internal_col(static_cast(i)) ); } if (data_size > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( - static_cast(data_size) - ); + ::_pbi::WireFormatLite::Int32Size(static_cast(data_size)); } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(data_size); - _col_cached_byte_size_.store(cached_size, std::memory_order_relaxed); + int cached_size = ::_pbi::ToCachedSize(data_size); + _impl_._col_cached_byte_size_.store(cached_size, std::memory_order_relaxed); total_size += data_size; } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MessageOfMap_Row::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MessageOfMap_Row::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MessageOfMap_Row::GetClassData() const { return &_class_data_; } - void MessageOfMap_Row::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MessageOfMap_Row::MergeFrom(const MessageOfMap_Row& from) + void MessageOfMap_Row::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MessageOfMap.Row) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; - col_.MergeFrom(from.col_); - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_impl_.col_.MergeFrom(from._impl_.col_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MessageOfMap_Row::CopyFrom(const MessageOfMap_Row& from) @@ -2836,12 +2751,12 @@ namespace protobuf { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - col_.InternalSwap(&other->col_); + _impl_.col_.InternalSwap(&other->_impl_.col_); } ::PROTOBUF_NAMESPACE_ID::Metadata MessageOfMap_Row::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[4] ); } @@ -2854,53 +2769,53 @@ namespace protobuf }; MessageOfMap::MessageOfMap(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : - ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned), - row_(arena) + ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MessageOfMap) } MessageOfMap::MessageOfMap(const MessageOfMap& from) : - ::PROTOBUF_NAMESPACE_ID::Message(), - row_(from.row_) + ::PROTOBUF_NAMESPACE_ID::Message() { + MessageOfMap* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.row_){from._impl_.row_}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:protobuf.MessageOfMap) } - inline void MessageOfMap::SharedCtor() + inline void MessageOfMap::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.row_){arena}, /*decltype(_impl_._cached_size_)*/ {}}; } MessageOfMap::~MessageOfMap() { // @@protoc_insertion_point(destructor:protobuf.MessageOfMap) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MessageOfMap::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.row_.~RepeatedPtrField(); } - void MessageOfMap::ArenaDtor(void* object) - { - MessageOfMap* _this = reinterpret_cast(object); - (void)_this; - } - void MessageOfMap::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MessageOfMap::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MessageOfMap::Clear() @@ -2910,11 +2825,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - row_.Clear(); + _impl_.row_.Clear(); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MessageOfMap::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MessageOfMap::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -2922,7 +2837,7 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // repeated .protobuf.MessageOfMap.Row row = 2; @@ -2977,19 +2892,19 @@ namespace protobuf (void)cached_has_bits; // repeated .protobuf.MessageOfMap.Row row = 2; - for (unsigned int i = 0, - n = static_cast(this->_internal_row_size()); + for (unsigned i = 0, + n = static_cast(this->_internal_row_size()); i < n; i++) { - target = stream->EnsureSpace(target); + const auto& repfield = this->_internal_row(i); target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessage(2, this->_internal_row(i), target, stream); + InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -3008,39 +2923,34 @@ namespace protobuf // repeated .protobuf.MessageOfMap.Row row = 2; total_size += 1UL * this->_internal_row_size(); - for (const auto& msg : this->row_) + for (const auto& msg : this->_impl_.row_) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MessageOfMap::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MessageOfMap::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MessageOfMap::GetClassData() const { return &_class_data_; } - void MessageOfMap::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MessageOfMap::MergeFrom(const MessageOfMap& from) + void MessageOfMap::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MessageOfMap) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; - row_.MergeFrom(from.row_); - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_impl_.row_.MergeFrom(from._impl_.row_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MessageOfMap::CopyFrom(const MessageOfMap& from) @@ -3061,12 +2971,12 @@ namespace protobuf { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - row_.InternalSwap(&other->row_); + _impl_.row_.InternalSwap(&other->_impl_.row_); } ::PROTOBUF_NAMESPACE_ID::Metadata MessageOfMap::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[5] ); } @@ -3082,71 +2992,64 @@ namespace protobuf const ::protobuf::MessageOfMap& MessageToClient::_Internal::map_massage(const MessageToClient* msg) { - return *msg->map_massage_; + return *msg->_impl_.map_massage_; } MessageToClient::MessageToClient(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : - ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned), - human_message_(arena), - butcher_message_(arena), - prop_message_(arena) + ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MessageToClient) } MessageToClient::MessageToClient(const MessageToClient& from) : - ::PROTOBUF_NAMESPACE_ID::Message(), - human_message_(from.human_message_), - butcher_message_(from.butcher_message_), - prop_message_(from.prop_message_) + ::PROTOBUF_NAMESPACE_ID::Message() { + MessageToClient* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.human_message_){from._impl_.human_message_}, decltype(_impl_.butcher_message_){from._impl_.butcher_message_}, decltype(_impl_.prop_message_){from._impl_.prop_message_}, decltype(_impl_.map_massage_){nullptr}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); if (from._internal_has_map_massage()) { - map_massage_ = new ::protobuf::MessageOfMap(*from.map_massage_); - } - else - { - map_massage_ = nullptr; + _this->_impl_.map_massage_ = new ::protobuf::MessageOfMap(*from._impl_.map_massage_); } // @@protoc_insertion_point(copy_constructor:protobuf.MessageToClient) } - inline void MessageToClient::SharedCtor() + inline void MessageToClient::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - map_massage_ = nullptr; + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.human_message_){arena}, decltype(_impl_.butcher_message_){arena}, decltype(_impl_.prop_message_){arena}, decltype(_impl_.map_massage_){nullptr}, /*decltype(_impl_._cached_size_)*/ {}}; } MessageToClient::~MessageToClient() { // @@protoc_insertion_point(destructor:protobuf.MessageToClient) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MessageToClient::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.human_message_.~RepeatedPtrField(); + _impl_.butcher_message_.~RepeatedPtrField(); + _impl_.prop_message_.~RepeatedPtrField(); if (this != internal_default_instance()) - delete map_massage_; + delete _impl_.map_massage_; } - void MessageToClient::ArenaDtor(void* object) - { - MessageToClient* _this = reinterpret_cast(object); - (void)_this; - } - void MessageToClient::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MessageToClient::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MessageToClient::Clear() @@ -3156,18 +3059,18 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - human_message_.Clear(); - butcher_message_.Clear(); - prop_message_.Clear(); - if (GetArenaForAllocation() == nullptr && map_massage_ != nullptr) + _impl_.human_message_.Clear(); + _impl_.butcher_message_.Clear(); + _impl_.prop_message_.Clear(); + if (GetArenaForAllocation() == nullptr && _impl_.map_massage_ != nullptr) { - delete map_massage_; + delete _impl_.map_massage_; } - map_massage_ = nullptr; + _impl_.map_massage_ = nullptr; _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MessageToClient::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MessageToClient::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -3175,7 +3078,7 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // repeated .protobuf.MessageOfHuman human_message = 1; @@ -3274,51 +3177,48 @@ namespace protobuf (void)cached_has_bits; // repeated .protobuf.MessageOfHuman human_message = 1; - for (unsigned int i = 0, - n = static_cast(this->_internal_human_message_size()); + for (unsigned i = 0, + n = static_cast(this->_internal_human_message_size()); i < n; i++) { - target = stream->EnsureSpace(target); + const auto& repfield = this->_internal_human_message(i); target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessage(1, this->_internal_human_message(i), target, stream); + InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream); } // repeated .protobuf.MessageOfButcher butcher_message = 2; - for (unsigned int i = 0, - n = static_cast(this->_internal_butcher_message_size()); + for (unsigned i = 0, + n = static_cast(this->_internal_butcher_message_size()); i < n; i++) { - target = stream->EnsureSpace(target); + const auto& repfield = this->_internal_butcher_message(i); target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessage(2, this->_internal_butcher_message(i), target, stream); + InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream); } // repeated .protobuf.MessageOfProp prop_message = 3; - for (unsigned int i = 0, - n = static_cast(this->_internal_prop_message_size()); + for (unsigned i = 0, + n = static_cast(this->_internal_prop_message_size()); i < n; i++) { - target = stream->EnsureSpace(target); + const auto& repfield = this->_internal_prop_message(i); target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessage(3, this->_internal_prop_message(i), target, stream); + InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream); } // .protobuf.MessageOfMap map_massage = 4; if (this->_internal_has_map_massage()) { - target = stream->EnsureSpace(target); target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessage( - 4, _Internal::map_massage(this), target, stream - ); + InternalWriteMessage(4, _Internal::map_massage(this), _Internal::map_massage(this).GetCachedSize(), target, stream); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -3337,7 +3237,7 @@ namespace protobuf // repeated .protobuf.MessageOfHuman human_message = 1; total_size += 1UL * this->_internal_human_message_size(); - for (const auto& msg : this->human_message_) + for (const auto& msg : this->_impl_.human_message_) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); @@ -3345,7 +3245,7 @@ namespace protobuf // repeated .protobuf.MessageOfButcher butcher_message = 2; total_size += 1UL * this->_internal_butcher_message_size(); - for (const auto& msg : this->butcher_message_) + for (const auto& msg : this->_impl_.butcher_message_) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); @@ -3353,7 +3253,7 @@ namespace protobuf // repeated .protobuf.MessageOfProp prop_message = 3; total_size += 1UL * this->_internal_prop_message_size(); - for (const auto& msg : this->prop_message_) + for (const auto& msg : this->_impl_.prop_message_) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); @@ -3364,43 +3264,40 @@ namespace protobuf { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( - *map_massage_ + *_impl_.map_massage_ ); } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MessageToClient::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MessageToClient::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MessageToClient::GetClassData() const { return &_class_data_; } - void MessageToClient::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MessageToClient::MergeFrom(const MessageToClient& from) + void MessageToClient::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MessageToClient) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; - human_message_.MergeFrom(from.human_message_); - butcher_message_.MergeFrom(from.butcher_message_); - prop_message_.MergeFrom(from.prop_message_); + _this->_impl_.human_message_.MergeFrom(from._impl_.human_message_); + _this->_impl_.butcher_message_.MergeFrom(from._impl_.butcher_message_); + _this->_impl_.prop_message_.MergeFrom(from._impl_.prop_message_); if (from._internal_has_map_massage()) { - _internal_mutable_map_massage()->::protobuf::MessageOfMap::MergeFrom(from._internal_map_massage()); + _this->_internal_mutable_map_massage()->::protobuf::MessageOfMap::MergeFrom( + from._internal_map_massage() + ); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MessageToClient::CopyFrom(const MessageToClient& from) @@ -3421,15 +3318,15 @@ namespace protobuf { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - human_message_.InternalSwap(&other->human_message_); - butcher_message_.InternalSwap(&other->butcher_message_); - prop_message_.InternalSwap(&other->prop_message_); - swap(map_massage_, other->map_massage_); + _impl_.human_message_.InternalSwap(&other->_impl_.human_message_); + _impl_.butcher_message_.InternalSwap(&other->_impl_.butcher_message_); + _impl_.prop_message_.InternalSwap(&other->_impl_.prop_message_); + swap(_impl_.map_massage_, other->_impl_.map_massage_); } ::PROTOBUF_NAMESPACE_ID::Metadata MessageToClient::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[6] ); } @@ -3444,33 +3341,41 @@ namespace protobuf MoveRes::MoveRes(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MoveRes) } MoveRes::MoveRes(const MoveRes& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + MoveRes* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.actual_speed_){}, decltype(_impl_.actual_angle_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&actual_speed_, &from.actual_speed_, static_cast(reinterpret_cast(&actual_angle_) - reinterpret_cast(&actual_speed_)) + sizeof(actual_angle_)); + ::memcpy(&_impl_.actual_speed_, &from._impl_.actual_speed_, static_cast(reinterpret_cast(&_impl_.actual_angle_) - reinterpret_cast(&_impl_.actual_speed_)) + sizeof(_impl_.actual_angle_)); // @@protoc_insertion_point(copy_constructor:protobuf.MoveRes) } - inline void MoveRes::SharedCtor() + inline void MoveRes::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&actual_speed_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&actual_angle_) - reinterpret_cast(&actual_speed_)) + sizeof(actual_angle_)); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.actual_speed_){int64_t{0}}, decltype(_impl_.actual_angle_){0}, /*decltype(_impl_._cached_size_)*/ {}}; } MoveRes::~MoveRes() { // @@protoc_insertion_point(destructor:protobuf.MoveRes) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MoveRes::SharedDtor() @@ -3478,17 +3383,9 @@ namespace protobuf GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); } - void MoveRes::ArenaDtor(void* object) - { - MoveRes* _this = reinterpret_cast(object); - (void)_this; - } - void MoveRes::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MoveRes::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MoveRes::Clear() @@ -3498,11 +3395,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - ::memset(&actual_speed_, 0, static_cast(reinterpret_cast(&actual_angle_) - reinterpret_cast(&actual_speed_)) + sizeof(actual_angle_)); + ::memset(&_impl_.actual_speed_, 0, static_cast(reinterpret_cast(&_impl_.actual_angle_) - reinterpret_cast(&_impl_.actual_speed_)) + sizeof(_impl_.actual_angle_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MoveRes::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MoveRes::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -3510,14 +3407,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // int64 actual_speed = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - actual_speed_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.actual_speed_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -3527,7 +3424,7 @@ namespace protobuf case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 17)) { - actual_angle_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + _impl_.actual_angle_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); ptr += sizeof(double); } else @@ -3571,7 +3468,7 @@ namespace protobuf if (this->_internal_actual_speed() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_actual_speed(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_actual_speed(), target); } // double actual_angle = 2; @@ -3582,12 +3479,12 @@ namespace protobuf if (raw_actual_angle != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteDoubleToArray(2, this->_internal_actual_angle(), target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(2, this->_internal_actual_angle(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -3607,7 +3504,7 @@ namespace protobuf // int64 actual_speed = 1; if (this->_internal_actual_speed() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_actual_speed()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_actual_speed()); } // double actual_angle = 2; @@ -3620,34 +3517,29 @@ namespace protobuf total_size += 1 + 8; } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MoveRes::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MoveRes::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MoveRes::GetClassData() const { return &_class_data_; } - void MoveRes::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MoveRes::MergeFrom(const MoveRes& from) + void MoveRes::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MoveRes) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (from._internal_actual_speed() != 0) { - _internal_set_actual_speed(from._internal_actual_speed()); + _this->_internal_set_actual_speed(from._internal_actual_speed()); } static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); double tmp_actual_angle = from._internal_actual_angle(); @@ -3655,9 +3547,9 @@ namespace protobuf memcpy(&raw_actual_angle, &tmp_actual_angle, sizeof(tmp_actual_angle)); if (raw_actual_angle != 0) { - _internal_set_actual_angle(from._internal_actual_angle()); + _this->_internal_set_actual_angle(from._internal_actual_angle()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MoveRes::CopyFrom(const MoveRes& from) @@ -3679,15 +3571,15 @@ namespace protobuf using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(MoveRes, actual_angle_) + sizeof(MoveRes::actual_angle_) - PROTOBUF_FIELD_OFFSET(MoveRes, actual_speed_)>( - reinterpret_cast(&actual_speed_), - reinterpret_cast(&other->actual_speed_) + PROTOBUF_FIELD_OFFSET(MoveRes, _impl_.actual_angle_) + sizeof(MoveRes::_impl_.actual_angle_) - PROTOBUF_FIELD_OFFSET(MoveRes, _impl_.actual_speed_)>( + reinterpret_cast(&_impl_.actual_speed_), + reinterpret_cast(&other->_impl_.actual_speed_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata MoveRes::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[7] ); } @@ -3702,33 +3594,41 @@ namespace protobuf BoolRes::BoolRes(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.BoolRes) } BoolRes::BoolRes(const BoolRes& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + BoolRes* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.act_success_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - act_success_ = from.act_success_; + _this->_impl_.act_success_ = from._impl_.act_success_; // @@protoc_insertion_point(copy_constructor:protobuf.BoolRes) } - inline void BoolRes::SharedCtor() + inline void BoolRes::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - act_success_ = false; + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.act_success_){false}, /*decltype(_impl_._cached_size_)*/ {}}; } BoolRes::~BoolRes() { // @@protoc_insertion_point(destructor:protobuf.BoolRes) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void BoolRes::SharedDtor() @@ -3736,17 +3636,9 @@ namespace protobuf GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); } - void BoolRes::ArenaDtor(void* object) - { - BoolRes* _this = reinterpret_cast(object); - (void)_this; - } - void BoolRes::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void BoolRes::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void BoolRes::Clear() @@ -3756,11 +3648,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - act_success_ = false; + _impl_.act_success_ = false; _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* BoolRes::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* BoolRes::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -3768,14 +3660,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // bool act_success = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - act_success_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.act_success_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -3819,12 +3711,12 @@ namespace protobuf if (this->_internal_act_success() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(1, this->_internal_act_success(), target); + target = ::_pbi::WireFormatLite::WriteBoolToArray(1, this->_internal_act_success(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -3847,36 +3739,31 @@ namespace protobuf total_size += 1 + 1; } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData BoolRes::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, BoolRes::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* BoolRes::GetClassData() const { return &_class_data_; } - void BoolRes::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void BoolRes::MergeFrom(const BoolRes& from) + void BoolRes::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.BoolRes) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (from._internal_act_success() != 0) { - _internal_set_act_success(from._internal_act_success()); + _this->_internal_set_act_success(from._internal_act_success()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void BoolRes::CopyFrom(const BoolRes& from) @@ -3897,12 +3784,12 @@ namespace protobuf { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - swap(act_success_, other->act_success_); + swap(_impl_.act_success_, other->_impl_.act_success_); } ::PROTOBUF_NAMESPACE_ID::Metadata BoolRes::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[8] ); } @@ -3917,64 +3804,64 @@ namespace protobuf MsgRes::MsgRes(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MsgRes) } MsgRes::MsgRes(const MsgRes& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + MsgRes* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.message_received_){}, decltype(_impl_.from_player_id_){}, decltype(_impl_.have_message_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - message_received_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + _impl_.message_received_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - message_received_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + _impl_.message_received_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (!from._internal_message_received().empty()) { - message_received_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_message_received(), GetArenaForAllocation()); + _this->_impl_.message_received_.Set(from._internal_message_received(), _this->GetArenaForAllocation()); } - ::memcpy(&from_player_id_, &from.from_player_id_, static_cast(reinterpret_cast(&have_message_) - reinterpret_cast(&from_player_id_)) + sizeof(have_message_)); + ::memcpy(&_impl_.from_player_id_, &from._impl_.from_player_id_, static_cast(reinterpret_cast(&_impl_.have_message_) - reinterpret_cast(&_impl_.from_player_id_)) + sizeof(_impl_.have_message_)); // @@protoc_insertion_point(copy_constructor:protobuf.MsgRes) } - inline void MsgRes::SharedCtor() + inline void MsgRes::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - message_received_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.message_received_){}, decltype(_impl_.from_player_id_){int64_t{0}}, decltype(_impl_.have_message_){false}, /*decltype(_impl_._cached_size_)*/ {}}; + _impl_.message_received_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - message_received_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + _impl_.message_received_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&from_player_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&have_message_) - reinterpret_cast(&from_player_id_)) + sizeof(have_message_)); } MsgRes::~MsgRes() { // @@protoc_insertion_point(destructor:protobuf.MsgRes) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MsgRes::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); - message_received_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + _impl_.message_received_.Destroy(); } - void MsgRes::ArenaDtor(void* object) - { - MsgRes* _this = reinterpret_cast(object); - (void)_this; - } - void MsgRes::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MsgRes::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MsgRes::Clear() @@ -3984,12 +3871,12 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - message_received_.ClearToEmpty(); - ::memset(&from_player_id_, 0, static_cast(reinterpret_cast(&have_message_) - reinterpret_cast(&from_player_id_)) + sizeof(have_message_)); + _impl_.message_received_.ClearToEmpty(); + ::memset(&_impl_.from_player_id_, 0, static_cast(reinterpret_cast(&_impl_.have_message_) - reinterpret_cast(&_impl_.from_player_id_)) + sizeof(_impl_.have_message_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MsgRes::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MsgRes::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -3997,14 +3884,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // bool have_message = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - have_message_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.have_message_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -4014,7 +3901,7 @@ namespace protobuf case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { - from_player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.from_player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -4025,9 +3912,9 @@ namespace protobuf if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { auto str = _internal_mutable_message_received(); - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); - CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "protobuf.MsgRes.message_received")); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); + CHK_(::_pbi::VerifyUTF8(str, "protobuf.MsgRes.message_received")); } else goto handle_unusual; @@ -4070,14 +3957,14 @@ namespace protobuf if (this->_internal_have_message() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(1, this->_internal_have_message(), target); + target = ::_pbi::WireFormatLite::WriteBoolToArray(1, this->_internal_have_message(), target); } // int64 from_player_id = 2; if (this->_internal_from_player_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(2, this->_internal_from_player_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(2, this->_internal_from_player_id(), target); } // string message_received = 3; @@ -4093,7 +3980,7 @@ namespace protobuf if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -4122,7 +4009,7 @@ namespace protobuf // int64 from_player_id = 2; if (this->_internal_from_player_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_from_player_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_from_player_id()); } // bool have_message = 1; @@ -4131,44 +4018,39 @@ namespace protobuf total_size += 1 + 1; } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MsgRes::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MsgRes::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MsgRes::GetClassData() const { return &_class_data_; } - void MsgRes::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MsgRes::MergeFrom(const MsgRes& from) + void MsgRes::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MsgRes) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (!from._internal_message_received().empty()) { - _internal_set_message_received(from._internal_message_received()); + _this->_internal_set_message_received(from._internal_message_received()); } if (from._internal_from_player_id() != 0) { - _internal_set_from_player_id(from._internal_from_player_id()); + _this->_internal_set_from_player_id(from._internal_from_player_id()); } if (from._internal_have_message() != 0) { - _internal_set_have_message(from._internal_have_message()); + _this->_internal_set_have_message(from._internal_have_message()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MsgRes::CopyFrom(const MsgRes& from) @@ -4192,22 +4074,18 @@ namespace protobuf auto* rhs_arena = other->GetArenaForAllocation(); _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - &message_received_, - lhs_arena, - &other->message_received_, - rhs_arena + &_impl_.message_received_, lhs_arena, &other->_impl_.message_received_, rhs_arena ); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(MsgRes, have_message_) + sizeof(MsgRes::have_message_) - PROTOBUF_FIELD_OFFSET(MsgRes, from_player_id_)>( - reinterpret_cast(&from_player_id_), - reinterpret_cast(&other->from_player_id_) + PROTOBUF_FIELD_OFFSET(MsgRes, _impl_.have_message_) + sizeof(MsgRes::_impl_.have_message_) - PROTOBUF_FIELD_OFFSET(MsgRes, _impl_.from_player_id_)>( + reinterpret_cast(&_impl_.from_player_id_), + reinterpret_cast(&other->_impl_.from_player_id_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata MsgRes::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Clients_2eproto_getter, &descriptor_table_Message2Clients_2eproto_once, file_level_metadata_Message2Clients_2eproto[9] ); } @@ -4216,52 +4094,62 @@ namespace protobuf } // namespace protobuf PROTOBUF_NAMESPACE_OPEN template<> -PROTOBUF_NOINLINE ::protobuf::MessageOfHuman* Arena::CreateMaybeMessage<::protobuf::MessageOfHuman>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MessageOfHuman* + Arena::CreateMaybeMessage<::protobuf::MessageOfHuman>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MessageOfHuman>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::MessageOfButcher* Arena::CreateMaybeMessage<::protobuf::MessageOfButcher>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MessageOfButcher* + Arena::CreateMaybeMessage<::protobuf::MessageOfButcher>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MessageOfButcher>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::MessageOfProp* Arena::CreateMaybeMessage<::protobuf::MessageOfProp>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MessageOfProp* + Arena::CreateMaybeMessage<::protobuf::MessageOfProp>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MessageOfProp>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::MessageOfPickedProp* Arena::CreateMaybeMessage<::protobuf::MessageOfPickedProp>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MessageOfPickedProp* + Arena::CreateMaybeMessage<::protobuf::MessageOfPickedProp>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MessageOfPickedProp>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::MessageOfMap_Row* Arena::CreateMaybeMessage<::protobuf::MessageOfMap_Row>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MessageOfMap_Row* + Arena::CreateMaybeMessage<::protobuf::MessageOfMap_Row>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MessageOfMap_Row>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::MessageOfMap* Arena::CreateMaybeMessage<::protobuf::MessageOfMap>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MessageOfMap* + Arena::CreateMaybeMessage<::protobuf::MessageOfMap>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MessageOfMap>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::MessageToClient* Arena::CreateMaybeMessage<::protobuf::MessageToClient>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MessageToClient* + Arena::CreateMaybeMessage<::protobuf::MessageToClient>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MessageToClient>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::MoveRes* Arena::CreateMaybeMessage<::protobuf::MoveRes>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MoveRes* + Arena::CreateMaybeMessage<::protobuf::MoveRes>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MoveRes>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::BoolRes* Arena::CreateMaybeMessage<::protobuf::BoolRes>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::BoolRes* + Arena::CreateMaybeMessage<::protobuf::BoolRes>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::BoolRes>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::MsgRes* Arena::CreateMaybeMessage<::protobuf::MsgRes>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MsgRes* + Arena::CreateMaybeMessage<::protobuf::MsgRes>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MsgRes>(arena); } diff --git a/CAPI/proto/Message2Clients.pb.h b/CAPI/proto/Message2Clients.pb.h index 62733fd..56dd925 100644 --- a/CAPI/proto/Message2Clients.pb.h +++ b/CAPI/proto/Message2Clients.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3019000 +#if PROTOBUF_VERSION < 3021000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019004 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021005 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -45,11 +44,6 @@ PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct TableStruct_Message2Clients_2eproto { - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::AuxiliaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[10] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; - static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; static const uint32_t offsets[]; }; extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Message2Clients_2eproto; @@ -122,7 +116,7 @@ namespace protobuf { } ~MessageOfHuman() override; - explicit constexpr MessageOfHuman(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MessageOfHuman(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MessageOfHuman(const MessageOfHuman& from); MessageOfHuman(MessageOfHuman&& from) noexcept @@ -221,10 +215,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MessageOfHuman& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MessageOfHuman& from); + void MergeFrom(const MessageOfHuman& from) + { + MessageOfHuman::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -237,11 +234,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MessageOfHuman* other); @@ -256,10 +253,6 @@ namespace protobuf protected: explicit MessageOfHuman(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -480,25 +473,32 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::RepeatedField buff_; - mutable std::atomic _buff_cached_byte_size_; - int32_t x_; - int32_t y_; - int32_t speed_; - int32_t life_; - double time_until_skill_available_; - int32_t hanged_time_; - int place_; - int prop_; - int human_type_; - int64_t guid_; - double chair_time_; - bool on_chair_; - bool on_ground_; - int32_t view_range_; - double ground_time_; - int64_t player_id_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + ::PROTOBUF_NAMESPACE_ID::RepeatedField buff_; + mutable std::atomic _buff_cached_byte_size_; + int32_t x_; + int32_t y_; + int32_t speed_; + int32_t life_; + double time_until_skill_available_; + int32_t hanged_time_; + int place_; + int prop_; + int human_type_; + int64_t guid_; + double chair_time_; + bool on_chair_; + bool on_ground_; + int32_t view_range_; + double ground_time_; + int64_t player_id_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // ------------------------------------------------------------------- @@ -512,7 +512,7 @@ namespace protobuf { } ~MessageOfButcher() override; - explicit constexpr MessageOfButcher(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MessageOfButcher(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MessageOfButcher(const MessageOfButcher& from); MessageOfButcher(MessageOfButcher&& from) noexcept @@ -611,10 +611,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MessageOfButcher& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MessageOfButcher& from); + void MergeFrom(const MessageOfButcher& from) + { + MessageOfButcher::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -627,11 +630,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MessageOfButcher* other); @@ -646,10 +649,6 @@ namespace protobuf protected: explicit MessageOfButcher(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -826,21 +825,28 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::RepeatedField buff_; - mutable std::atomic _buff_cached_byte_size_; - int32_t x_; - int32_t y_; - int32_t speed_; - int32_t damage_; - double time_until_skill_available_; - int place_; - int prop_; - int64_t guid_; - int butcher_type_; - bool movable_; - int64_t playerid_; - int32_t view_range_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + ::PROTOBUF_NAMESPACE_ID::RepeatedField buff_; + mutable std::atomic _buff_cached_byte_size_; + int32_t x_; + int32_t y_; + int32_t speed_; + int32_t damage_; + double time_until_skill_available_; + int place_; + int prop_; + int64_t guid_; + int butcher_type_; + bool movable_; + int64_t playerid_; + int32_t view_range_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // ------------------------------------------------------------------- @@ -854,7 +860,7 @@ namespace protobuf { } ~MessageOfProp() override; - explicit constexpr MessageOfProp(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MessageOfProp(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MessageOfProp(const MessageOfProp& from); MessageOfProp(MessageOfProp&& from) noexcept @@ -953,10 +959,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MessageOfProp& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MessageOfProp& from); + void MergeFrom(const MessageOfProp& from) + { + MessageOfProp::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -969,11 +978,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MessageOfProp* other); @@ -988,10 +997,6 @@ namespace protobuf protected: explicit MessageOfProp(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -1102,15 +1107,22 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - int type_; - int32_t x_; - double facing_direction_; - int32_t y_; - int place_; - int64_t guid_; - int32_t size_; - bool is_moving_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + int type_; + int32_t x_; + double facing_direction_; + int32_t y_; + int place_; + int64_t guid_; + int32_t size_; + bool is_moving_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // ------------------------------------------------------------------- @@ -1124,7 +1136,7 @@ namespace protobuf { } ~MessageOfPickedProp() override; - explicit constexpr MessageOfPickedProp(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MessageOfPickedProp(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MessageOfPickedProp(const MessageOfPickedProp& from); MessageOfPickedProp(MessageOfPickedProp&& from) noexcept @@ -1223,10 +1235,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MessageOfPickedProp& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MessageOfPickedProp& from); + void MergeFrom(const MessageOfPickedProp& from) + { + MessageOfPickedProp::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -1239,11 +1254,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MessageOfPickedProp* other); @@ -1258,10 +1273,6 @@ namespace protobuf protected: explicit MessageOfPickedProp(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -1339,12 +1350,19 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - int type_; - int32_t x_; - double facing_direction_; - int64_t mapping_id_; - int32_t y_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + int type_; + int32_t x_; + double facing_direction_; + int64_t mapping_id_; + int32_t y_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // ------------------------------------------------------------------- @@ -1358,7 +1376,7 @@ namespace protobuf { } ~MessageOfMap_Row() override; - explicit constexpr MessageOfMap_Row(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MessageOfMap_Row(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MessageOfMap_Row(const MessageOfMap_Row& from); MessageOfMap_Row(MessageOfMap_Row&& from) noexcept @@ -1457,10 +1475,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MessageOfMap_Row& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MessageOfMap_Row& from); + void MergeFrom(const MessageOfMap_Row& from) + { + MessageOfMap_Row::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -1473,11 +1494,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MessageOfMap_Row* other); @@ -1492,10 +1513,6 @@ namespace protobuf protected: explicit MessageOfMap_Row(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -1540,9 +1557,16 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::RepeatedField col_; - mutable std::atomic _col_cached_byte_size_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + ::PROTOBUF_NAMESPACE_ID::RepeatedField col_; + mutable std::atomic _col_cached_byte_size_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // ------------------------------------------------------------------- @@ -1556,7 +1580,7 @@ namespace protobuf { } ~MessageOfMap() override; - explicit constexpr MessageOfMap(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MessageOfMap(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MessageOfMap(const MessageOfMap& from); MessageOfMap(MessageOfMap&& from) noexcept @@ -1655,10 +1679,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MessageOfMap& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MessageOfMap& from); + void MergeFrom(const MessageOfMap& from) + { + MessageOfMap::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -1671,11 +1698,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MessageOfMap* other); @@ -1690,10 +1717,6 @@ namespace protobuf protected: explicit MessageOfMap(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -1741,8 +1764,15 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfMap_Row> row_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfMap_Row> row_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // ------------------------------------------------------------------- @@ -1756,7 +1786,7 @@ namespace protobuf { } ~MessageToClient() override; - explicit constexpr MessageToClient(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MessageToClient(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MessageToClient(const MessageToClient& from); MessageToClient(MessageToClient&& from) noexcept @@ -1855,10 +1885,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MessageToClient& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MessageToClient& from); + void MergeFrom(const MessageToClient& from) + { + MessageToClient::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -1871,11 +1904,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MessageToClient* other); @@ -1890,10 +1923,6 @@ namespace protobuf protected: explicit MessageToClient(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -2009,11 +2038,18 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfHuman> human_message_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfButcher> butcher_message_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfProp> prop_message_; - ::protobuf::MessageOfMap* map_massage_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfHuman> human_message_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfButcher> butcher_message_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfProp> prop_message_; + ::protobuf::MessageOfMap* map_massage_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // ------------------------------------------------------------------- @@ -2027,7 +2063,7 @@ namespace protobuf { } ~MoveRes() override; - explicit constexpr MoveRes(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MoveRes(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MoveRes(const MoveRes& from); MoveRes(MoveRes&& from) noexcept @@ -2126,10 +2162,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MoveRes& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MoveRes& from); + void MergeFrom(const MoveRes& from) + { + MoveRes::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -2142,11 +2181,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MoveRes* other); @@ -2161,10 +2200,6 @@ namespace protobuf protected: explicit MoveRes(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -2209,9 +2244,16 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - int64_t actual_speed_; - double actual_angle_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + int64_t actual_speed_; + double actual_angle_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // ------------------------------------------------------------------- @@ -2225,7 +2267,7 @@ namespace protobuf { } ~BoolRes() override; - explicit constexpr BoolRes(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR BoolRes(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); BoolRes(const BoolRes& from); BoolRes(BoolRes&& from) noexcept @@ -2324,10 +2366,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const BoolRes& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const BoolRes& from); + void MergeFrom(const BoolRes& from) + { + BoolRes::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -2340,11 +2385,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(BoolRes* other); @@ -2359,10 +2404,6 @@ namespace protobuf protected: explicit BoolRes(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -2396,8 +2437,15 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - bool act_success_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + bool act_success_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // ------------------------------------------------------------------- @@ -2411,7 +2459,7 @@ namespace protobuf { } ~MsgRes() override; - explicit constexpr MsgRes(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MsgRes(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MsgRes(const MsgRes& from); MsgRes(MsgRes&& from) noexcept @@ -2510,10 +2558,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MsgRes& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MsgRes& from); + void MergeFrom(const MsgRes& from) + { + MsgRes::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -2526,11 +2577,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MsgRes* other); @@ -2545,10 +2596,6 @@ namespace protobuf protected: explicit MsgRes(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -2609,10 +2656,17 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr message_received_; - int64_t from_player_id_; - bool have_message_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr message_received_; + int64_t from_player_id_; + bool have_message_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Clients_2eproto; }; // =================================================================== @@ -2628,11 +2682,11 @@ namespace protobuf // int32 x = 1; inline void MessageOfHuman::clear_x() { - x_ = 0; + _impl_.x_ = 0; } inline int32_t MessageOfHuman::_internal_x() const { - return x_; + return _impl_.x_; } inline int32_t MessageOfHuman::x() const { @@ -2641,7 +2695,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_x(int32_t value) { - x_ = value; + _impl_.x_ = value; } inline void MessageOfHuman::set_x(int32_t value) { @@ -2652,11 +2706,11 @@ namespace protobuf // int32 y = 2; inline void MessageOfHuman::clear_y() { - y_ = 0; + _impl_.y_ = 0; } inline int32_t MessageOfHuman::_internal_y() const { - return y_; + return _impl_.y_; } inline int32_t MessageOfHuman::y() const { @@ -2665,7 +2719,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_y(int32_t value) { - y_ = value; + _impl_.y_ = value; } inline void MessageOfHuman::set_y(int32_t value) { @@ -2676,11 +2730,11 @@ namespace protobuf // int32 speed = 3; inline void MessageOfHuman::clear_speed() { - speed_ = 0; + _impl_.speed_ = 0; } inline int32_t MessageOfHuman::_internal_speed() const { - return speed_; + return _impl_.speed_; } inline int32_t MessageOfHuman::speed() const { @@ -2689,7 +2743,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_speed(int32_t value) { - speed_ = value; + _impl_.speed_ = value; } inline void MessageOfHuman::set_speed(int32_t value) { @@ -2700,11 +2754,11 @@ namespace protobuf // int32 life = 4; inline void MessageOfHuman::clear_life() { - life_ = 0; + _impl_.life_ = 0; } inline int32_t MessageOfHuman::_internal_life() const { - return life_; + return _impl_.life_; } inline int32_t MessageOfHuman::life() const { @@ -2713,7 +2767,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_life(int32_t value) { - life_ = value; + _impl_.life_ = value; } inline void MessageOfHuman::set_life(int32_t value) { @@ -2724,11 +2778,11 @@ namespace protobuf // int32 hanged_time = 5; inline void MessageOfHuman::clear_hanged_time() { - hanged_time_ = 0; + _impl_.hanged_time_ = 0; } inline int32_t MessageOfHuman::_internal_hanged_time() const { - return hanged_time_; + return _impl_.hanged_time_; } inline int32_t MessageOfHuman::hanged_time() const { @@ -2737,7 +2791,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_hanged_time(int32_t value) { - hanged_time_ = value; + _impl_.hanged_time_ = value; } inline void MessageOfHuman::set_hanged_time(int32_t value) { @@ -2748,11 +2802,11 @@ namespace protobuf // double time_until_skill_available = 6; inline void MessageOfHuman::clear_time_until_skill_available() { - time_until_skill_available_ = 0; + _impl_.time_until_skill_available_ = 0; } inline double MessageOfHuman::_internal_time_until_skill_available() const { - return time_until_skill_available_; + return _impl_.time_until_skill_available_; } inline double MessageOfHuman::time_until_skill_available() const { @@ -2761,7 +2815,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_time_until_skill_available(double value) { - time_until_skill_available_ = value; + _impl_.time_until_skill_available_ = value; } inline void MessageOfHuman::set_time_until_skill_available(double value) { @@ -2772,11 +2826,11 @@ namespace protobuf // .protobuf.PlaceType place = 7; inline void MessageOfHuman::clear_place() { - place_ = 0; + _impl_.place_ = 0; } inline ::protobuf::PlaceType MessageOfHuman::_internal_place() const { - return static_cast<::protobuf::PlaceType>(place_); + return static_cast<::protobuf::PlaceType>(_impl_.place_); } inline ::protobuf::PlaceType MessageOfHuman::place() const { @@ -2785,7 +2839,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_place(::protobuf::PlaceType value) { - place_ = value; + _impl_.place_ = value; } inline void MessageOfHuman::set_place(::protobuf::PlaceType value) { @@ -2796,11 +2850,11 @@ namespace protobuf // .protobuf.PropType prop = 8; inline void MessageOfHuman::clear_prop() { - prop_ = 0; + _impl_.prop_ = 0; } inline ::protobuf::PropType MessageOfHuman::_internal_prop() const { - return static_cast<::protobuf::PropType>(prop_); + return static_cast<::protobuf::PropType>(_impl_.prop_); } inline ::protobuf::PropType MessageOfHuman::prop() const { @@ -2809,7 +2863,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_prop(::protobuf::PropType value) { - prop_ = value; + _impl_.prop_ = value; } inline void MessageOfHuman::set_prop(::protobuf::PropType value) { @@ -2820,11 +2874,11 @@ namespace protobuf // .protobuf.HumanType human_type = 9; inline void MessageOfHuman::clear_human_type() { - human_type_ = 0; + _impl_.human_type_ = 0; } inline ::protobuf::HumanType MessageOfHuman::_internal_human_type() const { - return static_cast<::protobuf::HumanType>(human_type_); + return static_cast<::protobuf::HumanType>(_impl_.human_type_); } inline ::protobuf::HumanType MessageOfHuman::human_type() const { @@ -2833,7 +2887,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_human_type(::protobuf::HumanType value) { - human_type_ = value; + _impl_.human_type_ = value; } inline void MessageOfHuman::set_human_type(::protobuf::HumanType value) { @@ -2844,11 +2898,11 @@ namespace protobuf // int64 guid = 10; inline void MessageOfHuman::clear_guid() { - guid_ = int64_t{0}; + _impl_.guid_ = int64_t{0}; } inline int64_t MessageOfHuman::_internal_guid() const { - return guid_; + return _impl_.guid_; } inline int64_t MessageOfHuman::guid() const { @@ -2857,7 +2911,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_guid(int64_t value) { - guid_ = value; + _impl_.guid_ = value; } inline void MessageOfHuman::set_guid(int64_t value) { @@ -2868,11 +2922,11 @@ namespace protobuf // bool on_chair = 11; inline void MessageOfHuman::clear_on_chair() { - on_chair_ = false; + _impl_.on_chair_ = false; } inline bool MessageOfHuman::_internal_on_chair() const { - return on_chair_; + return _impl_.on_chair_; } inline bool MessageOfHuman::on_chair() const { @@ -2881,7 +2935,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_on_chair(bool value) { - on_chair_ = value; + _impl_.on_chair_ = value; } inline void MessageOfHuman::set_on_chair(bool value) { @@ -2892,11 +2946,11 @@ namespace protobuf // double chair_time = 12; inline void MessageOfHuman::clear_chair_time() { - chair_time_ = 0; + _impl_.chair_time_ = 0; } inline double MessageOfHuman::_internal_chair_time() const { - return chair_time_; + return _impl_.chair_time_; } inline double MessageOfHuman::chair_time() const { @@ -2905,7 +2959,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_chair_time(double value) { - chair_time_ = value; + _impl_.chair_time_ = value; } inline void MessageOfHuman::set_chair_time(double value) { @@ -2916,11 +2970,11 @@ namespace protobuf // bool on_ground = 13; inline void MessageOfHuman::clear_on_ground() { - on_ground_ = false; + _impl_.on_ground_ = false; } inline bool MessageOfHuman::_internal_on_ground() const { - return on_ground_; + return _impl_.on_ground_; } inline bool MessageOfHuman::on_ground() const { @@ -2929,7 +2983,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_on_ground(bool value) { - on_ground_ = value; + _impl_.on_ground_ = value; } inline void MessageOfHuman::set_on_ground(bool value) { @@ -2940,11 +2994,11 @@ namespace protobuf // double ground_time = 14; inline void MessageOfHuman::clear_ground_time() { - ground_time_ = 0; + _impl_.ground_time_ = 0; } inline double MessageOfHuman::_internal_ground_time() const { - return ground_time_; + return _impl_.ground_time_; } inline double MessageOfHuman::ground_time() const { @@ -2953,7 +3007,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_ground_time(double value) { - ground_time_ = value; + _impl_.ground_time_ = value; } inline void MessageOfHuman::set_ground_time(double value) { @@ -2964,11 +3018,11 @@ namespace protobuf // int64 player_id = 15; inline void MessageOfHuman::clear_player_id() { - player_id_ = int64_t{0}; + _impl_.player_id_ = int64_t{0}; } inline int64_t MessageOfHuman::_internal_player_id() const { - return player_id_; + return _impl_.player_id_; } inline int64_t MessageOfHuman::player_id() const { @@ -2977,7 +3031,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_player_id(int64_t value) { - player_id_ = value; + _impl_.player_id_ = value; } inline void MessageOfHuman::set_player_id(int64_t value) { @@ -2988,11 +3042,11 @@ namespace protobuf // int32 view_range = 16; inline void MessageOfHuman::clear_view_range() { - view_range_ = 0; + _impl_.view_range_ = 0; } inline int32_t MessageOfHuman::_internal_view_range() const { - return view_range_; + return _impl_.view_range_; } inline int32_t MessageOfHuman::view_range() const { @@ -3001,7 +3055,7 @@ namespace protobuf } inline void MessageOfHuman::_internal_set_view_range(int32_t value) { - view_range_ = value; + _impl_.view_range_ = value; } inline void MessageOfHuman::set_view_range(int32_t value) { @@ -3012,7 +3066,7 @@ namespace protobuf // repeated .protobuf.HumanBuffType buff = 17; inline int MessageOfHuman::_internal_buff_size() const { - return buff_.size(); + return _impl_.buff_.size(); } inline int MessageOfHuman::buff_size() const { @@ -3020,11 +3074,11 @@ namespace protobuf } inline void MessageOfHuman::clear_buff() { - buff_.Clear(); + _impl_.buff_.Clear(); } inline ::protobuf::HumanBuffType MessageOfHuman::_internal_buff(int index) const { - return static_cast<::protobuf::HumanBuffType>(buff_.Get(index)); + return static_cast<::protobuf::HumanBuffType>(_impl_.buff_.Get(index)); } inline ::protobuf::HumanBuffType MessageOfHuman::buff(int index) const { @@ -3033,12 +3087,12 @@ namespace protobuf } inline void MessageOfHuman::set_buff(int index, ::protobuf::HumanBuffType value) { - buff_.Set(index, value); + _impl_.buff_.Set(index, value); // @@protoc_insertion_point(field_set:protobuf.MessageOfHuman.buff) } inline void MessageOfHuman::_internal_add_buff(::protobuf::HumanBuffType value) { - buff_.Add(value); + _impl_.buff_.Add(value); } inline void MessageOfHuman::add_buff(::protobuf::HumanBuffType value) { @@ -3049,12 +3103,12 @@ namespace protobuf MessageOfHuman::buff() const { // @@protoc_insertion_point(field_list:protobuf.MessageOfHuman.buff) - return buff_; + return _impl_.buff_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedField* MessageOfHuman::_internal_mutable_buff() { - return &buff_; + return &_impl_.buff_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedField* MessageOfHuman::mutable_buff() @@ -3070,11 +3124,11 @@ namespace protobuf // int32 x = 1; inline void MessageOfButcher::clear_x() { - x_ = 0; + _impl_.x_ = 0; } inline int32_t MessageOfButcher::_internal_x() const { - return x_; + return _impl_.x_; } inline int32_t MessageOfButcher::x() const { @@ -3083,7 +3137,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_x(int32_t value) { - x_ = value; + _impl_.x_ = value; } inline void MessageOfButcher::set_x(int32_t value) { @@ -3094,11 +3148,11 @@ namespace protobuf // int32 y = 2; inline void MessageOfButcher::clear_y() { - y_ = 0; + _impl_.y_ = 0; } inline int32_t MessageOfButcher::_internal_y() const { - return y_; + return _impl_.y_; } inline int32_t MessageOfButcher::y() const { @@ -3107,7 +3161,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_y(int32_t value) { - y_ = value; + _impl_.y_ = value; } inline void MessageOfButcher::set_y(int32_t value) { @@ -3118,11 +3172,11 @@ namespace protobuf // int32 speed = 3; inline void MessageOfButcher::clear_speed() { - speed_ = 0; + _impl_.speed_ = 0; } inline int32_t MessageOfButcher::_internal_speed() const { - return speed_; + return _impl_.speed_; } inline int32_t MessageOfButcher::speed() const { @@ -3131,7 +3185,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_speed(int32_t value) { - speed_ = value; + _impl_.speed_ = value; } inline void MessageOfButcher::set_speed(int32_t value) { @@ -3142,11 +3196,11 @@ namespace protobuf // int32 damage = 4; inline void MessageOfButcher::clear_damage() { - damage_ = 0; + _impl_.damage_ = 0; } inline int32_t MessageOfButcher::_internal_damage() const { - return damage_; + return _impl_.damage_; } inline int32_t MessageOfButcher::damage() const { @@ -3155,7 +3209,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_damage(int32_t value) { - damage_ = value; + _impl_.damage_ = value; } inline void MessageOfButcher::set_damage(int32_t value) { @@ -3166,11 +3220,11 @@ namespace protobuf // double time_until_skill_available = 5; inline void MessageOfButcher::clear_time_until_skill_available() { - time_until_skill_available_ = 0; + _impl_.time_until_skill_available_ = 0; } inline double MessageOfButcher::_internal_time_until_skill_available() const { - return time_until_skill_available_; + return _impl_.time_until_skill_available_; } inline double MessageOfButcher::time_until_skill_available() const { @@ -3179,7 +3233,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_time_until_skill_available(double value) { - time_until_skill_available_ = value; + _impl_.time_until_skill_available_ = value; } inline void MessageOfButcher::set_time_until_skill_available(double value) { @@ -3190,11 +3244,11 @@ namespace protobuf // .protobuf.PlaceType place = 6; inline void MessageOfButcher::clear_place() { - place_ = 0; + _impl_.place_ = 0; } inline ::protobuf::PlaceType MessageOfButcher::_internal_place() const { - return static_cast<::protobuf::PlaceType>(place_); + return static_cast<::protobuf::PlaceType>(_impl_.place_); } inline ::protobuf::PlaceType MessageOfButcher::place() const { @@ -3203,7 +3257,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_place(::protobuf::PlaceType value) { - place_ = value; + _impl_.place_ = value; } inline void MessageOfButcher::set_place(::protobuf::PlaceType value) { @@ -3214,11 +3268,11 @@ namespace protobuf // .protobuf.PropType prop = 7; inline void MessageOfButcher::clear_prop() { - prop_ = 0; + _impl_.prop_ = 0; } inline ::protobuf::PropType MessageOfButcher::_internal_prop() const { - return static_cast<::protobuf::PropType>(prop_); + return static_cast<::protobuf::PropType>(_impl_.prop_); } inline ::protobuf::PropType MessageOfButcher::prop() const { @@ -3227,7 +3281,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_prop(::protobuf::PropType value) { - prop_ = value; + _impl_.prop_ = value; } inline void MessageOfButcher::set_prop(::protobuf::PropType value) { @@ -3238,11 +3292,11 @@ namespace protobuf // .protobuf.ButcherType butcher_type = 8; inline void MessageOfButcher::clear_butcher_type() { - butcher_type_ = 0; + _impl_.butcher_type_ = 0; } inline ::protobuf::ButcherType MessageOfButcher::_internal_butcher_type() const { - return static_cast<::protobuf::ButcherType>(butcher_type_); + return static_cast<::protobuf::ButcherType>(_impl_.butcher_type_); } inline ::protobuf::ButcherType MessageOfButcher::butcher_type() const { @@ -3251,7 +3305,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_butcher_type(::protobuf::ButcherType value) { - butcher_type_ = value; + _impl_.butcher_type_ = value; } inline void MessageOfButcher::set_butcher_type(::protobuf::ButcherType value) { @@ -3262,11 +3316,11 @@ namespace protobuf // int64 guid = 9; inline void MessageOfButcher::clear_guid() { - guid_ = int64_t{0}; + _impl_.guid_ = int64_t{0}; } inline int64_t MessageOfButcher::_internal_guid() const { - return guid_; + return _impl_.guid_; } inline int64_t MessageOfButcher::guid() const { @@ -3275,7 +3329,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_guid(int64_t value) { - guid_ = value; + _impl_.guid_ = value; } inline void MessageOfButcher::set_guid(int64_t value) { @@ -3286,11 +3340,11 @@ namespace protobuf // bool movable = 10; inline void MessageOfButcher::clear_movable() { - movable_ = false; + _impl_.movable_ = false; } inline bool MessageOfButcher::_internal_movable() const { - return movable_; + return _impl_.movable_; } inline bool MessageOfButcher::movable() const { @@ -3299,7 +3353,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_movable(bool value) { - movable_ = value; + _impl_.movable_ = value; } inline void MessageOfButcher::set_movable(bool value) { @@ -3310,11 +3364,11 @@ namespace protobuf // int64 playerID = 11; inline void MessageOfButcher::clear_playerid() { - playerid_ = int64_t{0}; + _impl_.playerid_ = int64_t{0}; } inline int64_t MessageOfButcher::_internal_playerid() const { - return playerid_; + return _impl_.playerid_; } inline int64_t MessageOfButcher::playerid() const { @@ -3323,7 +3377,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_playerid(int64_t value) { - playerid_ = value; + _impl_.playerid_ = value; } inline void MessageOfButcher::set_playerid(int64_t value) { @@ -3334,11 +3388,11 @@ namespace protobuf // int32 view_range = 12; inline void MessageOfButcher::clear_view_range() { - view_range_ = 0; + _impl_.view_range_ = 0; } inline int32_t MessageOfButcher::_internal_view_range() const { - return view_range_; + return _impl_.view_range_; } inline int32_t MessageOfButcher::view_range() const { @@ -3347,7 +3401,7 @@ namespace protobuf } inline void MessageOfButcher::_internal_set_view_range(int32_t value) { - view_range_ = value; + _impl_.view_range_ = value; } inline void MessageOfButcher::set_view_range(int32_t value) { @@ -3358,7 +3412,7 @@ namespace protobuf // repeated .protobuf.ButcherBuffType buff = 13; inline int MessageOfButcher::_internal_buff_size() const { - return buff_.size(); + return _impl_.buff_.size(); } inline int MessageOfButcher::buff_size() const { @@ -3366,11 +3420,11 @@ namespace protobuf } inline void MessageOfButcher::clear_buff() { - buff_.Clear(); + _impl_.buff_.Clear(); } inline ::protobuf::ButcherBuffType MessageOfButcher::_internal_buff(int index) const { - return static_cast<::protobuf::ButcherBuffType>(buff_.Get(index)); + return static_cast<::protobuf::ButcherBuffType>(_impl_.buff_.Get(index)); } inline ::protobuf::ButcherBuffType MessageOfButcher::buff(int index) const { @@ -3379,12 +3433,12 @@ namespace protobuf } inline void MessageOfButcher::set_buff(int index, ::protobuf::ButcherBuffType value) { - buff_.Set(index, value); + _impl_.buff_.Set(index, value); // @@protoc_insertion_point(field_set:protobuf.MessageOfButcher.buff) } inline void MessageOfButcher::_internal_add_buff(::protobuf::ButcherBuffType value) { - buff_.Add(value); + _impl_.buff_.Add(value); } inline void MessageOfButcher::add_buff(::protobuf::ButcherBuffType value) { @@ -3395,12 +3449,12 @@ namespace protobuf MessageOfButcher::buff() const { // @@protoc_insertion_point(field_list:protobuf.MessageOfButcher.buff) - return buff_; + return _impl_.buff_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedField* MessageOfButcher::_internal_mutable_buff() { - return &buff_; + return &_impl_.buff_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedField* MessageOfButcher::mutable_buff() @@ -3416,11 +3470,11 @@ namespace protobuf // .protobuf.PropType type = 1; inline void MessageOfProp::clear_type() { - type_ = 0; + _impl_.type_ = 0; } inline ::protobuf::PropType MessageOfProp::_internal_type() const { - return static_cast<::protobuf::PropType>(type_); + return static_cast<::protobuf::PropType>(_impl_.type_); } inline ::protobuf::PropType MessageOfProp::type() const { @@ -3429,7 +3483,7 @@ namespace protobuf } inline void MessageOfProp::_internal_set_type(::protobuf::PropType value) { - type_ = value; + _impl_.type_ = value; } inline void MessageOfProp::set_type(::protobuf::PropType value) { @@ -3440,11 +3494,11 @@ namespace protobuf // int32 x = 2; inline void MessageOfProp::clear_x() { - x_ = 0; + _impl_.x_ = 0; } inline int32_t MessageOfProp::_internal_x() const { - return x_; + return _impl_.x_; } inline int32_t MessageOfProp::x() const { @@ -3453,7 +3507,7 @@ namespace protobuf } inline void MessageOfProp::_internal_set_x(int32_t value) { - x_ = value; + _impl_.x_ = value; } inline void MessageOfProp::set_x(int32_t value) { @@ -3464,11 +3518,11 @@ namespace protobuf // int32 y = 3; inline void MessageOfProp::clear_y() { - y_ = 0; + _impl_.y_ = 0; } inline int32_t MessageOfProp::_internal_y() const { - return y_; + return _impl_.y_; } inline int32_t MessageOfProp::y() const { @@ -3477,7 +3531,7 @@ namespace protobuf } inline void MessageOfProp::_internal_set_y(int32_t value) { - y_ = value; + _impl_.y_ = value; } inline void MessageOfProp::set_y(int32_t value) { @@ -3488,11 +3542,11 @@ namespace protobuf // double facing_direction = 4; inline void MessageOfProp::clear_facing_direction() { - facing_direction_ = 0; + _impl_.facing_direction_ = 0; } inline double MessageOfProp::_internal_facing_direction() const { - return facing_direction_; + return _impl_.facing_direction_; } inline double MessageOfProp::facing_direction() const { @@ -3501,7 +3555,7 @@ namespace protobuf } inline void MessageOfProp::_internal_set_facing_direction(double value) { - facing_direction_ = value; + _impl_.facing_direction_ = value; } inline void MessageOfProp::set_facing_direction(double value) { @@ -3512,11 +3566,11 @@ namespace protobuf // int64 guid = 5; inline void MessageOfProp::clear_guid() { - guid_ = int64_t{0}; + _impl_.guid_ = int64_t{0}; } inline int64_t MessageOfProp::_internal_guid() const { - return guid_; + return _impl_.guid_; } inline int64_t MessageOfProp::guid() const { @@ -3525,7 +3579,7 @@ namespace protobuf } inline void MessageOfProp::_internal_set_guid(int64_t value) { - guid_ = value; + _impl_.guid_ = value; } inline void MessageOfProp::set_guid(int64_t value) { @@ -3536,11 +3590,11 @@ namespace protobuf // .protobuf.PlaceType place = 6; inline void MessageOfProp::clear_place() { - place_ = 0; + _impl_.place_ = 0; } inline ::protobuf::PlaceType MessageOfProp::_internal_place() const { - return static_cast<::protobuf::PlaceType>(place_); + return static_cast<::protobuf::PlaceType>(_impl_.place_); } inline ::protobuf::PlaceType MessageOfProp::place() const { @@ -3549,7 +3603,7 @@ namespace protobuf } inline void MessageOfProp::_internal_set_place(::protobuf::PlaceType value) { - place_ = value; + _impl_.place_ = value; } inline void MessageOfProp::set_place(::protobuf::PlaceType value) { @@ -3560,11 +3614,11 @@ namespace protobuf // int32 size = 7; inline void MessageOfProp::clear_size() { - size_ = 0; + _impl_.size_ = 0; } inline int32_t MessageOfProp::_internal_size() const { - return size_; + return _impl_.size_; } inline int32_t MessageOfProp::size() const { @@ -3573,7 +3627,7 @@ namespace protobuf } inline void MessageOfProp::_internal_set_size(int32_t value) { - size_ = value; + _impl_.size_ = value; } inline void MessageOfProp::set_size(int32_t value) { @@ -3584,11 +3638,11 @@ namespace protobuf // bool is_moving = 8; inline void MessageOfProp::clear_is_moving() { - is_moving_ = false; + _impl_.is_moving_ = false; } inline bool MessageOfProp::_internal_is_moving() const { - return is_moving_; + return _impl_.is_moving_; } inline bool MessageOfProp::is_moving() const { @@ -3597,7 +3651,7 @@ namespace protobuf } inline void MessageOfProp::_internal_set_is_moving(bool value) { - is_moving_ = value; + _impl_.is_moving_ = value; } inline void MessageOfProp::set_is_moving(bool value) { @@ -3612,11 +3666,11 @@ namespace protobuf // .protobuf.PropType type = 1; inline void MessageOfPickedProp::clear_type() { - type_ = 0; + _impl_.type_ = 0; } inline ::protobuf::PropType MessageOfPickedProp::_internal_type() const { - return static_cast<::protobuf::PropType>(type_); + return static_cast<::protobuf::PropType>(_impl_.type_); } inline ::protobuf::PropType MessageOfPickedProp::type() const { @@ -3625,7 +3679,7 @@ namespace protobuf } inline void MessageOfPickedProp::_internal_set_type(::protobuf::PropType value) { - type_ = value; + _impl_.type_ = value; } inline void MessageOfPickedProp::set_type(::protobuf::PropType value) { @@ -3636,11 +3690,11 @@ namespace protobuf // int32 x = 2; inline void MessageOfPickedProp::clear_x() { - x_ = 0; + _impl_.x_ = 0; } inline int32_t MessageOfPickedProp::_internal_x() const { - return x_; + return _impl_.x_; } inline int32_t MessageOfPickedProp::x() const { @@ -3649,7 +3703,7 @@ namespace protobuf } inline void MessageOfPickedProp::_internal_set_x(int32_t value) { - x_ = value; + _impl_.x_ = value; } inline void MessageOfPickedProp::set_x(int32_t value) { @@ -3660,11 +3714,11 @@ namespace protobuf // int32 y = 3; inline void MessageOfPickedProp::clear_y() { - y_ = 0; + _impl_.y_ = 0; } inline int32_t MessageOfPickedProp::_internal_y() const { - return y_; + return _impl_.y_; } inline int32_t MessageOfPickedProp::y() const { @@ -3673,7 +3727,7 @@ namespace protobuf } inline void MessageOfPickedProp::_internal_set_y(int32_t value) { - y_ = value; + _impl_.y_ = value; } inline void MessageOfPickedProp::set_y(int32_t value) { @@ -3684,11 +3738,11 @@ namespace protobuf // double facing_direction = 4; inline void MessageOfPickedProp::clear_facing_direction() { - facing_direction_ = 0; + _impl_.facing_direction_ = 0; } inline double MessageOfPickedProp::_internal_facing_direction() const { - return facing_direction_; + return _impl_.facing_direction_; } inline double MessageOfPickedProp::facing_direction() const { @@ -3697,7 +3751,7 @@ namespace protobuf } inline void MessageOfPickedProp::_internal_set_facing_direction(double value) { - facing_direction_ = value; + _impl_.facing_direction_ = value; } inline void MessageOfPickedProp::set_facing_direction(double value) { @@ -3708,11 +3762,11 @@ namespace protobuf // int64 mapping_id = 5; inline void MessageOfPickedProp::clear_mapping_id() { - mapping_id_ = int64_t{0}; + _impl_.mapping_id_ = int64_t{0}; } inline int64_t MessageOfPickedProp::_internal_mapping_id() const { - return mapping_id_; + return _impl_.mapping_id_; } inline int64_t MessageOfPickedProp::mapping_id() const { @@ -3721,7 +3775,7 @@ namespace protobuf } inline void MessageOfPickedProp::_internal_set_mapping_id(int64_t value) { - mapping_id_ = value; + _impl_.mapping_id_ = value; } inline void MessageOfPickedProp::set_mapping_id(int64_t value) { @@ -3736,7 +3790,7 @@ namespace protobuf // repeated .protobuf.PlaceType col = 1; inline int MessageOfMap_Row::_internal_col_size() const { - return col_.size(); + return _impl_.col_.size(); } inline int MessageOfMap_Row::col_size() const { @@ -3744,11 +3798,11 @@ namespace protobuf } inline void MessageOfMap_Row::clear_col() { - col_.Clear(); + _impl_.col_.Clear(); } inline ::protobuf::PlaceType MessageOfMap_Row::_internal_col(int index) const { - return static_cast<::protobuf::PlaceType>(col_.Get(index)); + return static_cast<::protobuf::PlaceType>(_impl_.col_.Get(index)); } inline ::protobuf::PlaceType MessageOfMap_Row::col(int index) const { @@ -3757,12 +3811,12 @@ namespace protobuf } inline void MessageOfMap_Row::set_col(int index, ::protobuf::PlaceType value) { - col_.Set(index, value); + _impl_.col_.Set(index, value); // @@protoc_insertion_point(field_set:protobuf.MessageOfMap.Row.col) } inline void MessageOfMap_Row::_internal_add_col(::protobuf::PlaceType value) { - col_.Add(value); + _impl_.col_.Add(value); } inline void MessageOfMap_Row::add_col(::protobuf::PlaceType value) { @@ -3773,12 +3827,12 @@ namespace protobuf MessageOfMap_Row::col() const { // @@protoc_insertion_point(field_list:protobuf.MessageOfMap.Row.col) - return col_; + return _impl_.col_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedField* MessageOfMap_Row::_internal_mutable_col() { - return &col_; + return &_impl_.col_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedField* MessageOfMap_Row::mutable_col() @@ -3794,7 +3848,7 @@ namespace protobuf // repeated .protobuf.MessageOfMap.Row row = 2; inline int MessageOfMap::_internal_row_size() const { - return row_.size(); + return _impl_.row_.size(); } inline int MessageOfMap::row_size() const { @@ -3802,22 +3856,22 @@ namespace protobuf } inline void MessageOfMap::clear_row() { - row_.Clear(); + _impl_.row_.Clear(); } inline ::protobuf::MessageOfMap_Row* MessageOfMap::mutable_row(int index) { // @@protoc_insertion_point(field_mutable:protobuf.MessageOfMap.row) - return row_.Mutable(index); + return _impl_.row_.Mutable(index); } inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfMap_Row>* MessageOfMap::mutable_row() { // @@protoc_insertion_point(field_mutable_list:protobuf.MessageOfMap.row) - return &row_; + return &_impl_.row_; } inline const ::protobuf::MessageOfMap_Row& MessageOfMap::_internal_row(int index) const { - return row_.Get(index); + return _impl_.row_.Get(index); } inline const ::protobuf::MessageOfMap_Row& MessageOfMap::row(int index) const { @@ -3826,7 +3880,7 @@ namespace protobuf } inline ::protobuf::MessageOfMap_Row* MessageOfMap::_internal_add_row() { - return row_.Add(); + return _impl_.row_.Add(); } inline ::protobuf::MessageOfMap_Row* MessageOfMap::add_row() { @@ -3838,7 +3892,7 @@ namespace protobuf MessageOfMap::row() const { // @@protoc_insertion_point(field_list:protobuf.MessageOfMap.row) - return row_; + return _impl_.row_; } // ------------------------------------------------------------------- @@ -3848,7 +3902,7 @@ namespace protobuf // repeated .protobuf.MessageOfHuman human_message = 1; inline int MessageToClient::_internal_human_message_size() const { - return human_message_.size(); + return _impl_.human_message_.size(); } inline int MessageToClient::human_message_size() const { @@ -3856,22 +3910,22 @@ namespace protobuf } inline void MessageToClient::clear_human_message() { - human_message_.Clear(); + _impl_.human_message_.Clear(); } inline ::protobuf::MessageOfHuman* MessageToClient::mutable_human_message(int index) { // @@protoc_insertion_point(field_mutable:protobuf.MessageToClient.human_message) - return human_message_.Mutable(index); + return _impl_.human_message_.Mutable(index); } inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfHuman>* MessageToClient::mutable_human_message() { // @@protoc_insertion_point(field_mutable_list:protobuf.MessageToClient.human_message) - return &human_message_; + return &_impl_.human_message_; } inline const ::protobuf::MessageOfHuman& MessageToClient::_internal_human_message(int index) const { - return human_message_.Get(index); + return _impl_.human_message_.Get(index); } inline const ::protobuf::MessageOfHuman& MessageToClient::human_message(int index) const { @@ -3880,7 +3934,7 @@ namespace protobuf } inline ::protobuf::MessageOfHuman* MessageToClient::_internal_add_human_message() { - return human_message_.Add(); + return _impl_.human_message_.Add(); } inline ::protobuf::MessageOfHuman* MessageToClient::add_human_message() { @@ -3892,13 +3946,13 @@ namespace protobuf MessageToClient::human_message() const { // @@protoc_insertion_point(field_list:protobuf.MessageToClient.human_message) - return human_message_; + return _impl_.human_message_; } // repeated .protobuf.MessageOfButcher butcher_message = 2; inline int MessageToClient::_internal_butcher_message_size() const { - return butcher_message_.size(); + return _impl_.butcher_message_.size(); } inline int MessageToClient::butcher_message_size() const { @@ -3906,22 +3960,22 @@ namespace protobuf } inline void MessageToClient::clear_butcher_message() { - butcher_message_.Clear(); + _impl_.butcher_message_.Clear(); } inline ::protobuf::MessageOfButcher* MessageToClient::mutable_butcher_message(int index) { // @@protoc_insertion_point(field_mutable:protobuf.MessageToClient.butcher_message) - return butcher_message_.Mutable(index); + return _impl_.butcher_message_.Mutable(index); } inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfButcher>* MessageToClient::mutable_butcher_message() { // @@protoc_insertion_point(field_mutable_list:protobuf.MessageToClient.butcher_message) - return &butcher_message_; + return &_impl_.butcher_message_; } inline const ::protobuf::MessageOfButcher& MessageToClient::_internal_butcher_message(int index) const { - return butcher_message_.Get(index); + return _impl_.butcher_message_.Get(index); } inline const ::protobuf::MessageOfButcher& MessageToClient::butcher_message(int index) const { @@ -3930,7 +3984,7 @@ namespace protobuf } inline ::protobuf::MessageOfButcher* MessageToClient::_internal_add_butcher_message() { - return butcher_message_.Add(); + return _impl_.butcher_message_.Add(); } inline ::protobuf::MessageOfButcher* MessageToClient::add_butcher_message() { @@ -3942,13 +3996,13 @@ namespace protobuf MessageToClient::butcher_message() const { // @@protoc_insertion_point(field_list:protobuf.MessageToClient.butcher_message) - return butcher_message_; + return _impl_.butcher_message_; } // repeated .protobuf.MessageOfProp prop_message = 3; inline int MessageToClient::_internal_prop_message_size() const { - return prop_message_.size(); + return _impl_.prop_message_.size(); } inline int MessageToClient::prop_message_size() const { @@ -3956,22 +4010,22 @@ namespace protobuf } inline void MessageToClient::clear_prop_message() { - prop_message_.Clear(); + _impl_.prop_message_.Clear(); } inline ::protobuf::MessageOfProp* MessageToClient::mutable_prop_message(int index) { // @@protoc_insertion_point(field_mutable:protobuf.MessageToClient.prop_message) - return prop_message_.Mutable(index); + return _impl_.prop_message_.Mutable(index); } inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfProp>* MessageToClient::mutable_prop_message() { // @@protoc_insertion_point(field_mutable_list:protobuf.MessageToClient.prop_message) - return &prop_message_; + return &_impl_.prop_message_; } inline const ::protobuf::MessageOfProp& MessageToClient::_internal_prop_message(int index) const { - return prop_message_.Get(index); + return _impl_.prop_message_.Get(index); } inline const ::protobuf::MessageOfProp& MessageToClient::prop_message(int index) const { @@ -3980,7 +4034,7 @@ namespace protobuf } inline ::protobuf::MessageOfProp* MessageToClient::_internal_add_prop_message() { - return prop_message_.Add(); + return _impl_.prop_message_.Add(); } inline ::protobuf::MessageOfProp* MessageToClient::add_prop_message() { @@ -3992,13 +4046,13 @@ namespace protobuf MessageToClient::prop_message() const { // @@protoc_insertion_point(field_list:protobuf.MessageToClient.prop_message) - return prop_message_; + return _impl_.prop_message_; } // .protobuf.MessageOfMap map_massage = 4; inline bool MessageToClient::_internal_has_map_massage() const { - return this != internal_default_instance() && map_massage_ != nullptr; + return this != internal_default_instance() && _impl_.map_massage_ != nullptr; } inline bool MessageToClient::has_map_massage() const { @@ -4006,15 +4060,15 @@ namespace protobuf } inline void MessageToClient::clear_map_massage() { - if (GetArenaForAllocation() == nullptr && map_massage_ != nullptr) + if (GetArenaForAllocation() == nullptr && _impl_.map_massage_ != nullptr) { - delete map_massage_; + delete _impl_.map_massage_; } - map_massage_ = nullptr; + _impl_.map_massage_ = nullptr; } inline const ::protobuf::MessageOfMap& MessageToClient::_internal_map_massage() const { - const ::protobuf::MessageOfMap* p = map_massage_; + const ::protobuf::MessageOfMap* p = _impl_.map_massage_; return p != nullptr ? *p : reinterpret_cast(::protobuf::_MessageOfMap_default_instance_); } inline const ::protobuf::MessageOfMap& MessageToClient::map_massage() const @@ -4028,9 +4082,9 @@ namespace protobuf { if (GetArenaForAllocation() == nullptr) { - delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(map_massage_); + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.map_massage_); } - map_massage_ = map_massage; + _impl_.map_massage_ = map_massage; if (map_massage) { } @@ -4041,8 +4095,8 @@ namespace protobuf } inline ::protobuf::MessageOfMap* MessageToClient::release_map_massage() { - ::protobuf::MessageOfMap* temp = map_massage_; - map_massage_ = nullptr; + ::protobuf::MessageOfMap* temp = _impl_.map_massage_; + _impl_.map_massage_ = nullptr; #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); @@ -4062,18 +4116,18 @@ namespace protobuf { // @@protoc_insertion_point(field_release:protobuf.MessageToClient.map_massage) - ::protobuf::MessageOfMap* temp = map_massage_; - map_massage_ = nullptr; + ::protobuf::MessageOfMap* temp = _impl_.map_massage_; + _impl_.map_massage_ = nullptr; return temp; } inline ::protobuf::MessageOfMap* MessageToClient::_internal_mutable_map_massage() { - if (map_massage_ == nullptr) + if (_impl_.map_massage_ == nullptr) { auto* p = CreateMaybeMessage<::protobuf::MessageOfMap>(GetArenaForAllocation()); - map_massage_ = p; + _impl_.map_massage_ = p; } - return map_massage_; + return _impl_.map_massage_; } inline ::protobuf::MessageOfMap* MessageToClient::mutable_map_massage() { @@ -4086,12 +4140,12 @@ namespace protobuf ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); if (message_arena == nullptr) { - delete map_massage_; + delete _impl_.map_massage_; } if (map_massage) { ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::protobuf::MessageOfMap>::GetOwningArena(map_massage); + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(map_massage); if (message_arena != submessage_arena) { map_massage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( @@ -4102,7 +4156,7 @@ namespace protobuf else { } - map_massage_ = map_massage; + _impl_.map_massage_ = map_massage; // @@protoc_insertion_point(field_set_allocated:protobuf.MessageToClient.map_massage) } @@ -4113,11 +4167,11 @@ namespace protobuf // int64 actual_speed = 1; inline void MoveRes::clear_actual_speed() { - actual_speed_ = int64_t{0}; + _impl_.actual_speed_ = int64_t{0}; } inline int64_t MoveRes::_internal_actual_speed() const { - return actual_speed_; + return _impl_.actual_speed_; } inline int64_t MoveRes::actual_speed() const { @@ -4126,7 +4180,7 @@ namespace protobuf } inline void MoveRes::_internal_set_actual_speed(int64_t value) { - actual_speed_ = value; + _impl_.actual_speed_ = value; } inline void MoveRes::set_actual_speed(int64_t value) { @@ -4137,11 +4191,11 @@ namespace protobuf // double actual_angle = 2; inline void MoveRes::clear_actual_angle() { - actual_angle_ = 0; + _impl_.actual_angle_ = 0; } inline double MoveRes::_internal_actual_angle() const { - return actual_angle_; + return _impl_.actual_angle_; } inline double MoveRes::actual_angle() const { @@ -4150,7 +4204,7 @@ namespace protobuf } inline void MoveRes::_internal_set_actual_angle(double value) { - actual_angle_ = value; + _impl_.actual_angle_ = value; } inline void MoveRes::set_actual_angle(double value) { @@ -4165,11 +4219,11 @@ namespace protobuf // bool act_success = 1; inline void BoolRes::clear_act_success() { - act_success_ = false; + _impl_.act_success_ = false; } inline bool BoolRes::_internal_act_success() const { - return act_success_; + return _impl_.act_success_; } inline bool BoolRes::act_success() const { @@ -4178,7 +4232,7 @@ namespace protobuf } inline void BoolRes::_internal_set_act_success(bool value) { - act_success_ = value; + _impl_.act_success_ = value; } inline void BoolRes::set_act_success(bool value) { @@ -4193,11 +4247,11 @@ namespace protobuf // bool have_message = 1; inline void MsgRes::clear_have_message() { - have_message_ = false; + _impl_.have_message_ = false; } inline bool MsgRes::_internal_have_message() const { - return have_message_; + return _impl_.have_message_; } inline bool MsgRes::have_message() const { @@ -4206,7 +4260,7 @@ namespace protobuf } inline void MsgRes::_internal_set_have_message(bool value) { - have_message_ = value; + _impl_.have_message_ = value; } inline void MsgRes::set_have_message(bool value) { @@ -4217,11 +4271,11 @@ namespace protobuf // int64 from_player_id = 2; inline void MsgRes::clear_from_player_id() { - from_player_id_ = int64_t{0}; + _impl_.from_player_id_ = int64_t{0}; } inline int64_t MsgRes::_internal_from_player_id() const { - return from_player_id_; + return _impl_.from_player_id_; } inline int64_t MsgRes::from_player_id() const { @@ -4230,7 +4284,7 @@ namespace protobuf } inline void MsgRes::_internal_set_from_player_id(int64_t value) { - from_player_id_ = value; + _impl_.from_player_id_ = value; } inline void MsgRes::set_from_player_id(int64_t value) { @@ -4241,7 +4295,7 @@ namespace protobuf // string message_received = 3; inline void MsgRes::clear_message_received() { - message_received_.ClearToEmpty(); + _impl_.message_received_.ClearToEmpty(); } inline const std::string& MsgRes::message_received() const { @@ -4251,7 +4305,7 @@ namespace protobuf template inline PROTOBUF_ALWAYS_INLINE void MsgRes::set_message_received(ArgT0&& arg0, ArgT... args) { - message_received_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast(arg0), args..., GetArenaForAllocation()); + _impl_.message_received_.Set(static_cast(arg0), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:protobuf.MsgRes.message_received) } inline std::string* MsgRes::mutable_message_received() @@ -4262,20 +4316,20 @@ namespace protobuf } inline const std::string& MsgRes::_internal_message_received() const { - return message_received_.Get(); + return _impl_.message_received_.Get(); } inline void MsgRes::_internal_set_message_received(const std::string& value) { - message_received_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation()); + _impl_.message_received_.Set(value, GetArenaForAllocation()); } inline std::string* MsgRes::_internal_mutable_message_received() { - return message_received_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation()); + return _impl_.message_received_.Mutable(GetArenaForAllocation()); } inline std::string* MsgRes::release_message_received() { // @@protoc_insertion_point(field_release:protobuf.MsgRes.message_received) - return message_received_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); + return _impl_.message_received_.Release(); } inline void MsgRes::set_allocated_message_received(std::string* message_received) { @@ -4285,11 +4339,11 @@ namespace protobuf else { } - message_received_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), message_received, GetArenaForAllocation()); + _impl_.message_received_.SetAllocated(message_received, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (message_received_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) + if (_impl_.message_received_.IsDefault()) { - message_received_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + _impl_.message_received_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:protobuf.MsgRes.message_received) diff --git a/CAPI/proto/Message2Server.grpc.pb.cc b/CAPI/proto/Message2Server.grpc.pb.cc deleted file mode 100644 index 1b47393..0000000 --- a/CAPI/proto/Message2Server.grpc.pb.cc +++ /dev/null @@ -1,25 +0,0 @@ -// Generated by the gRPC C++ plugin. -// If you make any local change, they will be lost. -// source: Message2Server.proto - -#include "Message2Server.pb.h" -#include "Message2Server.grpc.pb.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -namespace protobuf -{ - -} // namespace protobuf diff --git a/CAPI/proto/Message2Server.grpc.pb.h b/CAPI/proto/Message2Server.grpc.pb.h deleted file mode 100644 index 511570c..0000000 --- a/CAPI/proto/Message2Server.grpc.pb.h +++ /dev/null @@ -1,35 +0,0 @@ -// Generated by the gRPC C++ plugin. -// If you make any local change, they will be lost. -// source: Message2Server.proto -// Original file comments: -// Message2Server -#ifndef GRPC_Message2Server_2eproto__INCLUDED -#define GRPC_Message2Server_2eproto__INCLUDED - -#include "Message2Server.pb.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace protobuf -{ - -} // namespace protobuf - -#endif // GRPC_Message2Server_2eproto__INCLUDED diff --git a/CAPI/proto/Message2Server.pb.cc b/CAPI/proto/Message2Server.pb.cc index 9777136..3f817a9 100644 --- a/CAPI/proto/Message2Server.pb.cc +++ b/CAPI/proto/Message2Server.pb.cc @@ -16,22 +16,23 @@ #include PROTOBUF_PRAGMA_INIT_SEG + +namespace _pb = ::PROTOBUF_NAMESPACE_ID; +namespace _pbi = _pb::internal; + namespace protobuf { - constexpr PlayerMsg::PlayerMsg( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_CONSTEXPR PlayerMsg::PlayerMsg( + ::_pbi::ConstantInitialized ) : - player_id_(int64_t{0}), - player_type_(0) - - , - _oneof_case_{} + _impl_{ + /*decltype(_impl_.player_id_)*/ int64_t{0}, /*decltype(_impl_.player_type_)*/ 0, /*decltype(_impl_.job_type_)*/ {}, /*decltype(_impl_._cached_size_)*/ {}, /*decltype(_impl_._oneof_case_)*/ {}} { } struct PlayerMsgDefaultTypeInternal { - constexpr PlayerMsgDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR PlayerMsgDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~PlayerMsgDefaultTypeInternal() @@ -42,19 +43,18 @@ namespace protobuf PlayerMsg _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PlayerMsgDefaultTypeInternal _PlayerMsg_default_instance_; - constexpr MoveMsg::MoveMsg( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PlayerMsgDefaultTypeInternal _PlayerMsg_default_instance_; + PROTOBUF_CONSTEXPR MoveMsg::MoveMsg( + ::_pbi::ConstantInitialized ) : - player_id_(int64_t{0}), - angle_(0), - time_in_milliseconds_(int64_t{0}) + _impl_{ + /*decltype(_impl_.player_id_)*/ int64_t{0}, /*decltype(_impl_.angle_)*/ 0, /*decltype(_impl_.time_in_milliseconds_)*/ int64_t{0}, /*decltype(_impl_._cached_size_)*/ {}} { } struct MoveMsgDefaultTypeInternal { - constexpr MoveMsgDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR MoveMsgDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~MoveMsgDefaultTypeInternal() @@ -65,18 +65,18 @@ namespace protobuf MoveMsg _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT MoveMsgDefaultTypeInternal _MoveMsg_default_instance_; - constexpr PickMsg::PickMsg( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MoveMsgDefaultTypeInternal _MoveMsg_default_instance_; + PROTOBUF_CONSTEXPR PickMsg::PickMsg( + ::_pbi::ConstantInitialized ) : - player_id_(int64_t{0}), - prop_type_(0) + _impl_{ + /*decltype(_impl_.player_id_)*/ int64_t{0}, /*decltype(_impl_.prop_type_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}} { } struct PickMsgDefaultTypeInternal { - constexpr PickMsgDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR PickMsgDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~PickMsgDefaultTypeInternal() @@ -87,19 +87,18 @@ namespace protobuf PickMsg _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PickMsgDefaultTypeInternal _PickMsg_default_instance_; - constexpr SendMsg::SendMsg( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PickMsgDefaultTypeInternal _PickMsg_default_instance_; + PROTOBUF_CONSTEXPR SendMsg::SendMsg( + ::_pbi::ConstantInitialized ) : - message_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string), - player_id_(int64_t{0}), - to_player_id_(int64_t{0}) + _impl_{ + /*decltype(_impl_.message_)*/ {&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}, /*decltype(_impl_.player_id_)*/ int64_t{0}, /*decltype(_impl_.to_player_id_)*/ int64_t{0}, /*decltype(_impl_._cached_size_)*/ {}} { } struct SendMsgDefaultTypeInternal { - constexpr SendMsgDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR SendMsgDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~SendMsgDefaultTypeInternal() @@ -110,18 +109,18 @@ namespace protobuf SendMsg _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT SendMsgDefaultTypeInternal _SendMsg_default_instance_; - constexpr AttackMsg::AttackMsg( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SendMsgDefaultTypeInternal _SendMsg_default_instance_; + PROTOBUF_CONSTEXPR AttackMsg::AttackMsg( + ::_pbi::ConstantInitialized ) : - player_id_(int64_t{0}), - angle_(0) + _impl_{ + /*decltype(_impl_.player_id_)*/ int64_t{0}, /*decltype(_impl_.angle_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}} { } struct AttackMsgDefaultTypeInternal { - constexpr AttackMsgDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR AttackMsgDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~AttackMsgDefaultTypeInternal() @@ -132,17 +131,18 @@ namespace protobuf AttackMsg _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT AttackMsgDefaultTypeInternal _AttackMsg_default_instance_; - constexpr IDMsg::IDMsg( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AttackMsgDefaultTypeInternal _AttackMsg_default_instance_; + PROTOBUF_CONSTEXPR IDMsg::IDMsg( + ::_pbi::ConstantInitialized ) : - player_id_(int64_t{0}) + _impl_{ + /*decltype(_impl_.player_id_)*/ int64_t{0}, /*decltype(_impl_._cached_size_)*/ {}} { } struct IDMsgDefaultTypeInternal { - constexpr IDMsgDefaultTypeInternal() : - _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) + PROTOBUF_CONSTEXPR IDMsgDefaultTypeInternal() : + _instance(::_pbi::ConstantInitialized{}) { } ~IDMsgDefaultTypeInternal() @@ -153,67 +153,67 @@ namespace protobuf IDMsg _instance; }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT IDMsgDefaultTypeInternal _IDMsg_default_instance_; + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 IDMsgDefaultTypeInternal _IDMsg_default_instance_; } // namespace protobuf -static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_Message2Server_2eproto[6]; -static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_Message2Server_2eproto = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_Message2Server_2eproto = nullptr; +static ::_pb::Metadata file_level_metadata_Message2Server_2eproto[6]; +static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_Message2Server_2eproto = nullptr; +static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_Message2Server_2eproto = nullptr; const uint32_t TableStruct_Message2Server_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::PlayerMsg, _internal_metadata_), ~0u, // no _extensions_ - PROTOBUF_FIELD_OFFSET(::protobuf::PlayerMsg, _oneof_case_[0]), + PROTOBUF_FIELD_OFFSET(::protobuf::PlayerMsg, _impl_._oneof_case_[0]), ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::PlayerMsg, player_id_), - PROTOBUF_FIELD_OFFSET(::protobuf::PlayerMsg, player_type_), - ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag, - ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag, - PROTOBUF_FIELD_OFFSET(::protobuf::PlayerMsg, job_type_), + PROTOBUF_FIELD_OFFSET(::protobuf::PlayerMsg, _impl_.player_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::PlayerMsg, _impl_.player_type_), + ::_pbi::kInvalidFieldOffsetTag, + ::_pbi::kInvalidFieldOffsetTag, + PROTOBUF_FIELD_OFFSET(::protobuf::PlayerMsg, _impl_.job_type_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MoveMsg, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::MoveMsg, player_id_), - PROTOBUF_FIELD_OFFSET(::protobuf::MoveMsg, angle_), - PROTOBUF_FIELD_OFFSET(::protobuf::MoveMsg, time_in_milliseconds_), + PROTOBUF_FIELD_OFFSET(::protobuf::MoveMsg, _impl_.player_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::MoveMsg, _impl_.angle_), + PROTOBUF_FIELD_OFFSET(::protobuf::MoveMsg, _impl_.time_in_milliseconds_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::PickMsg, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::PickMsg, player_id_), - PROTOBUF_FIELD_OFFSET(::protobuf::PickMsg, prop_type_), + PROTOBUF_FIELD_OFFSET(::protobuf::PickMsg, _impl_.player_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::PickMsg, _impl_.prop_type_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::SendMsg, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::SendMsg, player_id_), - PROTOBUF_FIELD_OFFSET(::protobuf::SendMsg, to_player_id_), - PROTOBUF_FIELD_OFFSET(::protobuf::SendMsg, message_), + PROTOBUF_FIELD_OFFSET(::protobuf::SendMsg, _impl_.player_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::SendMsg, _impl_.to_player_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::SendMsg, _impl_.message_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::AttackMsg, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::AttackMsg, player_id_), - PROTOBUF_FIELD_OFFSET(::protobuf::AttackMsg, angle_), + PROTOBUF_FIELD_OFFSET(::protobuf::AttackMsg, _impl_.player_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::AttackMsg, _impl_.angle_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::IDMsg, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::protobuf::IDMsg, player_id_), + PROTOBUF_FIELD_OFFSET(::protobuf::IDMsg, _impl_.player_id_), }; -static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { {0, -1, -1, sizeof(::protobuf::PlayerMsg)}, {11, -1, -1, sizeof(::protobuf::MoveMsg)}, {20, -1, -1, sizeof(::protobuf::PickMsg)}, @@ -222,13 +222,13 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOB {45, -1, -1, sizeof(::protobuf::IDMsg)}, }; -static ::PROTOBUF_NAMESPACE_ID::Message const* const file_default_instances[] = { - reinterpret_cast(&::protobuf::_PlayerMsg_default_instance_), - reinterpret_cast(&::protobuf::_MoveMsg_default_instance_), - reinterpret_cast(&::protobuf::_PickMsg_default_instance_), - reinterpret_cast(&::protobuf::_SendMsg_default_instance_), - reinterpret_cast(&::protobuf::_AttackMsg_default_instance_), - reinterpret_cast(&::protobuf::_IDMsg_default_instance_), +static const ::_pb::Message* const file_default_instances[] = { + &::protobuf::_PlayerMsg_default_instance_._instance, + &::protobuf::_MoveMsg_default_instance_._instance, + &::protobuf::_PickMsg_default_instance_._instance, + &::protobuf::_SendMsg_default_instance_._instance, + &::protobuf::_AttackMsg_default_instance_._instance, + &::protobuf::_IDMsg_default_instance_._instance, }; const char descriptor_table_protodef_Message2Server_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = @@ -246,11 +246,11 @@ const char descriptor_table_protodef_Message2Server_2eproto[] PROTOBUF_SECTION_V "(\t\"-\n\tAttackMsg\022\021\n\tplayer_id\030\001 \001(\003\022\r\n\005an" "gle\030\002 \001(\001\"\032\n\005IDMsg\022\021\n\tplayer_id\030\001 \001(\003b\006p" "roto3"; -static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable* const descriptor_table_Message2Server_2eproto_deps[1] = { +static const ::_pbi::DescriptorTable* const descriptor_table_Message2Server_2eproto_deps[1] = { &::descriptor_table_MessageType_2eproto, }; -static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_Message2Server_2eproto_once; -const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Message2Server_2eproto = { +static ::_pbi::once_flag descriptor_table_Message2Server_2eproto_once; +const ::_pbi::DescriptorTable descriptor_table_Message2Server_2eproto = { false, false, 525, @@ -267,13 +267,13 @@ const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Messag file_level_enum_descriptors_Message2Server_2eproto, file_level_service_descriptors_Message2Server_2eproto, }; -PROTOBUF_ATTRIBUTE_WEAK const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable* descriptor_table_Message2Server_2eproto_getter() +PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_Message2Server_2eproto_getter() { return &descriptor_table_Message2Server_2eproto; } // Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY static ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptorsRunner dynamic_init_dummy_Message2Server_2eproto(&descriptor_table_Message2Server_2eproto); +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_Message2Server_2eproto(&descriptor_table_Message2Server_2eproto); namespace protobuf { @@ -287,29 +287,30 @@ namespace protobuf PlayerMsg::PlayerMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.PlayerMsg) } PlayerMsg::PlayerMsg(const PlayerMsg& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + PlayerMsg* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){}, decltype(_impl_.player_type_){}, decltype(_impl_.job_type_){}, /*decltype(_impl_._cached_size_)*/ {}, /*decltype(_impl_._oneof_case_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&player_id_, &from.player_id_, static_cast(reinterpret_cast(&player_type_) - reinterpret_cast(&player_id_)) + sizeof(player_type_)); + ::memcpy(&_impl_.player_id_, &from._impl_.player_id_, static_cast(reinterpret_cast(&_impl_.player_type_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.player_type_)); clear_has_job_type(); switch (from.job_type_case()) { case kHumanType: { - _internal_set_human_type(from._internal_human_type()); + _this->_internal_set_human_type(from._internal_human_type()); break; } case kButcherType: { - _internal_set_butcher_type(from._internal_butcher_type()); + _this->_internal_set_butcher_type(from._internal_butcher_type()); break; } case JOB_TYPE_NOT_SET: @@ -320,19 +321,26 @@ namespace protobuf // @@protoc_insertion_point(copy_constructor:protobuf.PlayerMsg) } - inline void PlayerMsg::SharedCtor() + inline void PlayerMsg::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&player_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&player_type_) - reinterpret_cast(&player_id_)) + sizeof(player_type_)); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){int64_t{0}}, decltype(_impl_.player_type_){0}, decltype(_impl_.job_type_){}, /*decltype(_impl_._cached_size_)*/ {}, /*decltype(_impl_._oneof_case_)*/ {}}; clear_has_job_type(); } PlayerMsg::~PlayerMsg() { // @@protoc_insertion_point(destructor:protobuf.PlayerMsg) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void PlayerMsg::SharedDtor() @@ -344,17 +352,9 @@ namespace protobuf } } - void PlayerMsg::ArenaDtor(void* object) - { - PlayerMsg* _this = reinterpret_cast(object); - (void)_this; - } - void PlayerMsg::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void PlayerMsg::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void PlayerMsg::clear_job_type() @@ -377,7 +377,7 @@ namespace protobuf break; } } - _oneof_case_[0] = JOB_TYPE_NOT_SET; + _impl_._oneof_case_[0] = JOB_TYPE_NOT_SET; } void PlayerMsg::Clear() @@ -387,12 +387,12 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - ::memset(&player_id_, 0, static_cast(reinterpret_cast(&player_type_) - reinterpret_cast(&player_id_)) + sizeof(player_type_)); + ::memset(&_impl_.player_id_, 0, static_cast(reinterpret_cast(&_impl_.player_type_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.player_type_)); clear_job_type(); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* PlayerMsg::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* PlayerMsg::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -400,14 +400,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // int64 player_id = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -484,14 +484,14 @@ namespace protobuf if (this->_internal_player_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); } // .protobuf.PlayerType player_type = 2; if (this->_internal_player_type() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 2, this->_internal_player_type(), target ); } @@ -500,7 +500,7 @@ namespace protobuf if (_internal_has_human_type()) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 3, this->_internal_human_type(), target ); } @@ -509,14 +509,14 @@ namespace protobuf if (_internal_has_butcher_type()) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 4, this->_internal_butcher_type(), target ); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -536,14 +536,14 @@ namespace protobuf // int64 player_id = 1; if (this->_internal_player_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); } // .protobuf.PlayerType player_type = 2; if (this->_internal_player_type() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_player_type()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_player_type()); } switch (job_type_case()) @@ -552,14 +552,14 @@ namespace protobuf case kHumanType: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_human_type()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_human_type()); break; } // .protobuf.ButcherType butcher_type = 4; case kButcherType: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_butcher_type()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_butcher_type()); break; } case JOB_TYPE_NOT_SET: @@ -567,49 +567,44 @@ namespace protobuf break; } } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData PlayerMsg::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, PlayerMsg::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* PlayerMsg::GetClassData() const { return &_class_data_; } - void PlayerMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void PlayerMsg::MergeFrom(const PlayerMsg& from) + void PlayerMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.PlayerMsg) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (from._internal_player_id() != 0) { - _internal_set_player_id(from._internal_player_id()); + _this->_internal_set_player_id(from._internal_player_id()); } if (from._internal_player_type() != 0) { - _internal_set_player_type(from._internal_player_type()); + _this->_internal_set_player_type(from._internal_player_type()); } switch (from.job_type_case()) { case kHumanType: { - _internal_set_human_type(from._internal_human_type()); + _this->_internal_set_human_type(from._internal_human_type()); break; } case kButcherType: { - _internal_set_butcher_type(from._internal_butcher_type()); + _this->_internal_set_butcher_type(from._internal_butcher_type()); break; } case JOB_TYPE_NOT_SET: @@ -617,7 +612,7 @@ namespace protobuf break; } } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void PlayerMsg::CopyFrom(const PlayerMsg& from) @@ -639,17 +634,17 @@ namespace protobuf using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(PlayerMsg, player_type_) + sizeof(PlayerMsg::player_type_) - PROTOBUF_FIELD_OFFSET(PlayerMsg, player_id_)>( - reinterpret_cast(&player_id_), - reinterpret_cast(&other->player_id_) + PROTOBUF_FIELD_OFFSET(PlayerMsg, _impl_.player_type_) + sizeof(PlayerMsg::_impl_.player_type_) - PROTOBUF_FIELD_OFFSET(PlayerMsg, _impl_.player_id_)>( + reinterpret_cast(&_impl_.player_id_), + reinterpret_cast(&other->_impl_.player_id_) ); - swap(job_type_, other->job_type_); - swap(_oneof_case_[0], other->_oneof_case_[0]); + swap(_impl_.job_type_, other->_impl_.job_type_); + swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]); } ::PROTOBUF_NAMESPACE_ID::Metadata PlayerMsg::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Server_2eproto_getter, &descriptor_table_Message2Server_2eproto_once, file_level_metadata_Message2Server_2eproto[0] ); } @@ -664,33 +659,41 @@ namespace protobuf MoveMsg::MoveMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.MoveMsg) } MoveMsg::MoveMsg(const MoveMsg& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + MoveMsg* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){}, decltype(_impl_.angle_){}, decltype(_impl_.time_in_milliseconds_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&player_id_, &from.player_id_, static_cast(reinterpret_cast(&time_in_milliseconds_) - reinterpret_cast(&player_id_)) + sizeof(time_in_milliseconds_)); + ::memcpy(&_impl_.player_id_, &from._impl_.player_id_, static_cast(reinterpret_cast(&_impl_.time_in_milliseconds_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.time_in_milliseconds_)); // @@protoc_insertion_point(copy_constructor:protobuf.MoveMsg) } - inline void MoveMsg::SharedCtor() + inline void MoveMsg::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&player_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&time_in_milliseconds_) - reinterpret_cast(&player_id_)) + sizeof(time_in_milliseconds_)); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){int64_t{0}}, decltype(_impl_.angle_){0}, decltype(_impl_.time_in_milliseconds_){int64_t{0}}, /*decltype(_impl_._cached_size_)*/ {}}; } MoveMsg::~MoveMsg() { // @@protoc_insertion_point(destructor:protobuf.MoveMsg) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void MoveMsg::SharedDtor() @@ -698,17 +701,9 @@ namespace protobuf GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); } - void MoveMsg::ArenaDtor(void* object) - { - MoveMsg* _this = reinterpret_cast(object); - (void)_this; - } - void MoveMsg::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void MoveMsg::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void MoveMsg::Clear() @@ -718,11 +713,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - ::memset(&player_id_, 0, static_cast(reinterpret_cast(&time_in_milliseconds_) - reinterpret_cast(&player_id_)) + sizeof(time_in_milliseconds_)); + ::memset(&_impl_.player_id_, 0, static_cast(reinterpret_cast(&_impl_.time_in_milliseconds_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.time_in_milliseconds_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* MoveMsg::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* MoveMsg::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -730,14 +725,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // int64 player_id = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -747,7 +742,7 @@ namespace protobuf case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 17)) { - angle_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + _impl_.angle_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); ptr += sizeof(double); } else @@ -757,7 +752,7 @@ namespace protobuf case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { - time_in_milliseconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.time_in_milliseconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -801,7 +796,7 @@ namespace protobuf if (this->_internal_player_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); } // double angle = 2; @@ -812,19 +807,19 @@ namespace protobuf if (raw_angle != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteDoubleToArray(2, this->_internal_angle(), target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(2, this->_internal_angle(), target); } // int64 time_in_milliseconds = 3; if (this->_internal_time_in_milliseconds() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(3, this->_internal_time_in_milliseconds(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(3, this->_internal_time_in_milliseconds(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -844,7 +839,7 @@ namespace protobuf // int64 player_id = 1; if (this->_internal_player_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); } // double angle = 2; @@ -860,37 +855,32 @@ namespace protobuf // int64 time_in_milliseconds = 3; if (this->_internal_time_in_milliseconds() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_time_in_milliseconds()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_time_in_milliseconds()); } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MoveMsg::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, MoveMsg::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* MoveMsg::GetClassData() const { return &_class_data_; } - void MoveMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void MoveMsg::MergeFrom(const MoveMsg& from) + void MoveMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.MoveMsg) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (from._internal_player_id() != 0) { - _internal_set_player_id(from._internal_player_id()); + _this->_internal_set_player_id(from._internal_player_id()); } static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); double tmp_angle = from._internal_angle(); @@ -898,13 +888,13 @@ namespace protobuf memcpy(&raw_angle, &tmp_angle, sizeof(tmp_angle)); if (raw_angle != 0) { - _internal_set_angle(from._internal_angle()); + _this->_internal_set_angle(from._internal_angle()); } if (from._internal_time_in_milliseconds() != 0) { - _internal_set_time_in_milliseconds(from._internal_time_in_milliseconds()); + _this->_internal_set_time_in_milliseconds(from._internal_time_in_milliseconds()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void MoveMsg::CopyFrom(const MoveMsg& from) @@ -926,15 +916,15 @@ namespace protobuf using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(MoveMsg, time_in_milliseconds_) + sizeof(MoveMsg::time_in_milliseconds_) - PROTOBUF_FIELD_OFFSET(MoveMsg, player_id_)>( - reinterpret_cast(&player_id_), - reinterpret_cast(&other->player_id_) + PROTOBUF_FIELD_OFFSET(MoveMsg, _impl_.time_in_milliseconds_) + sizeof(MoveMsg::_impl_.time_in_milliseconds_) - PROTOBUF_FIELD_OFFSET(MoveMsg, _impl_.player_id_)>( + reinterpret_cast(&_impl_.player_id_), + reinterpret_cast(&other->_impl_.player_id_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata MoveMsg::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Server_2eproto_getter, &descriptor_table_Message2Server_2eproto_once, file_level_metadata_Message2Server_2eproto[1] ); } @@ -949,33 +939,41 @@ namespace protobuf PickMsg::PickMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.PickMsg) } PickMsg::PickMsg(const PickMsg& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + PickMsg* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){}, decltype(_impl_.prop_type_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&player_id_, &from.player_id_, static_cast(reinterpret_cast(&prop_type_) - reinterpret_cast(&player_id_)) + sizeof(prop_type_)); + ::memcpy(&_impl_.player_id_, &from._impl_.player_id_, static_cast(reinterpret_cast(&_impl_.prop_type_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.prop_type_)); // @@protoc_insertion_point(copy_constructor:protobuf.PickMsg) } - inline void PickMsg::SharedCtor() + inline void PickMsg::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&player_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&prop_type_) - reinterpret_cast(&player_id_)) + sizeof(prop_type_)); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){int64_t{0}}, decltype(_impl_.prop_type_){0}, /*decltype(_impl_._cached_size_)*/ {}}; } PickMsg::~PickMsg() { // @@protoc_insertion_point(destructor:protobuf.PickMsg) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void PickMsg::SharedDtor() @@ -983,17 +981,9 @@ namespace protobuf GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); } - void PickMsg::ArenaDtor(void* object) - { - PickMsg* _this = reinterpret_cast(object); - (void)_this; - } - void PickMsg::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void PickMsg::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void PickMsg::Clear() @@ -1003,11 +993,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - ::memset(&player_id_, 0, static_cast(reinterpret_cast(&prop_type_) - reinterpret_cast(&player_id_)) + sizeof(prop_type_)); + ::memset(&_impl_.player_id_, 0, static_cast(reinterpret_cast(&_impl_.prop_type_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.prop_type_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* PickMsg::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* PickMsg::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -1015,14 +1005,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // int64 player_id = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -1077,21 +1067,21 @@ namespace protobuf if (this->_internal_player_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); } // .protobuf.PropType prop_type = 2; if (this->_internal_prop_type() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( + target = ::_pbi::WireFormatLite::WriteEnumToArray( 2, this->_internal_prop_type(), target ); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -1111,50 +1101,45 @@ namespace protobuf // int64 player_id = 1; if (this->_internal_player_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); } // .protobuf.PropType prop_type = 2; if (this->_internal_prop_type() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_prop_type()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_prop_type()); } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData PickMsg::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, PickMsg::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* PickMsg::GetClassData() const { return &_class_data_; } - void PickMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void PickMsg::MergeFrom(const PickMsg& from) + void PickMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.PickMsg) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (from._internal_player_id() != 0) { - _internal_set_player_id(from._internal_player_id()); + _this->_internal_set_player_id(from._internal_player_id()); } if (from._internal_prop_type() != 0) { - _internal_set_prop_type(from._internal_prop_type()); + _this->_internal_set_prop_type(from._internal_prop_type()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void PickMsg::CopyFrom(const PickMsg& from) @@ -1176,15 +1161,15 @@ namespace protobuf using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(PickMsg, prop_type_) + sizeof(PickMsg::prop_type_) - PROTOBUF_FIELD_OFFSET(PickMsg, player_id_)>( - reinterpret_cast(&player_id_), - reinterpret_cast(&other->player_id_) + PROTOBUF_FIELD_OFFSET(PickMsg, _impl_.prop_type_) + sizeof(PickMsg::_impl_.prop_type_) - PROTOBUF_FIELD_OFFSET(PickMsg, _impl_.player_id_)>( + reinterpret_cast(&_impl_.player_id_), + reinterpret_cast(&other->_impl_.player_id_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata PickMsg::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Server_2eproto_getter, &descriptor_table_Message2Server_2eproto_once, file_level_metadata_Message2Server_2eproto[2] ); } @@ -1199,64 +1184,64 @@ namespace protobuf SendMsg::SendMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.SendMsg) } SendMsg::SendMsg(const SendMsg& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + SendMsg* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.message_){}, decltype(_impl_.player_id_){}, decltype(_impl_.to_player_id_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - message_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + _impl_.message_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - message_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + _impl_.message_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING if (!from._internal_message().empty()) { - message_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_message(), GetArenaForAllocation()); + _this->_impl_.message_.Set(from._internal_message(), _this->GetArenaForAllocation()); } - ::memcpy(&player_id_, &from.player_id_, static_cast(reinterpret_cast(&to_player_id_) - reinterpret_cast(&player_id_)) + sizeof(to_player_id_)); + ::memcpy(&_impl_.player_id_, &from._impl_.player_id_, static_cast(reinterpret_cast(&_impl_.to_player_id_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.to_player_id_)); // @@protoc_insertion_point(copy_constructor:protobuf.SendMsg) } - inline void SendMsg::SharedCtor() + inline void SendMsg::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - message_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.message_){}, decltype(_impl_.player_id_){int64_t{0}}, decltype(_impl_.to_player_id_){int64_t{0}}, /*decltype(_impl_._cached_size_)*/ {}}; + _impl_.message_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - message_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + _impl_.message_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&player_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&to_player_id_) - reinterpret_cast(&player_id_)) + sizeof(to_player_id_)); } SendMsg::~SendMsg() { // @@protoc_insertion_point(destructor:protobuf.SendMsg) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void SendMsg::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); - message_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + _impl_.message_.Destroy(); } - void SendMsg::ArenaDtor(void* object) - { - SendMsg* _this = reinterpret_cast(object); - (void)_this; - } - void SendMsg::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void SendMsg::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void SendMsg::Clear() @@ -1266,12 +1251,12 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - message_.ClearToEmpty(); - ::memset(&player_id_, 0, static_cast(reinterpret_cast(&to_player_id_) - reinterpret_cast(&player_id_)) + sizeof(to_player_id_)); + _impl_.message_.ClearToEmpty(); + ::memset(&_impl_.player_id_, 0, static_cast(reinterpret_cast(&_impl_.to_player_id_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.to_player_id_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* SendMsg::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* SendMsg::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -1279,14 +1264,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // int64 player_id = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -1296,7 +1281,7 @@ namespace protobuf case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { - to_player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.to_player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -1307,9 +1292,9 @@ namespace protobuf if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { auto str = _internal_mutable_message(); - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); - CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "protobuf.SendMsg.message")); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); + CHK_(::_pbi::VerifyUTF8(str, "protobuf.SendMsg.message")); } else goto handle_unusual; @@ -1352,14 +1337,14 @@ namespace protobuf if (this->_internal_player_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); } // int64 to_player_id = 2; if (this->_internal_to_player_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(2, this->_internal_to_player_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(2, this->_internal_to_player_id(), target); } // string message = 3; @@ -1375,7 +1360,7 @@ namespace protobuf if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -1404,53 +1389,48 @@ namespace protobuf // int64 player_id = 1; if (this->_internal_player_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); } // int64 to_player_id = 2; if (this->_internal_to_player_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_to_player_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_to_player_id()); } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData SendMsg::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, SendMsg::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* SendMsg::GetClassData() const { return &_class_data_; } - void SendMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void SendMsg::MergeFrom(const SendMsg& from) + void SendMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.SendMsg) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (!from._internal_message().empty()) { - _internal_set_message(from._internal_message()); + _this->_internal_set_message(from._internal_message()); } if (from._internal_player_id() != 0) { - _internal_set_player_id(from._internal_player_id()); + _this->_internal_set_player_id(from._internal_player_id()); } if (from._internal_to_player_id() != 0) { - _internal_set_to_player_id(from._internal_to_player_id()); + _this->_internal_set_to_player_id(from._internal_to_player_id()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void SendMsg::CopyFrom(const SendMsg& from) @@ -1474,22 +1454,18 @@ namespace protobuf auto* rhs_arena = other->GetArenaForAllocation(); _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - &message_, - lhs_arena, - &other->message_, - rhs_arena + &_impl_.message_, lhs_arena, &other->_impl_.message_, rhs_arena ); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(SendMsg, to_player_id_) + sizeof(SendMsg::to_player_id_) - PROTOBUF_FIELD_OFFSET(SendMsg, player_id_)>( - reinterpret_cast(&player_id_), - reinterpret_cast(&other->player_id_) + PROTOBUF_FIELD_OFFSET(SendMsg, _impl_.to_player_id_) + sizeof(SendMsg::_impl_.to_player_id_) - PROTOBUF_FIELD_OFFSET(SendMsg, _impl_.player_id_)>( + reinterpret_cast(&_impl_.player_id_), + reinterpret_cast(&other->_impl_.player_id_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata SendMsg::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Server_2eproto_getter, &descriptor_table_Message2Server_2eproto_once, file_level_metadata_Message2Server_2eproto[3] ); } @@ -1504,33 +1480,41 @@ namespace protobuf AttackMsg::AttackMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.AttackMsg) } AttackMsg::AttackMsg(const AttackMsg& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + AttackMsg* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){}, decltype(_impl_.angle_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&player_id_, &from.player_id_, static_cast(reinterpret_cast(&angle_) - reinterpret_cast(&player_id_)) + sizeof(angle_)); + ::memcpy(&_impl_.player_id_, &from._impl_.player_id_, static_cast(reinterpret_cast(&_impl_.angle_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.angle_)); // @@protoc_insertion_point(copy_constructor:protobuf.AttackMsg) } - inline void AttackMsg::SharedCtor() + inline void AttackMsg::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - ::memset(reinterpret_cast(this) + static_cast(reinterpret_cast(&player_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&angle_) - reinterpret_cast(&player_id_)) + sizeof(angle_)); + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){int64_t{0}}, decltype(_impl_.angle_){0}, /*decltype(_impl_._cached_size_)*/ {}}; } AttackMsg::~AttackMsg() { // @@protoc_insertion_point(destructor:protobuf.AttackMsg) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void AttackMsg::SharedDtor() @@ -1538,17 +1522,9 @@ namespace protobuf GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); } - void AttackMsg::ArenaDtor(void* object) - { - AttackMsg* _this = reinterpret_cast(object); - (void)_this; - } - void AttackMsg::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void AttackMsg::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void AttackMsg::Clear() @@ -1558,11 +1534,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - ::memset(&player_id_, 0, static_cast(reinterpret_cast(&angle_) - reinterpret_cast(&player_id_)) + sizeof(angle_)); + ::memset(&_impl_.player_id_, 0, static_cast(reinterpret_cast(&_impl_.angle_) - reinterpret_cast(&_impl_.player_id_)) + sizeof(_impl_.angle_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* AttackMsg::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* AttackMsg::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -1570,14 +1546,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // int64 player_id = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -1587,7 +1563,7 @@ namespace protobuf case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 17)) { - angle_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + _impl_.angle_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); ptr += sizeof(double); } else @@ -1631,7 +1607,7 @@ namespace protobuf if (this->_internal_player_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); } // double angle = 2; @@ -1642,12 +1618,12 @@ namespace protobuf if (raw_angle != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteDoubleToArray(2, this->_internal_angle(), target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(2, this->_internal_angle(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -1667,7 +1643,7 @@ namespace protobuf // int64 player_id = 1; if (this->_internal_player_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); } // double angle = 2; @@ -1680,34 +1656,29 @@ namespace protobuf total_size += 1 + 8; } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData AttackMsg::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, AttackMsg::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* AttackMsg::GetClassData() const { return &_class_data_; } - void AttackMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void AttackMsg::MergeFrom(const AttackMsg& from) + void AttackMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.AttackMsg) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (from._internal_player_id() != 0) { - _internal_set_player_id(from._internal_player_id()); + _this->_internal_set_player_id(from._internal_player_id()); } static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); double tmp_angle = from._internal_angle(); @@ -1715,9 +1686,9 @@ namespace protobuf memcpy(&raw_angle, &tmp_angle, sizeof(tmp_angle)); if (raw_angle != 0) { - _internal_set_angle(from._internal_angle()); + _this->_internal_set_angle(from._internal_angle()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void AttackMsg::CopyFrom(const AttackMsg& from) @@ -1739,15 +1710,15 @@ namespace protobuf using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(AttackMsg, angle_) + sizeof(AttackMsg::angle_) - PROTOBUF_FIELD_OFFSET(AttackMsg, player_id_)>( - reinterpret_cast(&player_id_), - reinterpret_cast(&other->player_id_) + PROTOBUF_FIELD_OFFSET(AttackMsg, _impl_.angle_) + sizeof(AttackMsg::_impl_.angle_) - PROTOBUF_FIELD_OFFSET(AttackMsg, _impl_.player_id_)>( + reinterpret_cast(&_impl_.player_id_), + reinterpret_cast(&other->_impl_.player_id_) ); } ::PROTOBUF_NAMESPACE_ID::Metadata AttackMsg::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Server_2eproto_getter, &descriptor_table_Message2Server_2eproto_once, file_level_metadata_Message2Server_2eproto[4] ); } @@ -1762,33 +1733,41 @@ namespace protobuf IDMsg::IDMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(); - if (!is_message_owned) - { - RegisterArenaDtor(arena); - } + SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:protobuf.IDMsg) } IDMsg::IDMsg(const IDMsg& from) : ::PROTOBUF_NAMESPACE_ID::Message() { + IDMsg* const _this = this; + (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){}, /*decltype(_impl_._cached_size_)*/ {}}; + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - player_id_ = from.player_id_; + _this->_impl_.player_id_ = from._impl_.player_id_; // @@protoc_insertion_point(copy_constructor:protobuf.IDMsg) } - inline void IDMsg::SharedCtor() + inline void IDMsg::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned + ) { - player_id_ = int64_t{0}; + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.player_id_){int64_t{0}}, /*decltype(_impl_._cached_size_)*/ {}}; } IDMsg::~IDMsg() { // @@protoc_insertion_point(destructor:protobuf.IDMsg) - if (GetArenaForAllocation() != nullptr) + if (auto* arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) + { + (void)arena; return; + } SharedDtor(); - _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } inline void IDMsg::SharedDtor() @@ -1796,17 +1775,9 @@ namespace protobuf GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); } - void IDMsg::ArenaDtor(void* object) - { - IDMsg* _this = reinterpret_cast(object); - (void)_this; - } - void IDMsg::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) - { - } void IDMsg::SetCachedSize(int size) const { - _cached_size_.Set(size); + _impl_._cached_size_.Set(size); } void IDMsg::Clear() @@ -1816,11 +1787,11 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - player_id_ = int64_t{0}; + _impl_.player_id_ = int64_t{0}; _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } - const char* IDMsg::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) + const char* IDMsg::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { #define CHK_(x) \ if (PROTOBUF_PREDICT_FALSE(!(x))) \ @@ -1828,14 +1799,14 @@ namespace protobuf while (!ctx->Done(&ptr)) { uint32_t tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { // int64 player_id = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.player_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else @@ -1879,12 +1850,12 @@ namespace protobuf if (this->_internal_player_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); + target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_player_id(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream ); } @@ -1904,39 +1875,34 @@ namespace protobuf // int64 player_id = 1; if (this->_internal_player_id() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); + total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); } - return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } const ::PROTOBUF_NAMESPACE_ID::Message::ClassData IDMsg::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSizeCheck, + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, IDMsg::MergeImpl}; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* IDMsg::GetClassData() const { return &_class_data_; } - void IDMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from) - { - static_cast(to)->MergeFrom( - static_cast(from) - ); - } - - void IDMsg::MergeFrom(const IDMsg& from) + void IDMsg::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:protobuf.IDMsg) - GOOGLE_DCHECK_NE(&from, this); + GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void)cached_has_bits; if (from._internal_player_id() != 0) { - _internal_set_player_id(from._internal_player_id()); + _this->_internal_set_player_id(from._internal_player_id()); } - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void IDMsg::CopyFrom(const IDMsg& from) @@ -1957,12 +1923,12 @@ namespace protobuf { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - swap(player_id_, other->player_id_); + swap(_impl_.player_id_, other->_impl_.player_id_); } ::PROTOBUF_NAMESPACE_ID::Metadata IDMsg::GetMetadata() const { - return ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors( + return ::_pbi::AssignDescriptors( &descriptor_table_Message2Server_2eproto_getter, &descriptor_table_Message2Server_2eproto_once, file_level_metadata_Message2Server_2eproto[5] ); } @@ -1971,32 +1937,38 @@ namespace protobuf } // namespace protobuf PROTOBUF_NAMESPACE_OPEN template<> -PROTOBUF_NOINLINE ::protobuf::PlayerMsg* Arena::CreateMaybeMessage<::protobuf::PlayerMsg>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::PlayerMsg* + Arena::CreateMaybeMessage<::protobuf::PlayerMsg>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::PlayerMsg>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::MoveMsg* Arena::CreateMaybeMessage<::protobuf::MoveMsg>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::MoveMsg* + Arena::CreateMaybeMessage<::protobuf::MoveMsg>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::MoveMsg>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::PickMsg* Arena::CreateMaybeMessage<::protobuf::PickMsg>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::PickMsg* + Arena::CreateMaybeMessage<::protobuf::PickMsg>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::PickMsg>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::SendMsg* Arena::CreateMaybeMessage<::protobuf::SendMsg>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::SendMsg* + Arena::CreateMaybeMessage<::protobuf::SendMsg>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::SendMsg>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::AttackMsg* Arena::CreateMaybeMessage<::protobuf::AttackMsg>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::AttackMsg* + Arena::CreateMaybeMessage<::protobuf::AttackMsg>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::AttackMsg>(arena); } template<> -PROTOBUF_NOINLINE ::protobuf::IDMsg* Arena::CreateMaybeMessage<::protobuf::IDMsg>(Arena* arena) +PROTOBUF_NOINLINE ::protobuf::IDMsg* + Arena::CreateMaybeMessage<::protobuf::IDMsg>(Arena* arena) { return Arena::CreateMessageInternal<::protobuf::IDMsg>(arena); } diff --git a/CAPI/proto/Message2Server.pb.h b/CAPI/proto/Message2Server.pb.h index 33caf27..5fc361c 100644 --- a/CAPI/proto/Message2Server.pb.h +++ b/CAPI/proto/Message2Server.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3019000 +#if PROTOBUF_VERSION < 3021000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019004 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021005 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -45,11 +44,6 @@ PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct TableStruct_Message2Server_2eproto { - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::AuxiliaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[6] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; - static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; static const uint32_t offsets[]; }; extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Message2Server_2eproto; @@ -102,7 +96,7 @@ namespace protobuf { } ~PlayerMsg() override; - explicit constexpr PlayerMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR PlayerMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); PlayerMsg(const PlayerMsg& from); PlayerMsg(PlayerMsg&& from) noexcept @@ -208,10 +202,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const PlayerMsg& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const PlayerMsg& from); + void MergeFrom(const PlayerMsg& from) + { + PlayerMsg::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -224,11 +221,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(PlayerMsg* other); @@ -243,10 +240,6 @@ namespace protobuf protected: explicit PlayerMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -332,21 +325,27 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - int64_t player_id_; - int player_type_; - union JobTypeUnion + struct Impl_ { - constexpr JobTypeUnion() : - _constinit_{} + int64_t player_id_; + int player_type_; + union JobTypeUnion { - } - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_; - int human_type_; - int butcher_type_; - } job_type_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - uint32_t _oneof_case_[1]; - + constexpr JobTypeUnion() : + _constinit_{} + { + } + ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_; + int human_type_; + int butcher_type_; + } job_type_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + uint32_t _oneof_case_[1]; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Server_2eproto; }; // ------------------------------------------------------------------- @@ -360,7 +359,7 @@ namespace protobuf { } ~MoveMsg() override; - explicit constexpr MoveMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MoveMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); MoveMsg(const MoveMsg& from); MoveMsg(MoveMsg&& from) noexcept @@ -459,10 +458,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const MoveMsg& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const MoveMsg& from); + void MergeFrom(const MoveMsg& from) + { + MoveMsg::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -475,11 +477,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MoveMsg* other); @@ -494,10 +496,6 @@ namespace protobuf protected: explicit MoveMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -553,10 +551,17 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - int64_t player_id_; - double angle_; - int64_t time_in_milliseconds_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + int64_t player_id_; + double angle_; + int64_t time_in_milliseconds_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Server_2eproto; }; // ------------------------------------------------------------------- @@ -570,7 +575,7 @@ namespace protobuf { } ~PickMsg() override; - explicit constexpr PickMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR PickMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); PickMsg(const PickMsg& from); PickMsg(PickMsg&& from) noexcept @@ -669,10 +674,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const PickMsg& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const PickMsg& from); + void MergeFrom(const PickMsg& from) + { + PickMsg::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -685,11 +693,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(PickMsg* other); @@ -704,10 +712,6 @@ namespace protobuf protected: explicit PickMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -752,9 +756,16 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - int64_t player_id_; - int prop_type_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + int64_t player_id_; + int prop_type_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Server_2eproto; }; // ------------------------------------------------------------------- @@ -768,7 +779,7 @@ namespace protobuf { } ~SendMsg() override; - explicit constexpr SendMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR SendMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); SendMsg(const SendMsg& from); SendMsg(SendMsg&& from) noexcept @@ -867,10 +878,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const SendMsg& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const SendMsg& from); + void MergeFrom(const SendMsg& from) + { + SendMsg::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -883,11 +897,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SendMsg* other); @@ -902,10 +916,6 @@ namespace protobuf protected: explicit SendMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -966,10 +976,17 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr message_; - int64_t player_id_; - int64_t to_player_id_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr message_; + int64_t player_id_; + int64_t to_player_id_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Server_2eproto; }; // ------------------------------------------------------------------- @@ -983,7 +1000,7 @@ namespace protobuf { } ~AttackMsg() override; - explicit constexpr AttackMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR AttackMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); AttackMsg(const AttackMsg& from); AttackMsg(AttackMsg&& from) noexcept @@ -1082,10 +1099,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const AttackMsg& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const AttackMsg& from); + void MergeFrom(const AttackMsg& from) + { + AttackMsg::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -1098,11 +1118,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(AttackMsg* other); @@ -1117,10 +1137,6 @@ namespace protobuf protected: explicit AttackMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -1165,9 +1181,16 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - int64_t player_id_; - double angle_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + int64_t player_id_; + double angle_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Server_2eproto; }; // ------------------------------------------------------------------- @@ -1181,7 +1204,7 @@ namespace protobuf { } ~IDMsg() override; - explicit constexpr IDMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR IDMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); IDMsg(const IDMsg& from); IDMsg(IDMsg&& from) noexcept @@ -1280,10 +1303,13 @@ namespace protobuf using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const IDMsg& from); using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom(const IDMsg& from); + void MergeFrom(const IDMsg& from) + { + IDMsg::MergeImpl(*this, from); + } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from); + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; @@ -1296,11 +1322,11 @@ namespace protobuf ) const final; int GetCachedSize() const final { - return _cached_size_.Get(); + return _impl_._cached_size_.Get(); } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(IDMsg* other); @@ -1315,10 +1341,6 @@ namespace protobuf protected: explicit IDMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned = false); - private: - static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); - public: static const ClassData _class_data_; const ::PROTOBUF_NAMESPACE_ID::Message::ClassData* GetClassData() const final; @@ -1352,8 +1374,15 @@ namespace protobuf friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - int64_t player_id_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + struct Impl_ + { + int64_t player_id_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union + { + Impl_ _impl_; + }; friend struct ::TableStruct_Message2Server_2eproto; }; // =================================================================== @@ -1369,11 +1398,11 @@ namespace protobuf // int64 player_id = 1; inline void PlayerMsg::clear_player_id() { - player_id_ = int64_t{0}; + _impl_.player_id_ = int64_t{0}; } inline int64_t PlayerMsg::_internal_player_id() const { - return player_id_; + return _impl_.player_id_; } inline int64_t PlayerMsg::player_id() const { @@ -1382,7 +1411,7 @@ namespace protobuf } inline void PlayerMsg::_internal_set_player_id(int64_t value) { - player_id_ = value; + _impl_.player_id_ = value; } inline void PlayerMsg::set_player_id(int64_t value) { @@ -1393,11 +1422,11 @@ namespace protobuf // .protobuf.PlayerType player_type = 2; inline void PlayerMsg::clear_player_type() { - player_type_ = 0; + _impl_.player_type_ = 0; } inline ::protobuf::PlayerType PlayerMsg::_internal_player_type() const { - return static_cast<::protobuf::PlayerType>(player_type_); + return static_cast<::protobuf::PlayerType>(_impl_.player_type_); } inline ::protobuf::PlayerType PlayerMsg::player_type() const { @@ -1406,7 +1435,7 @@ namespace protobuf } inline void PlayerMsg::_internal_set_player_type(::protobuf::PlayerType value) { - player_type_ = value; + _impl_.player_type_ = value; } inline void PlayerMsg::set_player_type(::protobuf::PlayerType value) { @@ -1425,13 +1454,13 @@ namespace protobuf } inline void PlayerMsg::set_has_human_type() { - _oneof_case_[0] = kHumanType; + _impl_._oneof_case_[0] = kHumanType; } inline void PlayerMsg::clear_human_type() { if (_internal_has_human_type()) { - job_type_.human_type_ = 0; + _impl_.job_type_.human_type_ = 0; clear_has_job_type(); } } @@ -1439,7 +1468,7 @@ namespace protobuf { if (_internal_has_human_type()) { - return static_cast<::protobuf::HumanType>(job_type_.human_type_); + return static_cast<::protobuf::HumanType>(_impl_.job_type_.human_type_); } return static_cast<::protobuf::HumanType>(0); } @@ -1455,7 +1484,7 @@ namespace protobuf clear_job_type(); set_has_human_type(); } - job_type_.human_type_ = value; + _impl_.job_type_.human_type_ = value; } inline void PlayerMsg::set_human_type(::protobuf::HumanType value) { @@ -1474,13 +1503,13 @@ namespace protobuf } inline void PlayerMsg::set_has_butcher_type() { - _oneof_case_[0] = kButcherType; + _impl_._oneof_case_[0] = kButcherType; } inline void PlayerMsg::clear_butcher_type() { if (_internal_has_butcher_type()) { - job_type_.butcher_type_ = 0; + _impl_.job_type_.butcher_type_ = 0; clear_has_job_type(); } } @@ -1488,7 +1517,7 @@ namespace protobuf { if (_internal_has_butcher_type()) { - return static_cast<::protobuf::ButcherType>(job_type_.butcher_type_); + return static_cast<::protobuf::ButcherType>(_impl_.job_type_.butcher_type_); } return static_cast<::protobuf::ButcherType>(0); } @@ -1504,7 +1533,7 @@ namespace protobuf clear_job_type(); set_has_butcher_type(); } - job_type_.butcher_type_ = value; + _impl_.job_type_.butcher_type_ = value; } inline void PlayerMsg::set_butcher_type(::protobuf::ButcherType value) { @@ -1518,11 +1547,11 @@ namespace protobuf } inline void PlayerMsg::clear_has_job_type() { - _oneof_case_[0] = JOB_TYPE_NOT_SET; + _impl_._oneof_case_[0] = JOB_TYPE_NOT_SET; } inline PlayerMsg::JobTypeCase PlayerMsg::job_type_case() const { - return PlayerMsg::JobTypeCase(_oneof_case_[0]); + return PlayerMsg::JobTypeCase(_impl_._oneof_case_[0]); } // ------------------------------------------------------------------- @@ -1531,11 +1560,11 @@ namespace protobuf // int64 player_id = 1; inline void MoveMsg::clear_player_id() { - player_id_ = int64_t{0}; + _impl_.player_id_ = int64_t{0}; } inline int64_t MoveMsg::_internal_player_id() const { - return player_id_; + return _impl_.player_id_; } inline int64_t MoveMsg::player_id() const { @@ -1544,7 +1573,7 @@ namespace protobuf } inline void MoveMsg::_internal_set_player_id(int64_t value) { - player_id_ = value; + _impl_.player_id_ = value; } inline void MoveMsg::set_player_id(int64_t value) { @@ -1555,11 +1584,11 @@ namespace protobuf // double angle = 2; inline void MoveMsg::clear_angle() { - angle_ = 0; + _impl_.angle_ = 0; } inline double MoveMsg::_internal_angle() const { - return angle_; + return _impl_.angle_; } inline double MoveMsg::angle() const { @@ -1568,7 +1597,7 @@ namespace protobuf } inline void MoveMsg::_internal_set_angle(double value) { - angle_ = value; + _impl_.angle_ = value; } inline void MoveMsg::set_angle(double value) { @@ -1579,11 +1608,11 @@ namespace protobuf // int64 time_in_milliseconds = 3; inline void MoveMsg::clear_time_in_milliseconds() { - time_in_milliseconds_ = int64_t{0}; + _impl_.time_in_milliseconds_ = int64_t{0}; } inline int64_t MoveMsg::_internal_time_in_milliseconds() const { - return time_in_milliseconds_; + return _impl_.time_in_milliseconds_; } inline int64_t MoveMsg::time_in_milliseconds() const { @@ -1592,7 +1621,7 @@ namespace protobuf } inline void MoveMsg::_internal_set_time_in_milliseconds(int64_t value) { - time_in_milliseconds_ = value; + _impl_.time_in_milliseconds_ = value; } inline void MoveMsg::set_time_in_milliseconds(int64_t value) { @@ -1607,11 +1636,11 @@ namespace protobuf // int64 player_id = 1; inline void PickMsg::clear_player_id() { - player_id_ = int64_t{0}; + _impl_.player_id_ = int64_t{0}; } inline int64_t PickMsg::_internal_player_id() const { - return player_id_; + return _impl_.player_id_; } inline int64_t PickMsg::player_id() const { @@ -1620,7 +1649,7 @@ namespace protobuf } inline void PickMsg::_internal_set_player_id(int64_t value) { - player_id_ = value; + _impl_.player_id_ = value; } inline void PickMsg::set_player_id(int64_t value) { @@ -1631,11 +1660,11 @@ namespace protobuf // .protobuf.PropType prop_type = 2; inline void PickMsg::clear_prop_type() { - prop_type_ = 0; + _impl_.prop_type_ = 0; } inline ::protobuf::PropType PickMsg::_internal_prop_type() const { - return static_cast<::protobuf::PropType>(prop_type_); + return static_cast<::protobuf::PropType>(_impl_.prop_type_); } inline ::protobuf::PropType PickMsg::prop_type() const { @@ -1644,7 +1673,7 @@ namespace protobuf } inline void PickMsg::_internal_set_prop_type(::protobuf::PropType value) { - prop_type_ = value; + _impl_.prop_type_ = value; } inline void PickMsg::set_prop_type(::protobuf::PropType value) { @@ -1659,11 +1688,11 @@ namespace protobuf // int64 player_id = 1; inline void SendMsg::clear_player_id() { - player_id_ = int64_t{0}; + _impl_.player_id_ = int64_t{0}; } inline int64_t SendMsg::_internal_player_id() const { - return player_id_; + return _impl_.player_id_; } inline int64_t SendMsg::player_id() const { @@ -1672,7 +1701,7 @@ namespace protobuf } inline void SendMsg::_internal_set_player_id(int64_t value) { - player_id_ = value; + _impl_.player_id_ = value; } inline void SendMsg::set_player_id(int64_t value) { @@ -1683,11 +1712,11 @@ namespace protobuf // int64 to_player_id = 2; inline void SendMsg::clear_to_player_id() { - to_player_id_ = int64_t{0}; + _impl_.to_player_id_ = int64_t{0}; } inline int64_t SendMsg::_internal_to_player_id() const { - return to_player_id_; + return _impl_.to_player_id_; } inline int64_t SendMsg::to_player_id() const { @@ -1696,7 +1725,7 @@ namespace protobuf } inline void SendMsg::_internal_set_to_player_id(int64_t value) { - to_player_id_ = value; + _impl_.to_player_id_ = value; } inline void SendMsg::set_to_player_id(int64_t value) { @@ -1707,7 +1736,7 @@ namespace protobuf // string message = 3; inline void SendMsg::clear_message() { - message_.ClearToEmpty(); + _impl_.message_.ClearToEmpty(); } inline const std::string& SendMsg::message() const { @@ -1717,7 +1746,7 @@ namespace protobuf template inline PROTOBUF_ALWAYS_INLINE void SendMsg::set_message(ArgT0&& arg0, ArgT... args) { - message_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast(arg0), args..., GetArenaForAllocation()); + _impl_.message_.Set(static_cast(arg0), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:protobuf.SendMsg.message) } inline std::string* SendMsg::mutable_message() @@ -1728,20 +1757,20 @@ namespace protobuf } inline const std::string& SendMsg::_internal_message() const { - return message_.Get(); + return _impl_.message_.Get(); } inline void SendMsg::_internal_set_message(const std::string& value) { - message_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation()); + _impl_.message_.Set(value, GetArenaForAllocation()); } inline std::string* SendMsg::_internal_mutable_message() { - return message_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation()); + return _impl_.message_.Mutable(GetArenaForAllocation()); } inline std::string* SendMsg::release_message() { // @@protoc_insertion_point(field_release:protobuf.SendMsg.message) - return message_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); + return _impl_.message_.Release(); } inline void SendMsg::set_allocated_message(std::string* message) { @@ -1751,11 +1780,11 @@ namespace protobuf else { } - message_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), message, GetArenaForAllocation()); + _impl_.message_.SetAllocated(message, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (message_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) + if (_impl_.message_.IsDefault()) { - message_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); + _impl_.message_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:protobuf.SendMsg.message) @@ -1768,11 +1797,11 @@ namespace protobuf // int64 player_id = 1; inline void AttackMsg::clear_player_id() { - player_id_ = int64_t{0}; + _impl_.player_id_ = int64_t{0}; } inline int64_t AttackMsg::_internal_player_id() const { - return player_id_; + return _impl_.player_id_; } inline int64_t AttackMsg::player_id() const { @@ -1781,7 +1810,7 @@ namespace protobuf } inline void AttackMsg::_internal_set_player_id(int64_t value) { - player_id_ = value; + _impl_.player_id_ = value; } inline void AttackMsg::set_player_id(int64_t value) { @@ -1792,11 +1821,11 @@ namespace protobuf // double angle = 2; inline void AttackMsg::clear_angle() { - angle_ = 0; + _impl_.angle_ = 0; } inline double AttackMsg::_internal_angle() const { - return angle_; + return _impl_.angle_; } inline double AttackMsg::angle() const { @@ -1805,7 +1834,7 @@ namespace protobuf } inline void AttackMsg::_internal_set_angle(double value) { - angle_ = value; + _impl_.angle_ = value; } inline void AttackMsg::set_angle(double value) { @@ -1820,11 +1849,11 @@ namespace protobuf // int64 player_id = 1; inline void IDMsg::clear_player_id() { - player_id_ = int64_t{0}; + _impl_.player_id_ = int64_t{0}; } inline int64_t IDMsg::_internal_player_id() const { - return player_id_; + return _impl_.player_id_; } inline int64_t IDMsg::player_id() const { @@ -1833,7 +1862,7 @@ namespace protobuf } inline void IDMsg::_internal_set_player_id(int64_t value) { - player_id_ = value; + _impl_.player_id_ = value; } inline void IDMsg::set_player_id(int64_t value) { diff --git a/CAPI/proto/MessageType.grpc.pb.cc b/CAPI/proto/MessageType.grpc.pb.cc deleted file mode 100644 index fe0ba6f..0000000 --- a/CAPI/proto/MessageType.grpc.pb.cc +++ /dev/null @@ -1,25 +0,0 @@ -// Generated by the gRPC C++ plugin. -// If you make any local change, they will be lost. -// source: MessageType.proto - -#include "MessageType.pb.h" -#include "MessageType.grpc.pb.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -namespace protobuf -{ - -} // namespace protobuf diff --git a/CAPI/proto/MessageType.grpc.pb.h b/CAPI/proto/MessageType.grpc.pb.h deleted file mode 100644 index 587ae62..0000000 --- a/CAPI/proto/MessageType.grpc.pb.h +++ /dev/null @@ -1,35 +0,0 @@ -// Generated by the gRPC C++ plugin. -// If you make any local change, they will be lost. -// source: MessageType.proto -// Original file comments: -// MessageType -#ifndef GRPC_MessageType_2eproto__INCLUDED -#define GRPC_MessageType_2eproto__INCLUDED - -#include "MessageType.pb.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace protobuf -{ - -} // namespace protobuf - -#endif // GRPC_MessageType_2eproto__INCLUDED diff --git a/CAPI/proto/MessageType.pb.cc b/CAPI/proto/MessageType.pb.cc index 4f47a0e..4386d9d 100644 --- a/CAPI/proto/MessageType.pb.cc +++ b/CAPI/proto/MessageType.pb.cc @@ -16,14 +16,18 @@ #include PROTOBUF_PRAGMA_INIT_SEG + +namespace _pb = ::PROTOBUF_NAMESPACE_ID; +namespace _pbi = _pb::internal; + namespace protobuf { } // namespace protobuf -static const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* file_level_enum_descriptors_MessageType_2eproto[8]; -static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_MessageType_2eproto = nullptr; +static const ::_pb::EnumDescriptor* file_level_enum_descriptors_MessageType_2eproto[8]; +static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_MessageType_2eproto = nullptr; const uint32_t TableStruct_MessageType_2eproto::offsets[1] = {}; -static constexpr ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema* schemas = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::Message* const* file_default_instances = nullptr; +static constexpr ::_pbi::MigrationSchema* schemas = nullptr; +static constexpr ::_pb::Message* const* file_default_instances = nullptr; const char descriptor_table_protodef_MessageType_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\021MessageType.proto\022\010protobuf*g\n\tPlaceTy" @@ -46,8 +50,8 @@ const char descriptor_table_protodef_MessageType_2eproto[] PROTOBUF_SECTION_VARI "R_TYPE\020\000\022\020\n\014BUTCHERTYPE1\020\001\022\020\n\014BUTCHERTYP" "E2\020\002\022\020\n\014BUTCHERTYPE3\020\003\022\020\n\014BUTCHERTYPE4\020\004" "b\006proto3"; -static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_MessageType_2eproto_once; -const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_MessageType_2eproto = { +static ::_pbi::once_flag descriptor_table_MessageType_2eproto_once; +const ::_pbi::DescriptorTable descriptor_table_MessageType_2eproto = { false, false, 768, @@ -64,13 +68,13 @@ const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Messag file_level_enum_descriptors_MessageType_2eproto, file_level_service_descriptors_MessageType_2eproto, }; -PROTOBUF_ATTRIBUTE_WEAK const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable* descriptor_table_MessageType_2eproto_getter() +PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_MessageType_2eproto_getter() { return &descriptor_table_MessageType_2eproto; } // Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY static ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptorsRunner dynamic_init_dummy_MessageType_2eproto(&descriptor_table_MessageType_2eproto); +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_MessageType_2eproto(&descriptor_table_MessageType_2eproto); namespace protobuf { const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* PlaceType_descriptor() diff --git a/CAPI/proto/MessageType.pb.h b/CAPI/proto/MessageType.pb.h index a2c218d..3f01977 100644 --- a/CAPI/proto/MessageType.pb.h +++ b/CAPI/proto/MessageType.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3019000 +#if PROTOBUF_VERSION < 3021000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019004 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021005 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -43,11 +42,6 @@ PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct TableStruct_MessageType_2eproto { - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::AuxiliaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; - static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; static const uint32_t offsets[]; }; extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_MessageType_2eproto; diff --git a/CAPI/proto/Services.pb.cc b/CAPI/proto/Services.pb.cc index fe2f72b..03c1df6 100644 --- a/CAPI/proto/Services.pb.cc +++ b/CAPI/proto/Services.pb.cc @@ -16,14 +16,18 @@ #include PROTOBUF_PRAGMA_INIT_SEG + +namespace _pb = ::PROTOBUF_NAMESPACE_ID; +namespace _pbi = _pb::internal; + namespace protobuf { } // namespace protobuf -static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_Services_2eproto = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_Services_2eproto = nullptr; +static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_Services_2eproto = nullptr; +static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_Services_2eproto = nullptr; const uint32_t TableStruct_Services_2eproto::offsets[1] = {}; -static constexpr ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema* schemas = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::Message* const* file_default_instances = nullptr; +static constexpr ::_pbi::MigrationSchema* schemas = nullptr; +static constexpr ::_pb::Message* const* file_default_instances = nullptr; const char descriptor_table_protodef_Services_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\016Services.proto\022\010protobuf\032\025Message2Clie" @@ -49,12 +53,12 @@ const char descriptor_table_protodef_Services_2eproto[] PROTOBUF_SECTION_VARIABL "buf.BoolRes\022/\n\tHangHuman\022\017.protobuf.IDMs" "g\032\021.protobuf.BoolRes\022,\n\006Escape\022\017.protobu" "f.IDMsg\032\021.protobuf.BoolResb\006proto3"; -static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable* const descriptor_table_Services_2eproto_deps[2] = { +static const ::_pbi::DescriptorTable* const descriptor_table_Services_2eproto_deps[2] = { &::descriptor_table_Message2Clients_2eproto, &::descriptor_table_Message2Server_2eproto, }; -static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_Services_2eproto_once; -const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Services_2eproto = { +static ::_pbi::once_flag descriptor_table_Services_2eproto_once; +const ::_pbi::DescriptorTable descriptor_table_Services_2eproto = { false, false, 914, @@ -71,13 +75,13 @@ const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Servic file_level_enum_descriptors_Services_2eproto, file_level_service_descriptors_Services_2eproto, }; -PROTOBUF_ATTRIBUTE_WEAK const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable* descriptor_table_Services_2eproto_getter() +PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_Services_2eproto_getter() { return &descriptor_table_Services_2eproto; } // Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY static ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptorsRunner dynamic_init_dummy_Services_2eproto(&descriptor_table_Services_2eproto); +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_Services_2eproto(&descriptor_table_Services_2eproto); namespace protobuf { diff --git a/CAPI/proto/Services.pb.h b/CAPI/proto/Services.pb.h index 7c26b0a..10d177e 100644 --- a/CAPI/proto/Services.pb.h +++ b/CAPI/proto/Services.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3019000 +#if PROTOBUF_VERSION < 3021000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019004 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021005 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -44,11 +43,6 @@ PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct TableStruct_Services_2eproto { - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::AuxiliaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; - static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; static const uint32_t offsets[]; }; extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_Services_2eproto; diff --git a/dependency/proto/cpp_output.sh b/dependency/proto/cpp_output.sh index 2513bab..3fe65a9 100755 --- a/dependency/proto/cpp_output.sh +++ b/dependency/proto/cpp_output.sh @@ -1,8 +1,5 @@ -protoc Message2Clients.proto --grpc_out=. --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` protoc Message2Clients.proto --cpp_out=. -protoc MessageType.proto --grpc_out=. --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` protoc MessageType.proto --cpp_out=. -protoc Message2Server.proto --grpc_out=. --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` protoc Message2Server.proto --cpp_out=. protoc Services.proto --grpc_out=. --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` protoc Services.proto --cpp_out=.