Merge pull request #27 from DragonAura/dev

refactor(CAPI): 🎨 protos generated using newer gRPC

CAPI/API/include/API.h

@@ -6,12 +6,11 @@
 #pragma warning(disable : 4996)
 #endif
 
-#include <Message2Server.pb.h>
-#include <Message2Clients.pb.h>
-#include <MessageType.pb.h>
-#include <Message2Server.grpc.pb.h>
-#include <Message2Clients.grpc.pb.h>
-#include <MessageType.grpc.pb.h>
+#include "Message2Server.pb.h"
+#include "Message2Clients.pb.h"
+#include "MessageType.pb.h"
+#include "Services.grpc.pb.h"
+#include "Services.pb.h"
 #include <future>
 #include <iostream>
 #include <vector>

CAPI/API/include/logic.h

@@ -14,12 +14,11 @@
 #include <condition_variable>
 #include <atomic>
 
-#include <Message2Server.pb.h>
-#include <Message2Clients.pb.h>
-#include <MessageType.pb.h>
-#include <Message2Server.grpc.pb.h>
-#include <Message2Clients.grpc.pb.h>
-#include <MessageType.grpc.pb.h>
+#include "Message2Server.pb.h"
+#include "Message2Clients.pb.h"
+#include "MessageType.pb.h"
+#include "Services.grpc.pb.h"
+#include "Services.pb.h"
 #include "API.h"
 #include "AI.h"
 #include "structures.h"

CAPI/proto/Message2Clients.grpc.pb.cc

@@ -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 <functional>
-#include <grpcpp/impl/codegen/async_stream.h>
-#include <grpcpp/impl/codegen/async_unary_call.h>
-#include <grpcpp/impl/codegen/channel_interface.h>
-#include <grpcpp/impl/codegen/client_unary_call.h>
-#include <grpcpp/impl/codegen/client_callback.h>
-#include <grpcpp/impl/codegen/message_allocator.h>
-#include <grpcpp/impl/codegen/method_handler.h>
-#include <grpcpp/impl/codegen/rpc_service_method.h>
-#include <grpcpp/impl/codegen/server_callback.h>
-#include <grpcpp/impl/codegen/server_callback_handlers.h>
-#include <grpcpp/impl/codegen/server_context.h>
-#include <grpcpp/impl/codegen/service_type.h>
-#include <grpcpp/impl/codegen/sync_stream.h>
-namespace protobuf
-{
-
-}  // namespace protobuf

CAPI/proto/Message2Clients.grpc.pb.h

@@ -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 <functional>
-#include <grpcpp/impl/codegen/async_generic_service.h>
-#include <grpcpp/impl/codegen/async_stream.h>
-#include <grpcpp/impl/codegen/async_unary_call.h>
-#include <grpcpp/impl/codegen/client_callback.h>
-#include <grpcpp/impl/codegen/client_context.h>
-#include <grpcpp/impl/codegen/completion_queue.h>
-#include <grpcpp/impl/codegen/message_allocator.h>
-#include <grpcpp/impl/codegen/method_handler.h>
-#include <grpcpp/impl/codegen/proto_utils.h>
-#include <grpcpp/impl/codegen/rpc_method.h>
-#include <grpcpp/impl/codegen/server_callback.h>
-#include <grpcpp/impl/codegen/server_callback_handlers.h>
-#include <grpcpp/impl/codegen/server_context.h>
-#include <grpcpp/impl/codegen/service_type.h>
-#include <grpcpp/impl/codegen/status.h>
-#include <grpcpp/impl/codegen/stub_options.h>
-#include <grpcpp/impl/codegen/sync_stream.h>
-
-namespace protobuf
-{
-
-}  // namespace protobuf
-
-#endif  // GRPC_Message2Clients_2eproto__INCLUDED

CAPI/proto/Message2Server.grpc.pb.cc

@@ -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 <functional>
-#include <grpcpp/impl/codegen/async_stream.h>
-#include <grpcpp/impl/codegen/async_unary_call.h>
-#include <grpcpp/impl/codegen/channel_interface.h>
-#include <grpcpp/impl/codegen/client_unary_call.h>
-#include <grpcpp/impl/codegen/client_callback.h>
-#include <grpcpp/impl/codegen/message_allocator.h>
-#include <grpcpp/impl/codegen/method_handler.h>
-#include <grpcpp/impl/codegen/rpc_service_method.h>
-#include <grpcpp/impl/codegen/server_callback.h>
-#include <grpcpp/impl/codegen/server_callback_handlers.h>
-#include <grpcpp/impl/codegen/server_context.h>
-#include <grpcpp/impl/codegen/service_type.h>
-#include <grpcpp/impl/codegen/sync_stream.h>
-namespace protobuf
-{
-
-}  // namespace protobuf

CAPI/proto/Message2Server.grpc.pb.h

