From 2eebf13462324b2a0d1b5db884d8dafc4c3345af Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 31 八月 2021 10:13:56 +0800
Subject: [PATCH] change proto path and import in bhome_node.go

---
 proto/error_msg.pb.cc |  127 ++++++++++++++++++++----------------------
 1 files changed, 60 insertions(+), 67 deletions(-)

diff --git a/src/proto/error_msg.pb.cc b/proto/error_msg.pb.cc
similarity index 70%
rename from src/proto/error_msg.pb.cc
rename to proto/error_msg.pb.cc
index ff15c9d..2ff2b91 100644
--- a/src/proto/error_msg.pb.cc
+++ b/proto/error_msg.pb.cc
@@ -11,24 +11,26 @@
 #include <google/protobuf/io/zero_copy_stream_impl_lite.h>
 // @@protoc_insertion_point(includes)
 #include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
 namespace bhome_msg {
-constexpr ErrorMsg::ErrorMsg(
-  ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized)
-  : errstring_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string)
-  , errcode_(0)
-{}
-struct ErrorMsgDefaultTypeInternal {
-  constexpr ErrorMsgDefaultTypeInternal()
-    : _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) {}
-  ~ErrorMsgDefaultTypeInternal() {}
-  union {
-    ErrorMsg _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT ErrorMsgDefaultTypeInternal _ErrorMsg_default_instance_;
+class ErrorMsgDefaultTypeInternal {
+ public:
+  ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<ErrorMsg> _instance;
+} _ErrorMsg_default_instance_;
 }  // namespace bhome_msg
+static void InitDefaultsscc_info_ErrorMsg_error_5fmsg_2eproto() {
+  GOOGLE_PROTOBUF_VERIFY_VERSION;
+
+  {
+    void* ptr = &::bhome_msg::_ErrorMsg_default_instance_;
+    new (ptr) ::bhome_msg::ErrorMsg();
+    ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);
+  }
+  ::bhome_msg::ErrorMsg::InitAsDefaultInstance();
+}
+
+::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_ErrorMsg_error_5fmsg_2eproto =
+    {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_ErrorMsg_error_5fmsg_2eproto}, {}};
+
 namespace bhome_msg {
 bool ErrorCode_IsValid(int value) {
   switch (value) {
@@ -96,7 +98,7 @@
                      ErrorCode_strings[idx].get();
 }
 bool ErrorCode_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, ErrorCode* value) {
+    const std::string& name, ErrorCode* value) {
   int int_value;
   bool success = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumValue(
       ErrorCode_entries, 8, name, &int_value);
@@ -108,57 +110,52 @@
 
 // ===================================================================
 
+void ErrorMsg::InitAsDefaultInstance() {
+}
 class ErrorMsg::_Internal {
  public:
 };
 
-ErrorMsg::ErrorMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) {
+ErrorMsg::ErrorMsg()
+  : ::PROTOBUF_NAMESPACE_ID::MessageLite(), _internal_metadata_(nullptr) {
   SharedCtor();
-  if (!is_message_owned) {
-    RegisterArenaDtor(arena);
-  }
-  // @@protoc_insertion_point(arena_constructor:bhome_msg.ErrorMsg)
+  // @@protoc_insertion_point(constructor:bhome_msg.ErrorMsg)
 }
 ErrorMsg::ErrorMsg(const ErrorMsg& from)
-  : ::PROTOBUF_NAMESPACE_ID::MessageLite() {
-  _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_);
+  : ::PROTOBUF_NAMESPACE_ID::MessageLite(),
+      _internal_metadata_(nullptr) {
+  _internal_metadata_.MergeFrom(from._internal_metadata_);
   errstring_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
   if (!from._internal_errstring().empty()) {
-    errstring_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_errstring(), 
-      GetArenaForAllocation());
+    errstring_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.errstring_);
   }
   errcode_ = from.errcode_;
   // @@protoc_insertion_point(copy_constructor:bhome_msg.ErrorMsg)
 }
 
-inline void ErrorMsg::SharedCtor() {
-errstring_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-errcode_ = 0;
+void ErrorMsg::SharedCtor() {
+  ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_ErrorMsg_error_5fmsg_2eproto.base);
+  errstring_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  errcode_ = 0;
 }
 
 ErrorMsg::~ErrorMsg() {
   // @@protoc_insertion_point(destructor:bhome_msg.ErrorMsg)
-  if (GetArenaForAllocation() != nullptr) return;
   SharedDtor();
-  _internal_metadata_.Delete<std::string>();
 }
 
-inline void ErrorMsg::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
+void ErrorMsg::SharedDtor() {
   errstring_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
 }
 
