Successfully compiled Tango.ColorLib arm/x86 project.

1 files changed, 120 insertions, 12 deletions

diff --git a/Software/Visual_Studio/Native/Tango.ProtoTest/PMR/MessageContainer.pb.cc b/Software/Visual_Studio/Native/Tango.ProtoTest/PMR/MessageContainer.pb.cc
index e06fad270..3e2a6f2f6 100644
--- a/Software/Visual_Studio/Native/Tango.ProtoTest/PMR/MessageContainer.pb.cc
+++ b/Software/Visual_Studio/Native/Tango.ProtoTest/PMR/MessageContainer.pb.cc
@@ -60,6 +60,8 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageContainer, continuous_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageContainer, completed_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageContainer, data_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageContainer, crc_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageContainer, error_),
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
   { 0, -1, sizeof(MessageContainer)},
@@ -96,6 +98,7 @@ void TableStruct::InitDefaultsImpl() {
 
   ::google::protobuf::internal::InitProtobufDefaults();
   ::Tango::PMR::Common::protobuf_MessageType_2eproto::InitDefaults();
+  ::Tango::PMR::Common::protobuf_ErrorCode_2eproto::InitDefaults();
   _MessageContainer_default_instance_._instance.DefaultConstruct();
   ::google::protobuf::internal::OnShutdownDestroyMessage(
       &_MessageContainer_default_instance_);}
@@ -109,17 +112,20 @@ void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
       "\n\026MessageContainer.proto\022\020Tango.PMR.Comm"
-      "on\032\021MessageType.proto\"\203\001\n\020MessageContain"
-      "er\022+\n\004Type\030\001 \001(\0162\035.Tango.PMR.Common.Mess"
-      "ageType\022\r\n\005Token\030\002 \001(\t\022\022\n\nContinuous\030\003 \001"
-      "(\010\022\021\n\tCompleted\030\004 \001(\010\022\014\n\004Data\030\005 \001(\014B\034\n\032c"
-      "om.twine.tango.pmr.commonb\006proto3"
+      "on\032\021MessageType.proto\032\017ErrorCode.proto\"\274"
+      "\001\n\020MessageContainer\022+\n\004Type\030\001 \001(\0162\035.Tang"
+      "o.PMR.Common.MessageType\022\r\n\005Token\030\002 \001(\t\022"
+      "\022\n\nContinuous\030\003 \001(\010\022\021\n\tCompleted\030\004 \001(\010\022\014"
+      "\n\004Data\030\005 \001(\014\022\013\n\003CRC\030\006 \001(\r\022*\n\005Error\030\007 \001(\016"
+      "2\033.Tango.PMR.Common.ErrorCodeB\034\n\032com.twi"
+      "ne.tango.pmr.commonb\006proto3"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 233);
+      descriptor, 307);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "MessageContainer.proto", &protobuf_RegisterTypes);
   ::Tango::PMR::Common::protobuf_MessageType_2eproto::AddDescriptors();
+  ::Tango::PMR::Common::protobuf_ErrorCode_2eproto::AddDescriptors();
 }
 } // anonymous namespace
 
@@ -145,6 +151,8 @@ const int MessageContainer::kTokenFieldNumber;
 const int MessageContainer::kContinuousFieldNumber;
 const int MessageContainer::kCompletedFieldNumber;
 const int MessageContainer::kDataFieldNumber;
+const int MessageContainer::kCRCFieldNumber;
+const int MessageContainer::kErrorFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 MessageContainer::MessageContainer()
@@ -169,8 +177,8 @@ MessageContainer::MessageContainer(const MessageContainer& from)
     data_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.data_);
   }
   ::memcpy(&type_, &from.type_,
-    static_cast<size_t>(reinterpret_cast<char*>(&completed_) -
-    reinterpret_cast<char*>(&type_)) + sizeof(completed_));
+    static_cast<size_t>(reinterpret_cast<char*>(&error_) -
+    reinterpret_cast<char*>(&type_)) + sizeof(error_));
   // @@protoc_insertion_point(copy_constructor:Tango.PMR.Common.MessageContainer)
 }
 
@@ -178,8 +186,8 @@ void MessageContainer::SharedCtor() {
   token_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   data_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&type_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&completed_) -
-      reinterpret_cast<char*>(&type_)) + sizeof(completed_));
+      reinterpret_cast<char*>(&error_) -
+      reinterpret_cast<char*>(&type_)) + sizeof(error_));
   _cached_size_ = 0;
 }
 