@@ -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 <functional>
-#include <grpcpp/impl/codegen/async_generic_service.h>
-#include <grpcpp/impl/codegen/async_stream.h>
-#include <grpcpp/impl/codegen/async_unary_call.h>
-#include <grpcpp/impl/codegen/client_callback.h>
-#include <grpcpp/impl/codegen/client_context.h>
-#include <grpcpp/impl/codegen/completion_queue.h>
-#include <grpcpp/impl/codegen/message_allocator.h>
-#include <grpcpp/impl/codegen/method_handler.h>
-#include <grpcpp/impl/codegen/proto_utils.h>
-#include <grpcpp/impl/codegen/rpc_method.h>
-#include <grpcpp/impl/codegen/server_callback.h>
-#include <grpcpp/impl/codegen/server_callback_handlers.h>
-#include <grpcpp/impl/codegen/server_context.h>
-#include <grpcpp/impl/codegen/service_type.h>
-#include <grpcpp/impl/codegen/status.h>
-#include <grpcpp/impl/codegen/stub_options.h>
-#include <grpcpp/impl/codegen/sync_stream.h>
-
-namespace protobuf
-{
-
-}  // namespace protobuf
-
-#endif  // GRPC_Message2Server_2eproto__INCLUDED

CAPI/proto/Message2Server.pb.h

@@ -8,12 +8,12 @@
 #include <string>
 
 #include <google/protobuf/port_def.inc>
-#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 <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
 #include <google/protobuf/generated_message_util.h>
 #include <google/protobuf/metadata_lite.h>
 #include <google/protobuf/generated_message_reflection.h>
@@ -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<typename ArgT0, typename... ArgT>
     inline PROTOBUF_ALWAYS_INLINE void SendMsg::set_message(ArgT0&& arg0, ArgT... args)
     {
-        message_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0&&>(arg0), args..., GetArenaForAllocation());
+        _impl_.message_.Set(static_cast<ArgT0&&>(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)
     {

CAPI/proto/MessageType.grpc.pb.cc

@@ -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 <functional>
-#include <grpcpp/impl/codegen/async_stream.h>
-#include <grpcpp/impl/codegen/async_unary_call.h>
-#include <grpcpp/impl/codegen/channel_interface.h>
-#include <grpcpp/impl/codegen/client_unary_call.h>
-#include <grpcpp/impl/codegen/client_callback.h>
-#include <grpcpp/impl/codegen/message_allocator.h>
-#include <grpcpp/impl/codegen/method_handler.h>
-#include <grpcpp/impl/codegen/rpc_service_method.h>
-#include <grpcpp/impl/codegen/server_callback.h>
-#include <grpcpp/impl/codegen/server_callback_handlers.h>
-#include <grpcpp/impl/codegen/server_context.h>
-#include <grpcpp/impl/codegen/service_type.h>
-#include <grpcpp/impl/codegen/sync_stream.h>
-namespace protobuf
-{
-
-}  // namespace protobuf

CAPI/proto/MessageType.grpc.pb.h

@@ -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 <functional>
-#include <grpcpp/impl/codegen/async_generic_service.h>
-#include <grpcpp/impl/codegen/async_stream.h>
-#include <grpcpp/impl/codegen/async_unary_call.h>
-#include <grpcpp/impl/codegen/client_callback.h>
-#include <grpcpp/impl/codegen/client_context.h>
-#include <grpcpp/impl/codegen/completion_queue.h>
-#include <grpcpp/impl/codegen/message_allocator.h>
-#include <grpcpp/impl/codegen/method_handler.h>
-#include <grpcpp/impl/codegen/proto_utils.h>
-#include <grpcpp/impl/codegen/rpc_method.h>
-#include <grpcpp/impl/codegen/server_callback.h>
-#include <grpcpp/impl/codegen/server_callback_handlers.h>
-#include <grpcpp/impl/codegen/server_context.h>
-#include <grpcpp/impl/codegen/service_type.h>
-#include <grpcpp/impl/codegen/status.h>
-#include <grpcpp/impl/codegen/stub_options.h>
-#include <grpcpp/impl/codegen/sync_stream.h>
-
-namespace protobuf
-{
-
-}  // namespace protobuf
-
-#endif  // GRPC_MessageType_2eproto__INCLUDED

CAPI/proto/MessageType.pb.cc

@@ -16,14 +16,18 @@
 #include <google/protobuf/port_def.inc>
 
 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()

CAPI/proto/MessageType.pb.h

@@ -8,12 +8,12 @@
 #include <string>
 
 #include <google/protobuf/port_def.inc>
-#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 <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
 #include <google/protobuf/generated_message_util.h>
 #include <google/protobuf/metadata_lite.h>
 #include <google/protobuf/generated_message_reflection.h>
@@ -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;

CAPI/proto/Services.pb.cc

@@ -16,14 +16,18 @@
 #include <google/protobuf/port_def.inc>
 
 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
 {
 

CAPI/proto/Services.pb.h

@@ -8,12 +8,12 @@
 #include <string>
 
 #include <google/protobuf/port_def.inc>
-#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 <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
 #include <google/protobuf/generated_message_util.h>
 #include <google/protobuf/metadata_lite.h>
 #include <google/protobuf/generated_message_reflection.h>
@@ -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;

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=.