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.h | 114 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 60 insertions(+), 54 deletions(-)
diff --git a/src/proto/error_msg.pb.h b/proto/error_msg.pb.h
similarity index 76%
rename from src/proto/error_msg.pb.h
rename to proto/error_msg.pb.h
index 4119dd5..b63fc85 100644
--- a/src/proto/error_msg.pb.h
+++ b/proto/error_msg.pb.h
@@ -8,12 +8,12 @@
#include <string>
#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3017000
+#if PROTOBUF_VERSION < 3011000
#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 3017003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3011002 < 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.
@@ -25,6 +25,7 @@
#include <google/protobuf/arenastring.h>
#include <google/protobuf/generated_message_table_driven.h>
#include <google/protobuf/generated_message_util.h>
+#include <google/protobuf/inlined_string_field.h>
#include <google/protobuf/metadata_lite.h>
#include <google/protobuf/message_lite.h>
#include <google/protobuf/repeated_field.h> // IWYU pragma: export
@@ -43,7 +44,7 @@
struct TableStruct_error_5fmsg_2eproto {
static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[]
PROTOBUF_SECTION_VARIABLE(protodesc_cold);
- static const ::PROTOBUF_NAMESPACE_ID::internal::AuxiliaryParseTableField aux[]
+ static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[]
PROTOBUF_SECTION_VARIABLE(protodesc_cold);
static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1]
PROTOBUF_SECTION_VARIABLE(protodesc_cold);
@@ -53,7 +54,7 @@
};
namespace bhome_msg {
class ErrorMsg;
-struct ErrorMsgDefaultTypeInternal;
+class ErrorMsgDefaultTypeInternal;
extern ErrorMsgDefaultTypeInternal _ErrorMsg_default_instance_;
} // namespace bhome_msg
PROTOBUF_NAMESPACE_OPEN
@@ -87,15 +88,14 @@
return ErrorCode_Name(static_cast<ErrorCode>(enum_t_value));
}
bool ErrorCode_Parse(
- ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, ErrorCode* value);
+ const std::string& name, ErrorCode* value);
// ===================================================================
-class ErrorMsg final :
+class ErrorMsg :
public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:bhome_msg.ErrorMsg) */ {
public:
- inline ErrorMsg() : ErrorMsg(nullptr) {}
- ~ErrorMsg() override;
- explicit constexpr ErrorMsg(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+ ErrorMsg();
+ virtual ~ErrorMsg();
ErrorMsg(const ErrorMsg& from);
ErrorMsg(ErrorMsg&& from) noexcept
@@ -108,18 +108,17 @@
return *this;
}
inline ErrorMsg& operator=(ErrorMsg&& from) noexcept {
- if (this == &from) return *this;
- if (GetOwningArena() == from.GetOwningArena()) {
- InternalSwap(&from);
+ if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
+ if (this != &from) InternalSwap(&from);
} else {
CopyFrom(from);
}
return *this;
}
- static const ErrorMsg& default_instance() {
- return *internal_default_instance();
- }
+ static const ErrorMsg& default_instance();
+
+ static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY
static inline const ErrorMsg* internal_default_instance() {
return reinterpret_cast<const ErrorMsg*>(
&_ErrorMsg_default_instance_);
@@ -132,28 +131,20 @@
}
inline void Swap(ErrorMsg* other) {
if (other == this) return;
- if (GetOwningArena() == other->GetOwningArena()) {
- InternalSwap(other);
- } else {
- ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
- }
- }
- void UnsafeArenaSwap(ErrorMsg* other) {
- if (other == this) return;
- GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
InternalSwap(other);
}
// implements Message ----------------------------------------------
inline ErrorMsg* New() const final {
- return new ErrorMsg();
+ return CreateMaybeMessage<ErrorMsg>(nullptr);
}
ErrorMsg* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
return CreateMaybeMessage<ErrorMsg>(arena);
}
- void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final;
+ void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from)
+ final;
void CopyFrom(const ErrorMsg& from);
void MergeFrom(const ErrorMsg& from);
PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -167,20 +158,21 @@
int GetCachedSize() const final { return _cached_size_.Get(); }
private:
- void SharedCtor();
- void SharedDtor();
+ inline void SharedCtor();
+ inline void SharedDtor();
void SetCachedSize(int size) const;
void InternalSwap(ErrorMsg* other);
friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
return "bhome_msg.ErrorMsg";
}
- protected:
- explicit ErrorMsg(::PROTOBUF_NAMESPACE_ID::Arena* arena,
- bool is_message_owned = false);
private:
- static void ArenaDtor(void* object);
- inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
+ inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const {
+ return nullptr;
+ }
+ inline void* MaybeArenaPtr() const {
+ return nullptr;
+ }
public:
std::string GetTypeName() const final;
@@ -196,14 +188,16 @@
// bytes errString = 2;
void clear_errstring();
const std::string& errstring() const;
- template <typename ArgT0 = const std::string&, typename... ArgT>
- void set_errstring(ArgT0&& arg0, ArgT... args);
+ void set_errstring(const std::string& value);
+ void set_errstring(std::string&& value);
+ void set_errstring(const char* value);
+ void set_errstring(const void* value, size_t size);
std::string* mutable_errstring();
- PROTOBUF_MUST_USE_RESULT std::string* release_errstring();
+ std::string* release_errstring();
void set_allocated_errstring(std::string* errstring);
private:
const std::string& _internal_errstring() const;
- inline PROTOBUF_ALWAYS_INLINE void _internal_set_errstring(const std::string& value);
+ void _internal_set_errstring(const std::string& value);
std::string* _internal_mutable_errstring();
public:
@@ -220,9 +214,7 @@
private:
class _Internal;
- template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
- typedef void InternalArenaConstructable_;
- typedef void DestructorSkippable_;
+ ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArenaLite _internal_metadata_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr errstring_;
int errcode_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
@@ -261,38 +253,53 @@
// bytes errString = 2;
inline void ErrorMsg::clear_errstring() {
- errstring_.ClearToEmpty();
+ errstring_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
inline const std::string& ErrorMsg::errstring() const {
// @@protoc_insertion_point(field_get:bhome_msg.ErrorMsg.errString)
return _internal_errstring();
}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void ErrorMsg::set_errstring(ArgT0&& arg0, ArgT... args) {
-
- errstring_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+inline void ErrorMsg::set_errstring(const std::string& value) {
+ _internal_set_errstring(value);
// @@protoc_insertion_point(field_set:bhome_msg.ErrorMsg.errString)
}
inline std::string* ErrorMsg::mutable_errstring() {
- std::string* _s = _internal_mutable_errstring();
// @@protoc_insertion_point(field_mutable:bhome_msg.ErrorMsg.errString)
- return _s;
+ return _internal_mutable_errstring();
}
inline const std::string& ErrorMsg::_internal_errstring() const {
- return errstring_.Get();
+ return errstring_.GetNoArena();
}
inline void ErrorMsg::_internal_set_errstring(const std::string& value) {
- errstring_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+ errstring_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value);
+}
+inline void ErrorMsg::set_errstring(std::string&& value) {
+
+ errstring_.SetNoArena(
+ &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+ // @@protoc_insertion_point(field_set_rvalue:bhome_msg.ErrorMsg.errString)
+}
+inline void ErrorMsg::set_errstring(const char* value) {
+ GOOGLE_DCHECK(value != nullptr);
+
+ errstring_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
+ // @@protoc_insertion_point(field_set_char:bhome_msg.ErrorMsg.errString)
+}
+inline void ErrorMsg::set_errstring(const void* value, size_t size) {
+
+ errstring_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+ ::std::string(reinterpret_cast<const char*>(value), size));
+ // @@protoc_insertion_point(field_set_pointer:bhome_msg.ErrorMsg.errString)
}
inline std::string* ErrorMsg::_internal_mutable_errstring() {
- return errstring_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+ return errstring_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
inline std::string* ErrorMsg::release_errstring() {
// @@protoc_insertion_point(field_release:bhome_msg.ErrorMsg.errString)
- return errstring_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+
+ return errstring_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
inline void ErrorMsg::set_allocated_errstring(std::string* errstring) {
if (errstring != nullptr) {
@@ -300,8 +307,7 @@
} else {
}
- errstring_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), errstring,
- GetArenaForAllocation());
+ errstring_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), errstring);
// @@protoc_insertion_point(field_set_allocated:bhome_msg.ErrorMsg.errString)
}
--
Gitblit v1.8.0