@@ -225,8 +233,8 @@ void MessageContainer::Clear() {
   token_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   data_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&type_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&completed_) -
-      reinterpret_cast<char*>(&type_)) + sizeof(completed_));
+      reinterpret_cast<char*>(&error_) -
+      reinterpret_cast<char*>(&type_)) + sizeof(error_));
   _internal_metadata_.Clear();
 }
 
@@ -311,6 +319,35 @@ bool MessageContainer::MergePartialFromCodedStream(
         break;
       }
 
+      // uint32 CRC = 6;
+      case 6: {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(48u /* 48 & 0xFF */)) {
+
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &crc_)));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // .Tango.PMR.Common.ErrorCode Error = 7;
+      case 7: {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(56u /* 56 & 0xFF */)) {
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          set_error(static_cast< ::Tango::PMR::Common::ErrorCode >(value));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
       default: {
       handle_unusual:
         if (tag == 0) {
@@ -369,6 +406,17 @@ void MessageContainer::SerializeWithCachedSizes(
       5, this->data(), output);
   }
 
+  // uint32 CRC = 6;
+  if (this->crc() != 0) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(6, this->crc(), output);
+  }
+
+  // .Tango.PMR.Common.ErrorCode Error = 7;
+  if (this->error() != 0) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      7, this->error(), output);
+  }
+
   if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
@@ -417,6 +465,17 @@ void MessageContainer::SerializeWithCachedSizes(
         5, this->data(), target);
   }
 
+  // uint32 CRC = 6;
+  if (this->crc() != 0) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(6, this->crc(), target);
+  }
+
+  // .Tango.PMR.Common.ErrorCode Error = 7;
+  if (this->error() != 0) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      7, this->error(), target);
+  }
+
   if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
@@ -464,6 +523,19 @@ size_t MessageContainer::ByteSizeLong() const {
     total_size += 1 + 1;
   }
 
+  // uint32 CRC = 6;
+  if (this->crc() != 0) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::UInt32Size(
+        this->crc());
+  }
+
+  // .Tango.PMR.Common.ErrorCode Error = 7;
+  if (this->error() != 0) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::EnumSize(this->error());
+  }
+
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = cached_size;
@@ -510,6 +582,12 @@ void MessageContainer::MergeFrom(const MessageContainer& from) {
   if (from.completed() != 0) {
     set_completed(from.completed());
   }
+  if (from.crc() != 0) {
+    set_crc(from.crc());
+  }
+  if (from.error() != 0) {
+    set_error(from.error());
+  }
 }
 
 void MessageContainer::CopyFrom(const ::google::protobuf::Message& from) {
@@ -541,6 +619,8 @@ void MessageContainer::InternalSwap(MessageContainer* other) {
   swap(type_, other->type_);
   swap(continuous_, other->continuous_);
   swap(completed_, other->completed_);
+  swap(crc_, other->crc_);
+  swap(error_, other->error_);
   _internal_metadata_.Swap(&other->_internal_metadata_);
   swap(_cached_size_, other->_cached_size_);
 }
@@ -701,6 +781,34 @@ void MessageContainer::set_allocated_data(::std::string* data) {
   // @@protoc_insertion_point(field_set_allocated:Tango.PMR.Common.MessageContainer.Data)
 }
 
+// uint32 CRC = 6;
+void MessageContainer::clear_crc() {
+  crc_ = 0u;
+}
+::google::protobuf::uint32 MessageContainer::crc() const {
+  // @@protoc_insertion_point(field_get:Tango.PMR.Common.MessageContainer.CRC)
+  return crc_;
+}
+void MessageContainer::set_crc(::google::protobuf::uint32 value) {
+  
+  crc_ = value;
+  // @@protoc_insertion_point(field_set:Tango.PMR.Common.MessageContainer.CRC)
+}
+
+// .Tango.PMR.Common.ErrorCode Error = 7;
+void MessageContainer::clear_error() {
+  error_ = 0;
+}
+::Tango::PMR::Common::ErrorCode MessageContainer::error() const {
+  // @@protoc_insertion_point(field_get:Tango.PMR.Common.MessageContainer.Error)
+  return static_cast< ::Tango::PMR::Common::ErrorCode >(error_);
+}
+void MessageContainer::set_error(::Tango::PMR::Common::ErrorCode value) {
+  
+  error_ = value;
+  // @@protoc_insertion_point(field_set:Tango.PMR.Common.MessageContainer.Error)
+}
+
 #endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
 
 // @@protoc_insertion_point(namespace_scope)