From 8f163b5791cd570c5feb53732f31be1cd53127d2 Mon Sep 17 00:00:00 2001 From: Henry Winkel Date: Tue, 19 Dec 2023 14:29:13 +0100 Subject: [PATCH] ADD: added new created messages --- include/WHISPER/Messages/Protos/join.pb.cc | 34 +++-- include/WHISPER/Messages/Protos/join.pb.h | 114 ++++++++--------- include/WHISPER/Messages/Protos/leave.pb.cc | 34 +++-- include/WHISPER/Messages/Protos/leave.pb.h | 114 ++++++++--------- include/WHISPER/Messages/Protos/message.pb.cc | 66 +++++----- include/WHISPER/Messages/Protos/message.pb.h | 119 ++++++++---------- include/WHISPER/Messages/Protos/ping.pb.cc | 34 +++-- include/WHISPER/Messages/Protos/ping.pb.h | 111 ++++++++-------- include/WHISPER/Messages/Protos/pong.pb.cc | 34 +++-- include/WHISPER/Messages/Protos/pong.pb.h | 111 ++++++++-------- .../WHISPER/Messages/Protos/stringData.pb.cc | 32 +++-- .../WHISPER/Messages/Protos/stringData.pb.h | 113 ++++++++--------- libs/libzmq | 2 +- libs/protobuf | 2 +- 14 files changed, 439 insertions(+), 481 deletions(-) diff --git a/include/WHISPER/Messages/Protos/join.pb.cc b/include/WHISPER/Messages/Protos/join.pb.cc index de0a927..12cde58 100644 --- a/include/WHISPER/Messages/Protos/join.pb.cc +++ b/include/WHISPER/Messages/Protos/join.pb.cc @@ -1,5 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: join.proto +// Protobuf C++ Version: 4.26.0-dev #include "join.pb.h" @@ -112,9 +113,6 @@ const ::_pbi::DescriptorTable descriptor_table_join_2eproto = { PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_join_2eproto_getter() { return &descriptor_table_join_2eproto; } -// Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 -static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_join_2eproto(&descriptor_table_join_2eproto); namespace messages { namespace join { // =================================================================== @@ -170,12 +168,15 @@ inline void Join::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Join::GetClassData() const { - PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - _data_ = { - Join::MergeImpl, - nullptr, // OnDemandRegisterArenaDtor - &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite:: + ClassDataFull _data_ = { + { + nullptr, // OnDemandRegisterArenaDtor PROTOBUF_FIELD_OFFSET(Join, _impl_._cached_size_), + false, + }, + &Join::MergeImpl, + &Join::kDescriptorMethods, }; return &_data_; } @@ -212,6 +213,9 @@ const ::_pbi::TcParseTable<1, 2, 0, 37, 2> Join::_table_ = { offsetof(decltype(_table_), field_names), // no aux_entries &_Join_default_instance_._instance, ::_pbi::TcParser::GenericFallback, // fallback + #ifdef PROTOBUF_PREFETCH_PARSE_TABLE + ::_pbi::TcParser::GetTable<::messages::join::Join>(), // to_prefetch + #endif // PROTOBUF_PREFETCH_PARSE_TABLE }, {{ // string srcAddress = 2; {::_pbi::TcParser::FastUS1, @@ -292,7 +296,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 37, 2> Join::_table_ = { } -void Join::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { +void Join::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:messages.join.Join) @@ -304,7 +308,7 @@ void Join::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protob _this->_internal_set_srcaddress(from._internal_srcaddress()); } if (from._internal_port() != 0) { - _this->_internal_set_port(from._internal_port()); + _this->_impl_.port_ = from._impl_.port_; } _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } @@ -330,9 +334,9 @@ void Join::InternalSwap(Join* PROTOBUF_RESTRICT other) { } ::google::protobuf::Metadata Join::GetMetadata() const { - return ::_pbi::AssignDescriptors( - &descriptor_table_join_2eproto_getter, &descriptor_table_join_2eproto_once, - file_level_metadata_join_2eproto[0]); + return ::_pbi::AssignDescriptors(&descriptor_table_join_2eproto_getter, + &descriptor_table_join_2eproto_once, + file_level_metadata_join_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) } // namespace join @@ -342,4 +346,8 @@ namespace protobuf { } // namespace protobuf } // namespace google // @@protoc_insertion_point(global_scope) +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 +static ::std::false_type _static_init_ PROTOBUF_UNUSED = + (::_pbi::AddDescriptors(&descriptor_table_join_2eproto), + ::std::false_type{}); #include "google/protobuf/port_undef.inc" diff --git a/include/WHISPER/Messages/Protos/join.pb.h b/include/WHISPER/Messages/Protos/join.pb.h index 264485b..2a840ea 100644 --- a/include/WHISPER/Messages/Protos/join.pb.h +++ b/include/WHISPER/Messages/Protos/join.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: join.proto -// Protobuf C++ Version: 4.24.0-main +// Protobuf C++ Version: 4.26.0-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_join_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_join_2eproto_2epb_2eh @@ -11,17 +11,11 @@ #include #include "google/protobuf/port_def.inc" -#if PROTOBUF_VERSION < 4025000 -#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 // PROTOBUF_VERSION - -#if 4025000 < 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." -#endif // PROTOBUF_MIN_PROTOC_VERSION +#if PROTOBUF_VERSION != 4026000 +#error "Protobuf C++ gencode is built with an incompatible version of" +#error "Protobuf C++ headers/runtime. See" +#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" +#endif #include "google/protobuf/port_undef.inc" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" @@ -75,21 +69,18 @@ namespace join { // ------------------------------------------------------------------- -class Join final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.join.Join) */ { +class Join final : public ::google::protobuf::Message +/* @@protoc_insertion_point(class_definition:messages.join.Join) */ { public: inline Join() : Join(nullptr) {} ~Join() override; - template - explicit PROTOBUF_CONSTEXPR Join(::google::protobuf::internal::ConstantInitialized); - - inline Join(const Join& from) - : Join(nullptr, from) {} - Join(Join&& from) noexcept - : Join() { - *this = ::std::move(from); - } + template + explicit PROTOBUF_CONSTEXPR Join( + ::google::protobuf::internal::ConstantInitialized); + inline Join(const Join& from) : Join(nullptr, from) {} + inline Join(Join&& from) noexcept + : Join(nullptr, std::move(from)) {} inline Join& operator=(const Join& from) { CopyFrom(from); return *this; @@ -97,9 +88,9 @@ class Join final : inline Join& operator=(Join&& from) noexcept { if (this == &from) return *this; if (GetArena() == from.GetArena() - #ifdef PROTOBUF_FORCE_COPY_IN_MOVE +#ifdef PROTOBUF_FORCE_COPY_IN_MOVE && GetArena() != nullptr - #endif // !PROTOBUF_FORCE_COPY_IN_MOVE +#endif // !PROTOBUF_FORCE_COPY_IN_MOVE ) { InternalSwap(&from); } else { @@ -131,22 +122,17 @@ class Join final : } static inline const Join* internal_default_instance() { return reinterpret_cast( - &_Join_default_instance_); - } - static constexpr int kIndexInFileMessages = - 0; - - friend void swap(Join& a, Join& b) { - a.Swap(&b); + &_Join_default_instance_); } + static constexpr int kIndexInFileMessages = 0; + friend void swap(Join& a, Join& b) { a.Swap(&b); } inline void Swap(Join* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetArena() != nullptr && - GetArena() == other->GetArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP +#ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetArena() != nullptr && GetArena() == other->GetArena()) { +#else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetArena() == other->GetArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP +#endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::google::protobuf::internal::GenericSwap(this, other); @@ -161,16 +147,18 @@ class Join final : // implements Message ---------------------------------------------- Join* New(::google::protobuf::Arena* arena = nullptr) const final { - return CreateMaybeMessage(arena); + return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Join& from); using ::google::protobuf::Message::MergeFrom; - void MergeFrom( const Join& from) { - Join::MergeImpl(*this, from); - } + void MergeFrom(const Join& from) { Join::MergeImpl(*this, from); } + private: - static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); + static void MergeImpl( + ::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); + public: ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -178,31 +166,33 @@ class Join final : ::size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Join* other); - - private: + private: friend class ::google::protobuf::internal::AnyMetadata; - static ::absl::string_view FullMessageName() { - return "messages.join.Join"; - } - protected: + static ::absl::string_view FullMessageName() { return "messages.join.Join"; } + + protected: explicit Join(::google::protobuf::Arena* arena); Join(::google::protobuf::Arena* arena, const Join& from); - const ::google::protobuf::MessageLite::ClassData* GetClassData() const final; - public: + Join(::google::protobuf::Arena* arena, Join&& from) noexcept + : Join(arena) { + *this = ::std::move(from); + } + const ::google::protobuf::MessageLite::ClassData* GetClassData() + const final; + public: ::google::protobuf::Metadata GetMetadata() const final; - // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { kSrcAddressFieldNumber = 2, kPortFieldNumber = 1, @@ -236,7 +226,6 @@ class Join final : // @@protoc_insertion_point(class_scope:messages.join.Join) private: class _Internal; - friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< 1, 2, 0, @@ -249,13 +238,12 @@ class Join final : using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena); - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + inline explicit constexpr Impl_( + ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena); + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena, const Impl_& from); ::google::protobuf::internal::ArenaStringPtr srcaddress_; ::uint32_t port_; mutable ::google::protobuf::internal::CachedSize _cached_size_; @@ -300,7 +288,6 @@ inline ::uint32_t Join::_internal_port() const { } inline void Join::_internal_set_port(::uint32_t value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.port_ = value; } @@ -318,7 +305,6 @@ template inline PROTOBUF_ALWAYS_INLINE void Join::set_srcaddress(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.srcaddress_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:messages.join.Join.srcAddress) } @@ -333,12 +319,10 @@ inline const std::string& Join::_internal_srcaddress() const { } inline void Join::_internal_set_srcaddress(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.srcaddress_.Set(value, GetArena()); } inline std::string* Join::_internal_mutable_srcaddress() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; return _impl_.srcaddress_.Mutable( GetArena()); } inline std::string* Join::release_srcaddress() { diff --git a/include/WHISPER/Messages/Protos/leave.pb.cc b/include/WHISPER/Messages/Protos/leave.pb.cc index 2447cd9..2c69544 100644 --- a/include/WHISPER/Messages/Protos/leave.pb.cc +++ b/include/WHISPER/Messages/Protos/leave.pb.cc @@ -1,5 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: leave.proto +// Protobuf C++ Version: 4.26.0-dev #include "leave.pb.h" @@ -112,9 +113,6 @@ const ::_pbi::DescriptorTable descriptor_table_leave_2eproto = { PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_leave_2eproto_getter() { return &descriptor_table_leave_2eproto; } -// Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 -static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_leave_2eproto(&descriptor_table_leave_2eproto); namespace messages { namespace leave { // =================================================================== @@ -170,12 +168,15 @@ inline void Leave::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Leave::GetClassData() const { - PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - _data_ = { - Leave::MergeImpl, - nullptr, // OnDemandRegisterArenaDtor - &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite:: + ClassDataFull _data_ = { + { + nullptr, // OnDemandRegisterArenaDtor PROTOBUF_FIELD_OFFSET(Leave, _impl_._cached_size_), + false, + }, + &Leave::MergeImpl, + &Leave::kDescriptorMethods, }; return &_data_; } @@ -212,6 +213,9 @@ const ::_pbi::TcParseTable<1, 2, 0, 39, 2> Leave::_table_ = { offsetof(decltype(_table_), field_names), // no aux_entries &_Leave_default_instance_._instance, ::_pbi::TcParser::GenericFallback, // fallback + #ifdef PROTOBUF_PREFETCH_PARSE_TABLE + ::_pbi::TcParser::GetTable<::messages::leave::Leave>(), // to_prefetch + #endif // PROTOBUF_PREFETCH_PARSE_TABLE }, {{ // string srcAddress = 2; {::_pbi::TcParser::FastUS1, @@ -292,7 +296,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 39, 2> Leave::_table_ = { } -void Leave::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { +void Leave::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:messages.leave.Leave) @@ -304,7 +308,7 @@ void Leave::MergeImpl(::google::protobuf::Message& to_msg, const ::google::proto _this->_internal_set_srcaddress(from._internal_srcaddress()); } if (from._internal_port() != 0) { - _this->_internal_set_port(from._internal_port()); + _this->_impl_.port_ = from._impl_.port_; } _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } @@ -330,9 +334,9 @@ void Leave::InternalSwap(Leave* PROTOBUF_RESTRICT other) { } ::google::protobuf::Metadata Leave::GetMetadata() const { - return ::_pbi::AssignDescriptors( - &descriptor_table_leave_2eproto_getter, &descriptor_table_leave_2eproto_once, - file_level_metadata_leave_2eproto[0]); + return ::_pbi::AssignDescriptors(&descriptor_table_leave_2eproto_getter, + &descriptor_table_leave_2eproto_once, + file_level_metadata_leave_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) } // namespace leave @@ -342,4 +346,8 @@ namespace protobuf { } // namespace protobuf } // namespace google // @@protoc_insertion_point(global_scope) +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 +static ::std::false_type _static_init_ PROTOBUF_UNUSED = + (::_pbi::AddDescriptors(&descriptor_table_leave_2eproto), + ::std::false_type{}); #include "google/protobuf/port_undef.inc" diff --git a/include/WHISPER/Messages/Protos/leave.pb.h b/include/WHISPER/Messages/Protos/leave.pb.h index 04769a9..d68e030 100644 --- a/include/WHISPER/Messages/Protos/leave.pb.h +++ b/include/WHISPER/Messages/Protos/leave.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: leave.proto -// Protobuf C++ Version: 4.24.0-main +// Protobuf C++ Version: 4.26.0-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_leave_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_leave_2eproto_2epb_2eh @@ -11,17 +11,11 @@ #include #include "google/protobuf/port_def.inc" -#if PROTOBUF_VERSION < 4025000 -#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 // PROTOBUF_VERSION - -#if 4025000 < 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." -#endif // PROTOBUF_MIN_PROTOC_VERSION +#if PROTOBUF_VERSION != 4026000 +#error "Protobuf C++ gencode is built with an incompatible version of" +#error "Protobuf C++ headers/runtime. See" +#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" +#endif #include "google/protobuf/port_undef.inc" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" @@ -75,21 +69,18 @@ namespace leave { // ------------------------------------------------------------------- -class Leave final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.leave.Leave) */ { +class Leave final : public ::google::protobuf::Message +/* @@protoc_insertion_point(class_definition:messages.leave.Leave) */ { public: inline Leave() : Leave(nullptr) {} ~Leave() override; - template - explicit PROTOBUF_CONSTEXPR Leave(::google::protobuf::internal::ConstantInitialized); - - inline Leave(const Leave& from) - : Leave(nullptr, from) {} - Leave(Leave&& from) noexcept - : Leave() { - *this = ::std::move(from); - } + template + explicit PROTOBUF_CONSTEXPR Leave( + ::google::protobuf::internal::ConstantInitialized); + inline Leave(const Leave& from) : Leave(nullptr, from) {} + inline Leave(Leave&& from) noexcept + : Leave(nullptr, std::move(from)) {} inline Leave& operator=(const Leave& from) { CopyFrom(from); return *this; @@ -97,9 +88,9 @@ class Leave final : inline Leave& operator=(Leave&& from) noexcept { if (this == &from) return *this; if (GetArena() == from.GetArena() - #ifdef PROTOBUF_FORCE_COPY_IN_MOVE +#ifdef PROTOBUF_FORCE_COPY_IN_MOVE && GetArena() != nullptr - #endif // !PROTOBUF_FORCE_COPY_IN_MOVE +#endif // !PROTOBUF_FORCE_COPY_IN_MOVE ) { InternalSwap(&from); } else { @@ -131,22 +122,17 @@ class Leave final : } static inline const Leave* internal_default_instance() { return reinterpret_cast( - &_Leave_default_instance_); - } - static constexpr int kIndexInFileMessages = - 0; - - friend void swap(Leave& a, Leave& b) { - a.Swap(&b); + &_Leave_default_instance_); } + static constexpr int kIndexInFileMessages = 0; + friend void swap(Leave& a, Leave& b) { a.Swap(&b); } inline void Swap(Leave* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetArena() != nullptr && - GetArena() == other->GetArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP +#ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetArena() != nullptr && GetArena() == other->GetArena()) { +#else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetArena() == other->GetArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP +#endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::google::protobuf::internal::GenericSwap(this, other); @@ -161,16 +147,18 @@ class Leave final : // implements Message ---------------------------------------------- Leave* New(::google::protobuf::Arena* arena = nullptr) const final { - return CreateMaybeMessage(arena); + return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Leave& from); using ::google::protobuf::Message::MergeFrom; - void MergeFrom( const Leave& from) { - Leave::MergeImpl(*this, from); - } + void MergeFrom(const Leave& from) { Leave::MergeImpl(*this, from); } + private: - static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); + static void MergeImpl( + ::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); + public: ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -178,31 +166,33 @@ class Leave final : ::size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Leave* other); - - private: + private: friend class ::google::protobuf::internal::AnyMetadata; - static ::absl::string_view FullMessageName() { - return "messages.leave.Leave"; - } - protected: + static ::absl::string_view FullMessageName() { return "messages.leave.Leave"; } + + protected: explicit Leave(::google::protobuf::Arena* arena); Leave(::google::protobuf::Arena* arena, const Leave& from); - const ::google::protobuf::MessageLite::ClassData* GetClassData() const final; - public: + Leave(::google::protobuf::Arena* arena, Leave&& from) noexcept + : Leave(arena) { + *this = ::std::move(from); + } + const ::google::protobuf::MessageLite::ClassData* GetClassData() + const final; + public: ::google::protobuf::Metadata GetMetadata() const final; - // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { kSrcAddressFieldNumber = 2, kPortFieldNumber = 1, @@ -236,7 +226,6 @@ class Leave final : // @@protoc_insertion_point(class_scope:messages.leave.Leave) private: class _Internal; - friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< 1, 2, 0, @@ -249,13 +238,12 @@ class Leave final : using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena); - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + inline explicit constexpr Impl_( + ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena); + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena, const Impl_& from); ::google::protobuf::internal::ArenaStringPtr srcaddress_; ::uint32_t port_; mutable ::google::protobuf::internal::CachedSize _cached_size_; @@ -300,7 +288,6 @@ inline ::uint32_t Leave::_internal_port() const { } inline void Leave::_internal_set_port(::uint32_t value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.port_ = value; } @@ -318,7 +305,6 @@ template inline PROTOBUF_ALWAYS_INLINE void Leave::set_srcaddress(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.srcaddress_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:messages.leave.Leave.srcAddress) } @@ -333,12 +319,10 @@ inline const std::string& Leave::_internal_srcaddress() const { } inline void Leave::_internal_set_srcaddress(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.srcaddress_.Set(value, GetArena()); } inline std::string* Leave::_internal_mutable_srcaddress() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; return _impl_.srcaddress_.Mutable( GetArena()); } inline std::string* Leave::release_srcaddress() { diff --git a/include/WHISPER/Messages/Protos/message.pb.cc b/include/WHISPER/Messages/Protos/message.pb.cc index 8bd7769..cd477d1 100644 --- a/include/WHISPER/Messages/Protos/message.pb.cc +++ b/include/WHISPER/Messages/Protos/message.pb.cc @@ -1,5 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: message.proto +// Protobuf C++ Version: 4.26.0-dev #include "message.pb.h" @@ -127,9 +128,6 @@ const ::_pbi::DescriptorTable descriptor_table_message_2eproto = { PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_message_2eproto_getter() { return &descriptor_table_message_2eproto; } -// Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 -static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_message_2eproto(&descriptor_table_message_2eproto); namespace messages { namespace header { // =================================================================== @@ -139,15 +137,8 @@ class Message::_Internal { using HasBits = decltype(std::declval()._impl_._has_bits_); static constexpr ::int32_t kHasBitsOffset = 8 * PROTOBUF_FIELD_OFFSET(Message, _impl_._has_bits_); - static const ::google::protobuf::Any& payload(const Message* msg); - static void set_has_payload(HasBits* has_bits) { - (*has_bits)[0] |= 1u; - } }; -const ::google::protobuf::Any& Message::_Internal::payload(const Message* msg) { - return *msg->_impl_.payload_; -} void Message::clear_payload() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (_impl_.payload_ != nullptr) _impl_.payload_->Clear(); @@ -175,9 +166,9 @@ Message::Message( from._internal_metadata_); new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); ::uint32_t cached_has_bits = _impl_._has_bits_[0]; - _impl_.payload_ = (cached_has_bits & 0x00000001u) - ? CreateMaybeMessage<::google::protobuf::Any>(arena, *from._impl_.payload_) - : nullptr; + _impl_.payload_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::google::protobuf::Any>( + arena, *from._impl_.payload_) + : nullptr; ::memcpy(reinterpret_cast(&_impl_) + offsetof(Impl_, topic_), reinterpret_cast(&from._impl_) + @@ -217,12 +208,15 @@ inline void Message::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Message::GetClassData() const { - PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - _data_ = { - Message::MergeImpl, - nullptr, // OnDemandRegisterArenaDtor - &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite:: + ClassDataFull _data_ = { + { + nullptr, // OnDemandRegisterArenaDtor PROTOBUF_FIELD_OFFSET(Message, _impl_._cached_size_), + false, + }, + &Message::MergeImpl, + &Message::kDescriptorMethods, }; return &_data_; } @@ -267,6 +261,9 @@ const ::_pbi::TcParseTable<3, 4, 1, 42, 2> Message::_table_ = { offsetof(decltype(_table_), aux_entries), &_Message_default_instance_._instance, ::_pbi::TcParser::GenericFallback, // fallback + #ifdef PROTOBUF_PREFETCH_PARSE_TABLE + ::_pbi::TcParser::GetTable<::messages::header::Message>(), // to_prefetch + #endif // PROTOBUF_PREFETCH_PARSE_TABLE }, {{ {::_pbi::TcParser::MiniParse, {}}, // uint32 topic = 1; @@ -341,8 +338,7 @@ const ::_pbi::TcParseTable<3, 4, 1, 42, 2> Message::_table_ = { // .google.protobuf.Any payload = 5; if (cached_has_bits & 0x00000001u) { target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage( - 5, _Internal::payload(this), - _Internal::payload(this).GetCachedSize(), target, stream); + 5, *_impl_.payload_, _impl_.payload_->GetCachedSize(), target, stream); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -391,9 +387,10 @@ const ::_pbi::TcParseTable<3, 4, 1, 42, 2> Message::_table_ = { } -void Message::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { +void Message::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); + ::google::protobuf::Arena* arena = _this->GetArena(); // @@protoc_insertion_point(class_specific_merge_from_start:messages.header.Message) ABSL_DCHECK_NE(&from, _this); ::uint32_t cached_has_bits = 0; @@ -402,16 +399,23 @@ void Message::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pro if (!from._internal_senderuuid().empty()) { _this->_internal_set_senderuuid(from._internal_senderuuid()); } - if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) { - _this->_internal_mutable_payload()->::google::protobuf::Any::MergeFrom( - from._internal_payload()); + cached_has_bits = from._impl_._has_bits_[0]; + if (cached_has_bits & 0x00000001u) { + ABSL_DCHECK(from._impl_.payload_ != nullptr); + if (_this->_impl_.payload_ == nullptr) { + _this->_impl_.payload_ = + ::google::protobuf::Message::CopyConstruct<::google::protobuf::Any>(arena, *from._impl_.payload_); + } else { + _this->_impl_.payload_->MergeFrom(*from._impl_.payload_); + } } if (from._internal_topic() != 0) { - _this->_internal_set_topic(from._internal_topic()); + _this->_impl_.topic_ = from._impl_.topic_; } if (from._internal_msgtype() != 0) { - _this->_internal_set_msgtype(from._internal_msgtype()); + _this->_impl_.msgtype_ = from._impl_.msgtype_; } + _this->_impl_._has_bits_[0] |= cached_has_bits; _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } @@ -442,9 +446,9 @@ void Message::InternalSwap(Message* PROTOBUF_RESTRICT other) { } ::google::protobuf::Metadata Message::GetMetadata() const { - return ::_pbi::AssignDescriptors( - &descriptor_table_message_2eproto_getter, &descriptor_table_message_2eproto_once, - file_level_metadata_message_2eproto[0]); + return ::_pbi::AssignDescriptors(&descriptor_table_message_2eproto_getter, + &descriptor_table_message_2eproto_once, + file_level_metadata_message_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) } // namespace header @@ -454,4 +458,8 @@ namespace protobuf { } // namespace protobuf } // namespace google // @@protoc_insertion_point(global_scope) +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 +static ::std::false_type _static_init_ PROTOBUF_UNUSED = + (::_pbi::AddDescriptors(&descriptor_table_message_2eproto), + ::std::false_type{}); #include "google/protobuf/port_undef.inc" diff --git a/include/WHISPER/Messages/Protos/message.pb.h b/include/WHISPER/Messages/Protos/message.pb.h index e59d181..bac5dbc 100644 --- a/include/WHISPER/Messages/Protos/message.pb.h +++ b/include/WHISPER/Messages/Protos/message.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: message.proto -// Protobuf C++ Version: 4.24.0-main +// Protobuf C++ Version: 4.26.0-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_message_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_message_2eproto_2epb_2eh @@ -11,17 +11,11 @@ #include #include "google/protobuf/port_def.inc" -#if PROTOBUF_VERSION < 4025000 -#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 // PROTOBUF_VERSION - -#if 4025000 < 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." -#endif // PROTOBUF_MIN_PROTOC_VERSION +#if PROTOBUF_VERSION != 4026000 +#error "Protobuf C++ gencode is built with an incompatible version of" +#error "Protobuf C++ headers/runtime. See" +#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" +#endif #include "google/protobuf/port_undef.inc" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" @@ -76,21 +70,18 @@ namespace header { // ------------------------------------------------------------------- -class Message final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.header.Message) */ { +class Message final : public ::google::protobuf::Message +/* @@protoc_insertion_point(class_definition:messages.header.Message) */ { public: inline Message() : Message(nullptr) {} ~Message() override; - template - explicit PROTOBUF_CONSTEXPR Message(::google::protobuf::internal::ConstantInitialized); - - inline Message(const Message& from) - : Message(nullptr, from) {} - Message(Message&& from) noexcept - : Message() { - *this = ::std::move(from); - } + template + explicit PROTOBUF_CONSTEXPR Message( + ::google::protobuf::internal::ConstantInitialized); + inline Message(const Message& from) : Message(nullptr, from) {} + inline Message(Message&& from) noexcept + : Message(nullptr, std::move(from)) {} inline Message& operator=(const Message& from) { CopyFrom(from); return *this; @@ -98,9 +89,9 @@ class Message final : inline Message& operator=(Message&& from) noexcept { if (this == &from) return *this; if (GetArena() == from.GetArena() - #ifdef PROTOBUF_FORCE_COPY_IN_MOVE +#ifdef PROTOBUF_FORCE_COPY_IN_MOVE && GetArena() != nullptr - #endif // !PROTOBUF_FORCE_COPY_IN_MOVE +#endif // !PROTOBUF_FORCE_COPY_IN_MOVE ) { InternalSwap(&from); } else { @@ -132,22 +123,17 @@ class Message final : } static inline const Message* internal_default_instance() { return reinterpret_cast( - &_Message_default_instance_); - } - static constexpr int kIndexInFileMessages = - 0; - - friend void swap(Message& a, Message& b) { - a.Swap(&b); + &_Message_default_instance_); } + static constexpr int kIndexInFileMessages = 0; + friend void swap(Message& a, Message& b) { a.Swap(&b); } inline void Swap(Message* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetArena() != nullptr && - GetArena() == other->GetArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP +#ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetArena() != nullptr && GetArena() == other->GetArena()) { +#else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetArena() == other->GetArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP +#endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::google::protobuf::internal::GenericSwap(this, other); @@ -162,16 +148,18 @@ class Message final : // implements Message ---------------------------------------------- Message* New(::google::protobuf::Arena* arena = nullptr) const final { - return CreateMaybeMessage(arena); + return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Message& from); using ::google::protobuf::Message::MergeFrom; - void MergeFrom( const Message& from) { - Message::MergeImpl(*this, from); - } + void MergeFrom(const Message& from) { Message::MergeImpl(*this, from); } + private: - static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); + static void MergeImpl( + ::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); + public: ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -179,31 +167,33 @@ class Message final : ::size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Message* other); - - private: + private: friend class ::google::protobuf::internal::AnyMetadata; - static ::absl::string_view FullMessageName() { - return "messages.header.Message"; - } - protected: + static ::absl::string_view FullMessageName() { return "messages.header.Message"; } + + protected: explicit Message(::google::protobuf::Arena* arena); Message(::google::protobuf::Arena* arena, const Message& from); - const ::google::protobuf::MessageLite::ClassData* GetClassData() const final; - public: + Message(::google::protobuf::Arena* arena, Message&& from) noexcept + : Message(arena) { + *this = ::std::move(from); + } + const ::google::protobuf::MessageLite::ClassData* GetClassData() + const final; + public: ::google::protobuf::Metadata GetMetadata() const final; - // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { kSenderUUIDFieldNumber = 3, kPayloadFieldNumber = 5, @@ -264,7 +254,6 @@ class Message final : // @@protoc_insertion_point(class_scope:messages.header.Message) private: class _Internal; - friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< 3, 4, 1, @@ -277,13 +266,12 @@ class Message final : using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena); - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + inline explicit constexpr Impl_( + ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena); + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena, const Impl_& from); ::google::protobuf::internal::HasBits<1> _has_bits_; mutable ::google::protobuf::internal::CachedSize _cached_size_; ::google::protobuf::internal::ArenaStringPtr senderuuid_; @@ -331,7 +319,6 @@ inline ::uint32_t Message::_internal_topic() const { } inline void Message::_internal_set_topic(::uint32_t value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.topic_ = value; } @@ -354,7 +341,6 @@ inline ::uint32_t Message::_internal_msgtype() const { } inline void Message::_internal_set_msgtype(::uint32_t value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.msgtype_ = value; } @@ -372,7 +358,6 @@ template inline PROTOBUF_ALWAYS_INLINE void Message::set_senderuuid(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.senderuuid_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:messages.header.Message.senderUUID) } @@ -387,12 +372,10 @@ inline const std::string& Message::_internal_senderuuid() const { } inline void Message::_internal_set_senderuuid(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.senderuuid_.Set(value, GetArena()); } inline std::string* Message::_internal_mutable_senderuuid() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; return _impl_.senderuuid_.Mutable( GetArena()); } inline std::string* Message::release_senderuuid() { @@ -469,14 +452,14 @@ inline ::google::protobuf::Any* Message::unsafe_arena_release_payload() { } inline ::google::protobuf::Any* Message::_internal_mutable_payload() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.payload_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::Any>(GetArena()); + auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::Any>(GetArena()); _impl_.payload_ = reinterpret_cast<::google::protobuf::Any*>(p); } return _impl_.payload_; } inline ::google::protobuf::Any* Message::mutable_payload() ABSL_ATTRIBUTE_LIFETIME_BOUND { + _impl_._has_bits_[0] |= 0x00000001u; ::google::protobuf::Any* _msg = _internal_mutable_payload(); // @@protoc_insertion_point(field_mutable:messages.header.Message.payload) return _msg; diff --git a/include/WHISPER/Messages/Protos/ping.pb.cc b/include/WHISPER/Messages/Protos/ping.pb.cc index b12e529..a6d3e76 100644 --- a/include/WHISPER/Messages/Protos/ping.pb.cc +++ b/include/WHISPER/Messages/Protos/ping.pb.cc @@ -1,5 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ping.proto +// Protobuf C++ Version: 4.26.0-dev #include "ping.pb.h" @@ -108,9 +109,6 @@ const ::_pbi::DescriptorTable descriptor_table_ping_2eproto = { PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_ping_2eproto_getter() { return &descriptor_table_ping_2eproto; } -// Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 -static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_ping_2eproto(&descriptor_table_ping_2eproto); namespace messages { namespace ping { // =================================================================== @@ -150,12 +148,15 @@ inline void Ping::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Ping::GetClassData() const { - PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - _data_ = { - Ping::MergeImpl, - nullptr, // OnDemandRegisterArenaDtor - &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite:: + ClassDataFull _data_ = { + { + nullptr, // OnDemandRegisterArenaDtor PROTOBUF_FIELD_OFFSET(Ping, _impl_._cached_size_), + false, + }, + &Ping::MergeImpl, + &Ping::kDescriptorMethods, }; return &_data_; } @@ -191,6 +192,9 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Ping::_table_ = { offsetof(decltype(_table_), field_names), // no aux_entries &_Ping_default_instance_._instance, ::_pbi::TcParser::GenericFallback, // fallback + #ifdef PROTOBUF_PREFETCH_PARSE_TABLE + ::_pbi::TcParser::GetTable<::messages::ping::Ping>(), // to_prefetch + #endif // PROTOBUF_PREFETCH_PARSE_TABLE }, {{ // uint32 port = 2; {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Ping, _impl_.port_), 63>(), @@ -248,7 +252,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Ping::_table_ = { } -void Ping::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { +void Ping::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:messages.ping.Ping) @@ -257,7 +261,7 @@ void Ping::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protob (void) cached_has_bits; if (from._internal_port() != 0) { - _this->_internal_set_port(from._internal_port()); + _this->_impl_.port_ = from._impl_.port_; } _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } @@ -280,9 +284,9 @@ void Ping::InternalSwap(Ping* PROTOBUF_RESTRICT other) { } ::google::protobuf::Metadata Ping::GetMetadata() const { - return ::_pbi::AssignDescriptors( - &descriptor_table_ping_2eproto_getter, &descriptor_table_ping_2eproto_once, - file_level_metadata_ping_2eproto[0]); + return ::_pbi::AssignDescriptors(&descriptor_table_ping_2eproto_getter, + &descriptor_table_ping_2eproto_once, + file_level_metadata_ping_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) } // namespace ping @@ -292,4 +296,8 @@ namespace protobuf { } // namespace protobuf } // namespace google // @@protoc_insertion_point(global_scope) +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 +static ::std::false_type _static_init_ PROTOBUF_UNUSED = + (::_pbi::AddDescriptors(&descriptor_table_ping_2eproto), + ::std::false_type{}); #include "google/protobuf/port_undef.inc" diff --git a/include/WHISPER/Messages/Protos/ping.pb.h b/include/WHISPER/Messages/Protos/ping.pb.h index feac500..a3b091a 100644 --- a/include/WHISPER/Messages/Protos/ping.pb.h +++ b/include/WHISPER/Messages/Protos/ping.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ping.proto -// Protobuf C++ Version: 4.24.0-main +// Protobuf C++ Version: 4.26.0-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_ping_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_ping_2eproto_2epb_2eh @@ -11,17 +11,11 @@ #include #include "google/protobuf/port_def.inc" -#if PROTOBUF_VERSION < 4025000 -#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 // PROTOBUF_VERSION - -#if 4025000 < 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." -#endif // PROTOBUF_MIN_PROTOC_VERSION +#if PROTOBUF_VERSION != 4026000 +#error "Protobuf C++ gencode is built with an incompatible version of" +#error "Protobuf C++ headers/runtime. See" +#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" +#endif #include "google/protobuf/port_undef.inc" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" @@ -75,21 +69,18 @@ namespace ping { // ------------------------------------------------------------------- -class Ping final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.ping.Ping) */ { +class Ping final : public ::google::protobuf::Message +/* @@protoc_insertion_point(class_definition:messages.ping.Ping) */ { public: inline Ping() : Ping(nullptr) {} ~Ping() override; - template - explicit PROTOBUF_CONSTEXPR Ping(::google::protobuf::internal::ConstantInitialized); - - inline Ping(const Ping& from) - : Ping(nullptr, from) {} - Ping(Ping&& from) noexcept - : Ping() { - *this = ::std::move(from); - } + template + explicit PROTOBUF_CONSTEXPR Ping( + ::google::protobuf::internal::ConstantInitialized); + inline Ping(const Ping& from) : Ping(nullptr, from) {} + inline Ping(Ping&& from) noexcept + : Ping(nullptr, std::move(from)) {} inline Ping& operator=(const Ping& from) { CopyFrom(from); return *this; @@ -97,9 +88,9 @@ class Ping final : inline Ping& operator=(Ping&& from) noexcept { if (this == &from) return *this; if (GetArena() == from.GetArena() - #ifdef PROTOBUF_FORCE_COPY_IN_MOVE +#ifdef PROTOBUF_FORCE_COPY_IN_MOVE && GetArena() != nullptr - #endif // !PROTOBUF_FORCE_COPY_IN_MOVE +#endif // !PROTOBUF_FORCE_COPY_IN_MOVE ) { InternalSwap(&from); } else { @@ -131,22 +122,17 @@ class Ping final : } static inline const Ping* internal_default_instance() { return reinterpret_cast( - &_Ping_default_instance_); - } - static constexpr int kIndexInFileMessages = - 0; - - friend void swap(Ping& a, Ping& b) { - a.Swap(&b); + &_Ping_default_instance_); } + static constexpr int kIndexInFileMessages = 0; + friend void swap(Ping& a, Ping& b) { a.Swap(&b); } inline void Swap(Ping* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetArena() != nullptr && - GetArena() == other->GetArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP +#ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetArena() != nullptr && GetArena() == other->GetArena()) { +#else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetArena() == other->GetArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP +#endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::google::protobuf::internal::GenericSwap(this, other); @@ -161,16 +147,18 @@ class Ping final : // implements Message ---------------------------------------------- Ping* New(::google::protobuf::Arena* arena = nullptr) const final { - return CreateMaybeMessage(arena); + return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Ping& from); using ::google::protobuf::Message::MergeFrom; - void MergeFrom( const Ping& from) { - Ping::MergeImpl(*this, from); - } + void MergeFrom(const Ping& from) { Ping::MergeImpl(*this, from); } + private: - static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); + static void MergeImpl( + ::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); + public: ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -178,31 +166,33 @@ class Ping final : ::size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Ping* other); - - private: + private: friend class ::google::protobuf::internal::AnyMetadata; - static ::absl::string_view FullMessageName() { - return "messages.ping.Ping"; - } - protected: + static ::absl::string_view FullMessageName() { return "messages.ping.Ping"; } + + protected: explicit Ping(::google::protobuf::Arena* arena); Ping(::google::protobuf::Arena* arena, const Ping& from); - const ::google::protobuf::MessageLite::ClassData* GetClassData() const final; - public: + Ping(::google::protobuf::Arena* arena, Ping&& from) noexcept + : Ping(arena) { + *this = ::std::move(from); + } + const ::google::protobuf::MessageLite::ClassData* GetClassData() + const final; + public: ::google::protobuf::Metadata GetMetadata() const final; - // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { kPortFieldNumber = 2, }; @@ -219,7 +209,6 @@ class Ping final : // @@protoc_insertion_point(class_scope:messages.ping.Ping) private: class _Internal; - friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< 0, 1, 0, @@ -232,13 +221,12 @@ class Ping final : using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena); - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + inline explicit constexpr Impl_( + ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena); + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena, const Impl_& from); ::uint32_t port_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -282,7 +270,6 @@ inline ::uint32_t Ping::_internal_port() const { } inline void Ping::_internal_set_port(::uint32_t value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.port_ = value; } diff --git a/include/WHISPER/Messages/Protos/pong.pb.cc b/include/WHISPER/Messages/Protos/pong.pb.cc index 3310e9c..5478aaf 100644 --- a/include/WHISPER/Messages/Protos/pong.pb.cc +++ b/include/WHISPER/Messages/Protos/pong.pb.cc @@ -1,5 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: pong.proto +// Protobuf C++ Version: 4.26.0-dev #include "pong.pb.h" @@ -108,9 +109,6 @@ const ::_pbi::DescriptorTable descriptor_table_pong_2eproto = { PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_pong_2eproto_getter() { return &descriptor_table_pong_2eproto; } -// Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 -static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_pong_2eproto(&descriptor_table_pong_2eproto); namespace messages { namespace pong { // =================================================================== @@ -150,12 +148,15 @@ inline void Pong::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Pong::GetClassData() const { - PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - _data_ = { - Pong::MergeImpl, - nullptr, // OnDemandRegisterArenaDtor - &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite:: + ClassDataFull _data_ = { + { + nullptr, // OnDemandRegisterArenaDtor PROTOBUF_FIELD_OFFSET(Pong, _impl_._cached_size_), + false, + }, + &Pong::MergeImpl, + &Pong::kDescriptorMethods, }; return &_data_; } @@ -191,6 +192,9 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Pong::_table_ = { offsetof(decltype(_table_), field_names), // no aux_entries &_Pong_default_instance_._instance, ::_pbi::TcParser::GenericFallback, // fallback + #ifdef PROTOBUF_PREFETCH_PARSE_TABLE + ::_pbi::TcParser::GetTable<::messages::pong::Pong>(), // to_prefetch + #endif // PROTOBUF_PREFETCH_PARSE_TABLE }, {{ // uint32 port = 1; {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Pong, _impl_.port_), 63>(), @@ -248,7 +252,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Pong::_table_ = { } -void Pong::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { +void Pong::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:messages.pong.Pong) @@ -257,7 +261,7 @@ void Pong::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protob (void) cached_has_bits; if (from._internal_port() != 0) { - _this->_internal_set_port(from._internal_port()); + _this->_impl_.port_ = from._impl_.port_; } _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } @@ -280,9 +284,9 @@ void Pong::InternalSwap(Pong* PROTOBUF_RESTRICT other) { } ::google::protobuf::Metadata Pong::GetMetadata() const { - return ::_pbi::AssignDescriptors( - &descriptor_table_pong_2eproto_getter, &descriptor_table_pong_2eproto_once, - file_level_metadata_pong_2eproto[0]); + return ::_pbi::AssignDescriptors(&descriptor_table_pong_2eproto_getter, + &descriptor_table_pong_2eproto_once, + file_level_metadata_pong_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) } // namespace pong @@ -292,4 +296,8 @@ namespace protobuf { } // namespace protobuf } // namespace google // @@protoc_insertion_point(global_scope) +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 +static ::std::false_type _static_init_ PROTOBUF_UNUSED = + (::_pbi::AddDescriptors(&descriptor_table_pong_2eproto), + ::std::false_type{}); #include "google/protobuf/port_undef.inc" diff --git a/include/WHISPER/Messages/Protos/pong.pb.h b/include/WHISPER/Messages/Protos/pong.pb.h index 1f29fea..d0c4f96 100644 --- a/include/WHISPER/Messages/Protos/pong.pb.h +++ b/include/WHISPER/Messages/Protos/pong.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: pong.proto -// Protobuf C++ Version: 4.24.0-main +// Protobuf C++ Version: 4.26.0-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_pong_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_pong_2eproto_2epb_2eh @@ -11,17 +11,11 @@ #include #include "google/protobuf/port_def.inc" -#if PROTOBUF_VERSION < 4025000 -#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 // PROTOBUF_VERSION - -#if 4025000 < 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." -#endif // PROTOBUF_MIN_PROTOC_VERSION +#if PROTOBUF_VERSION != 4026000 +#error "Protobuf C++ gencode is built with an incompatible version of" +#error "Protobuf C++ headers/runtime. See" +#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" +#endif #include "google/protobuf/port_undef.inc" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" @@ -75,21 +69,18 @@ namespace pong { // ------------------------------------------------------------------- -class Pong final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.pong.Pong) */ { +class Pong final : public ::google::protobuf::Message +/* @@protoc_insertion_point(class_definition:messages.pong.Pong) */ { public: inline Pong() : Pong(nullptr) {} ~Pong() override; - template - explicit PROTOBUF_CONSTEXPR Pong(::google::protobuf::internal::ConstantInitialized); - - inline Pong(const Pong& from) - : Pong(nullptr, from) {} - Pong(Pong&& from) noexcept - : Pong() { - *this = ::std::move(from); - } + template + explicit PROTOBUF_CONSTEXPR Pong( + ::google::protobuf::internal::ConstantInitialized); + inline Pong(const Pong& from) : Pong(nullptr, from) {} + inline Pong(Pong&& from) noexcept + : Pong(nullptr, std::move(from)) {} inline Pong& operator=(const Pong& from) { CopyFrom(from); return *this; @@ -97,9 +88,9 @@ class Pong final : inline Pong& operator=(Pong&& from) noexcept { if (this == &from) return *this; if (GetArena() == from.GetArena() - #ifdef PROTOBUF_FORCE_COPY_IN_MOVE +#ifdef PROTOBUF_FORCE_COPY_IN_MOVE && GetArena() != nullptr - #endif // !PROTOBUF_FORCE_COPY_IN_MOVE +#endif // !PROTOBUF_FORCE_COPY_IN_MOVE ) { InternalSwap(&from); } else { @@ -131,22 +122,17 @@ class Pong final : } static inline const Pong* internal_default_instance() { return reinterpret_cast( - &_Pong_default_instance_); - } - static constexpr int kIndexInFileMessages = - 0; - - friend void swap(Pong& a, Pong& b) { - a.Swap(&b); + &_Pong_default_instance_); } + static constexpr int kIndexInFileMessages = 0; + friend void swap(Pong& a, Pong& b) { a.Swap(&b); } inline void Swap(Pong* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetArena() != nullptr && - GetArena() == other->GetArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP +#ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetArena() != nullptr && GetArena() == other->GetArena()) { +#else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetArena() == other->GetArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP +#endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::google::protobuf::internal::GenericSwap(this, other); @@ -161,16 +147,18 @@ class Pong final : // implements Message ---------------------------------------------- Pong* New(::google::protobuf::Arena* arena = nullptr) const final { - return CreateMaybeMessage(arena); + return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Pong& from); using ::google::protobuf::Message::MergeFrom; - void MergeFrom( const Pong& from) { - Pong::MergeImpl(*this, from); - } + void MergeFrom(const Pong& from) { Pong::MergeImpl(*this, from); } + private: - static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); + static void MergeImpl( + ::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); + public: ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -178,31 +166,33 @@ class Pong final : ::size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Pong* other); - - private: + private: friend class ::google::protobuf::internal::AnyMetadata; - static ::absl::string_view FullMessageName() { - return "messages.pong.Pong"; - } - protected: + static ::absl::string_view FullMessageName() { return "messages.pong.Pong"; } + + protected: explicit Pong(::google::protobuf::Arena* arena); Pong(::google::protobuf::Arena* arena, const Pong& from); - const ::google::protobuf::MessageLite::ClassData* GetClassData() const final; - public: + Pong(::google::protobuf::Arena* arena, Pong&& from) noexcept + : Pong(arena) { + *this = ::std::move(from); + } + const ::google::protobuf::MessageLite::ClassData* GetClassData() + const final; + public: ::google::protobuf::Metadata GetMetadata() const final; - // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { kPortFieldNumber = 1, }; @@ -219,7 +209,6 @@ class Pong final : // @@protoc_insertion_point(class_scope:messages.pong.Pong) private: class _Internal; - friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< 0, 1, 0, @@ -232,13 +221,12 @@ class Pong final : using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena); - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + inline explicit constexpr Impl_( + ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena); + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena, const Impl_& from); ::uint32_t port_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -282,7 +270,6 @@ inline ::uint32_t Pong::_internal_port() const { } inline void Pong::_internal_set_port(::uint32_t value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.port_ = value; } diff --git a/include/WHISPER/Messages/Protos/stringData.pb.cc b/include/WHISPER/Messages/Protos/stringData.pb.cc index bbfbf0a..fff431a 100644 --- a/include/WHISPER/Messages/Protos/stringData.pb.cc +++ b/include/WHISPER/Messages/Protos/stringData.pb.cc @@ -1,5 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: stringData.proto +// Protobuf C++ Version: 4.26.0-dev #include "stringData.pb.h" @@ -110,9 +111,6 @@ const ::_pbi::DescriptorTable descriptor_table_stringData_2eproto = { PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_stringData_2eproto_getter() { return &descriptor_table_stringData_2eproto; } -// Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 -static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_stringData_2eproto(&descriptor_table_stringData_2eproto); namespace messages { namespace stringData { // =================================================================== @@ -166,12 +164,15 @@ inline void StringData::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* StringData::GetClassData() const { - PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - _data_ = { - StringData::MergeImpl, - nullptr, // OnDemandRegisterArenaDtor - &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite:: + ClassDataFull _data_ = { + { + nullptr, // OnDemandRegisterArenaDtor PROTOBUF_FIELD_OFFSET(StringData, _impl_._cached_size_), + false, + }, + &StringData::MergeImpl, + &StringData::kDescriptorMethods, }; return &_data_; } @@ -207,6 +208,9 @@ const ::_pbi::TcParseTable<0, 1, 0, 43, 2> StringData::_table_ = { offsetof(decltype(_table_), field_names), // no aux_entries &_StringData_default_instance_._instance, ::_pbi::TcParser::GenericFallback, // fallback + #ifdef PROTOBUF_PREFETCH_PARSE_TABLE + ::_pbi::TcParser::GetTable<::messages::stringData::StringData>(), // to_prefetch + #endif // PROTOBUF_PREFETCH_PARSE_TABLE }, {{ // string data = 1; {::_pbi::TcParser::FastUS1, @@ -268,7 +272,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 43, 2> StringData::_table_ = { } -void StringData::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { +void StringData::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:messages.stringData.StringData) @@ -302,9 +306,9 @@ void StringData::InternalSwap(StringData* PROTOBUF_RESTRICT other) { } ::google::protobuf::Metadata StringData::GetMetadata() const { - return ::_pbi::AssignDescriptors( - &descriptor_table_stringData_2eproto_getter, &descriptor_table_stringData_2eproto_once, - file_level_metadata_stringData_2eproto[0]); + return ::_pbi::AssignDescriptors(&descriptor_table_stringData_2eproto_getter, + &descriptor_table_stringData_2eproto_once, + file_level_metadata_stringData_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) } // namespace stringData @@ -314,4 +318,8 @@ namespace protobuf { } // namespace protobuf } // namespace google // @@protoc_insertion_point(global_scope) +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 +static ::std::false_type _static_init_ PROTOBUF_UNUSED = + (::_pbi::AddDescriptors(&descriptor_table_stringData_2eproto), + ::std::false_type{}); #include "google/protobuf/port_undef.inc" diff --git a/include/WHISPER/Messages/Protos/stringData.pb.h b/include/WHISPER/Messages/Protos/stringData.pb.h index 8049a00..0d787ab 100644 --- a/include/WHISPER/Messages/Protos/stringData.pb.h +++ b/include/WHISPER/Messages/Protos/stringData.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: stringData.proto -// Protobuf C++ Version: 4.24.0-main +// Protobuf C++ Version: 4.26.0-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_stringData_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_stringData_2eproto_2epb_2eh @@ -11,17 +11,11 @@ #include #include "google/protobuf/port_def.inc" -#if PROTOBUF_VERSION < 4025000 -#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 // PROTOBUF_VERSION - -#if 4025000 < 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." -#endif // PROTOBUF_MIN_PROTOC_VERSION +#if PROTOBUF_VERSION != 4026000 +#error "Protobuf C++ gencode is built with an incompatible version of" +#error "Protobuf C++ headers/runtime. See" +#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" +#endif #include "google/protobuf/port_undef.inc" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" @@ -75,21 +69,18 @@ namespace stringData { // ------------------------------------------------------------------- -class StringData final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.stringData.StringData) */ { +class StringData final : public ::google::protobuf::Message +/* @@protoc_insertion_point(class_definition:messages.stringData.StringData) */ { public: inline StringData() : StringData(nullptr) {} ~StringData() override; - template - explicit PROTOBUF_CONSTEXPR StringData(::google::protobuf::internal::ConstantInitialized); - - inline StringData(const StringData& from) - : StringData(nullptr, from) {} - StringData(StringData&& from) noexcept - : StringData() { - *this = ::std::move(from); - } + template + explicit PROTOBUF_CONSTEXPR StringData( + ::google::protobuf::internal::ConstantInitialized); + inline StringData(const StringData& from) : StringData(nullptr, from) {} + inline StringData(StringData&& from) noexcept + : StringData(nullptr, std::move(from)) {} inline StringData& operator=(const StringData& from) { CopyFrom(from); return *this; @@ -97,9 +88,9 @@ class StringData final : inline StringData& operator=(StringData&& from) noexcept { if (this == &from) return *this; if (GetArena() == from.GetArena() - #ifdef PROTOBUF_FORCE_COPY_IN_MOVE +#ifdef PROTOBUF_FORCE_COPY_IN_MOVE && GetArena() != nullptr - #endif // !PROTOBUF_FORCE_COPY_IN_MOVE +#endif // !PROTOBUF_FORCE_COPY_IN_MOVE ) { InternalSwap(&from); } else { @@ -131,22 +122,17 @@ class StringData final : } static inline const StringData* internal_default_instance() { return reinterpret_cast( - &_StringData_default_instance_); - } - static constexpr int kIndexInFileMessages = - 0; - - friend void swap(StringData& a, StringData& b) { - a.Swap(&b); + &_StringData_default_instance_); } + static constexpr int kIndexInFileMessages = 0; + friend void swap(StringData& a, StringData& b) { a.Swap(&b); } inline void Swap(StringData* other) { if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetArena() != nullptr && - GetArena() == other->GetArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP +#ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetArena() != nullptr && GetArena() == other->GetArena()) { +#else // PROTOBUF_FORCE_COPY_IN_SWAP if (GetArena() == other->GetArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP +#endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { ::google::protobuf::internal::GenericSwap(this, other); @@ -161,16 +147,18 @@ class StringData final : // implements Message ---------------------------------------------- StringData* New(::google::protobuf::Arena* arena = nullptr) const final { - return CreateMaybeMessage(arena); + return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; void CopyFrom(const StringData& from); using ::google::protobuf::Message::MergeFrom; - void MergeFrom( const StringData& from) { - StringData::MergeImpl(*this, from); - } + void MergeFrom(const StringData& from) { StringData::MergeImpl(*this, from); } + private: - static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); + static void MergeImpl( + ::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); + public: ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -178,31 +166,33 @@ class StringData final : ::size_t ByteSizeLong() const final; const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(StringData* other); - - private: + private: friend class ::google::protobuf::internal::AnyMetadata; - static ::absl::string_view FullMessageName() { - return "messages.stringData.StringData"; - } - protected: + static ::absl::string_view FullMessageName() { return "messages.stringData.StringData"; } + + protected: explicit StringData(::google::protobuf::Arena* arena); StringData(::google::protobuf::Arena* arena, const StringData& from); - const ::google::protobuf::MessageLite::ClassData* GetClassData() const final; - public: + StringData(::google::protobuf::Arena* arena, StringData&& from) noexcept + : StringData(arena) { + *this = ::std::move(from); + } + const ::google::protobuf::MessageLite::ClassData* GetClassData() + const final; + public: ::google::protobuf::Metadata GetMetadata() const final; - // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { kDataFieldNumber = 1, }; @@ -225,7 +215,6 @@ class StringData final : // @@protoc_insertion_point(class_scope:messages.stringData.StringData) private: class _Internal; - friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< 0, 1, 0, @@ -238,13 +227,12 @@ class StringData final : using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena); - inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + inline explicit constexpr Impl_( + ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena); + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena, const Impl_& from); ::google::protobuf::internal::ArenaStringPtr data_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -283,7 +271,6 @@ template inline PROTOBUF_ALWAYS_INLINE void StringData::set_data(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.data_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:messages.stringData.StringData.data) } @@ -298,12 +285,10 @@ inline const std::string& StringData::_internal_data() const { } inline void StringData::_internal_set_data(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; _impl_.data_.Set(value, GetArena()); } inline std::string* StringData::_internal_mutable_data() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - ; return _impl_.data_.Mutable( GetArena()); } inline std::string* StringData::release_data() { diff --git a/libs/libzmq b/libs/libzmq index 3e08ecc..86a42e1 160000 --- a/libs/libzmq +++ b/libs/libzmq @@ -1 +1 @@ -Subproject commit 3e08ecc0124a130220f4c8c046e5ba7f919b32df +Subproject commit 86a42e1e4379120db7d6dcddaead86b82505b0dd diff --git a/libs/protobuf b/libs/protobuf index d63a145..5b34337 160000 --- a/libs/protobuf +++ b/libs/protobuf @@ -1 +1 @@ -Subproject commit d63a145c7e8721f0de4954323a8c207c5f0c8b1c +Subproject commit 5b343374e754efa8a2e9d8c6f59077ce7e5156c8