-void ErrorMsg::ArenaDtor(void* object) {
-  ErrorMsg* _this = reinterpret_cast< ErrorMsg* >(object);
-  (void)_this;
-}
-void ErrorMsg::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) {
-}
 void ErrorMsg::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ErrorMsg& ErrorMsg::default_instance() {
+  ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_ErrorMsg_error_5fmsg_2eproto.base);
+  return *internal_default_instance();
+}
+
 
 void ErrorMsg::Clear() {
 // @@protoc_insertion_point(message_clear_start:bhome_msg.ErrorMsg)
@@ -166,9 +163,9 @@
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  errstring_.ClearToEmpty();
+  errstring_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
   errcode_ = 0;
-  _internal_metadata_.Clear<std::string>();
+  _internal_metadata_.Clear();
 }
 
 const char* ErrorMsg::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
@@ -176,11 +173,12 @@
   while (!ctx->Done(&ptr)) {
     ::PROTOBUF_NAMESPACE_ID::uint32 tag;
     ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
+    CHK_(ptr);
     switch (tag >> 3) {
       // .bhome_msg.ErrorCode errCode = 1;
       case 1:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) {
-          ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr);
           CHK_(ptr);
           _internal_set_errcode(static_cast<::bhome_msg::ErrorCode>(val));
         } else goto handle_unusual;
@@ -195,14 +193,11 @@
         continue;
       default: {
       handle_unusual:
-        if ((tag == 0) || ((tag & 7) == 4)) {
-          CHK_(ptr);
+        if ((tag & 7) == 4 || tag == 0) {
           ctx->SetLastTag(tag);
           goto success;
         }
-        ptr = UnknownFieldParse(tag,
-            _internal_metadata_.mutable_unknown_fields<std::string>(),
-            ptr, ctx);
+        ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
         CHK_(ptr != nullptr);
         continue;
       }
@@ -223,21 +218,21 @@
   (void) cached_has_bits;
 
   // .bhome_msg.ErrorCode errCode = 1;
-  if (this->_internal_errcode() != 0) {
+  if (this->errcode() != 0) {
     target = stream->EnsureSpace(target);
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray(
       1, this->_internal_errcode(), target);
   }
 
   // bytes errString = 2;
-  if (!this->_internal_errstring().empty()) {
+  if (this->errstring().size() > 0) {
     target = stream->WriteBytesMaybeAliased(
         2, this->_internal_errstring(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(),
-        static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target);
+    target = stream->WriteRaw(_internal_metadata_.unknown_fields().data(),
+        static_cast<int>(_internal_metadata_.unknown_fields().size()), target);
   }
   // @@protoc_insertion_point(serialize_to_array_end:bhome_msg.ErrorMsg)
   return target;
@@ -252,20 +247,20 @@
   (void) cached_has_bits;
 
   // bytes errString = 2;
-  if (!this->_internal_errstring().empty()) {
+  if (this->errstring().size() > 0) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::BytesSize(
         this->_internal_errstring());
   }
 
   // .bhome_msg.ErrorCode errCode = 1;
-  if (this->_internal_errcode() != 0) {
+  if (this->errcode() != 0) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_errcode());
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size();
+    total_size += _internal_metadata_.unknown_fields().size();
   }
   int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size);
   SetCachedSize(cached_size);
@@ -281,16 +276,17 @@
 void ErrorMsg::MergeFrom(const ErrorMsg& from) {
 // @@protoc_insertion_point(class_specific_merge_from_start:bhome_msg.ErrorMsg)
   GOOGLE_DCHECK_NE(&from, this);
+  _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  if (!from._internal_errstring().empty()) {
-    _internal_set_errstring(from._internal_errstring());
+  if (from.errstring().size() > 0) {
+
+    errstring_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.errstring_);
   }
-  if (from._internal_errcode() != 0) {
+  if (from.errcode() != 0) {
     _internal_set_errcode(from._internal_errcode());
   }
-  _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_);
 }
 
 void ErrorMsg::CopyFrom(const ErrorMsg& from) {
@@ -306,12 +302,9 @@
 
 void ErrorMsg::InternalSwap(ErrorMsg* other) {
   using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
-      &errstring_, GetArenaForAllocation(),
-      &other->errstring_, other->GetArenaForAllocation()
-  );
+  _internal_metadata_.Swap(&other->_internal_metadata_);
+  errstring_.Swap(&other->errstring_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+    GetArenaNoVirtual());
   swap(errcode_, other->errcode_);
 }
 
@@ -324,7 +317,7 @@
 }  // namespace bhome_msg
 PROTOBUF_NAMESPACE_OPEN
 template<> PROTOBUF_NOINLINE ::bhome_msg::ErrorMsg* Arena::CreateMaybeMessage< ::bhome_msg::ErrorMsg >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::bhome_msg::ErrorMsg >(arena);
+  return Arena::CreateInternal< ::bhome_msg::ErrorMsg >(arena);
 }
 PROTOBUF_NAMESPACE_CLOSE
 

--
Gitblit v1.8.0