1 files changed, 144 insertions, 32 deletions

diff --git a/Software/Visual_Studio/Native/Tango.ProtoTest/PMR/StubCartridgeWriteResponse.pb.cc b/Software/Visual_Studio/Native/Tango.ProtoTest/PMR/StubCartridgeWriteResponse.pb.cc
index 3429d48fe..1a4be0ee4 100644
--- a/Software/Visual_Studio/Native/Tango.ProtoTest/PMR/StubCartridgeWriteResponse.pb.cc
+++ b/Software/Visual_Studio/Native/Tango.ProtoTest/PMR/StubCartridgeWriteResponse.pb.cc
@@ -57,6 +57,7 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION
   ~0u,  // no _weak_field_map_
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StubCartridgeWriteResponse, cartridgeid_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StubCartridgeWriteResponse, status_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StubCartridgeWriteResponse, statusword_),
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
   { 0, -1, sizeof(StubCartridgeWriteResponse)},
@@ -105,12 +106,13 @@ void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
       "\n StubCartridgeWriteResponse.proto\022\017Tang"
-      "o.PMR.Stubs\"A\n\032StubCartridgeWriteRespons"
-      "e\022\023\n\013CartridgeId\030\001 \001(\r\022\016\n\006Status\030\010 \001(\rB\033"
-      "\n\031com.twine.tango.pmr.stubsb\006proto3"
+      "o.PMR.Stubs\"U\n\032StubCartridgeWriteRespons"
+      "e\022\023\n\013CartridgeId\030\001 \001(\r\022\016\n\006Status\030\002 \001(\t\022\022"
+      "\n\nStatusWord\030\003 \001(\rB\033\n\031com.twine.tango.pm"
+      "r.stubsb\006proto3"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 155);
+      descriptor, 175);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "StubCartridgeWriteResponse.proto", &protobuf_RegisterTypes);
 }
@@ -135,6 +137,7 @@ struct StaticDescriptorInitializer {
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int StubCartridgeWriteResponse::kCartridgeIdFieldNumber;
 const int StubCartridgeWriteResponse::kStatusFieldNumber;
+const int StubCartridgeWriteResponse::kStatusWordFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 StubCartridgeWriteResponse::StubCartridgeWriteResponse()
@@ -150,16 +153,21 @@ StubCartridgeWriteResponse::StubCartridgeWriteResponse(const StubCartridgeWriteR
       _internal_metadata_(NULL),
       _cached_size_(0) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
+  status_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  if (from.status().size() > 0) {
+    status_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.status_);
+  }
   ::memcpy(&cartridgeid_, &from.cartridgeid_,
-    static_cast<size_t>(reinterpret_cast<char*>(&status_) -
-    reinterpret_cast<char*>(&cartridgeid_)) + sizeof(status_));
+    static_cast<size_t>(reinterpret_cast<char*>(&statusword_) -
+    reinterpret_cast<char*>(&cartridgeid_)) + sizeof(statusword_));
   // @@protoc_insertion_point(copy_constructor:Tango.PMR.Stubs.StubCartridgeWriteResponse)
 }
 
 void StubCartridgeWriteResponse::SharedCtor() {
+  status_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&cartridgeid_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&status_) -
-      reinterpret_cast<char*>(&cartridgeid_)) + sizeof(status_));
+      reinterpret_cast<char*>(&statusword_) -
+      reinterpret_cast<char*>(&cartridgeid_)) + sizeof(statusword_));
   _cached_size_ = 0;
 }
 
@@ -169,6 +177,7 @@ StubCartridgeWriteResponse::~StubCartridgeWriteResponse() {
 }
 
 void StubCartridgeWriteResponse::SharedDtor() {
+  status_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 
 void StubCartridgeWriteResponse::SetCachedSize(int size) const {
@@ -200,9 +209,10 @@ void StubCartridgeWriteResponse::Clear() {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
+  status_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&cartridgeid_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&status_) -
-      reinterpret_cast<char*>(&cartridgeid_)) + sizeof(status_));
+      reinterpret_cast<char*>(&statusword_) -
+      reinterpret_cast<char*>(&cartridgeid_)) + sizeof(statusword_));
   _internal_metadata_.Clear();
 }
 
@@ -230,14 +240,30 @@ bool StubCartridgeWriteResponse::MergePartialFromCodedStream(
         break;
       }
 
-      // uint32 Status = 8;
-      case 8: {
+      // string Status = 2;
+      case 2: {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_status()));
+          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+            this->status().data(), static_cast<int>(this->status().length()),
+            ::google::protobuf::internal::WireFormatLite::PARSE,
+            "Tango.PMR.Stubs.StubCartridgeWriteResponse.Status"));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // uint32 StatusWord = 3;
+      case 3: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(64u /* 64 & 0xFF */)) {
+            static_cast< ::google::protobuf::uint8>(24u /* 24 & 0xFF */)) {
 
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &status_)));
+                 input, &statusword_)));
         } else {
           goto handle_unusual;
         }
@@ -275,9 +301,19 @@ void StubCartridgeWriteResponse::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->cartridgeid(), output);
   }
 
-  // uint32 Status = 8;
-  if (this->status() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(8, this->status(), output);
+  // string Status = 2;
+  if (this->status().size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->status().data(), static_cast<int>(this->status().length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "Tango.PMR.Stubs.StubCartridgeWriteResponse.Status");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      2, this->status(), output);
+  }
+
+  // uint32 StatusWord = 3;
+  if (this->statusword() != 0) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->statusword(), output);
   }
 
   if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
@@ -299,9 +335,20 @@ void StubCartridgeWriteResponse::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->cartridgeid(), target);
   }
 
-  // uint32 Status = 8;
-  if (this->status() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(8, this->status(), target);
+  // string Status = 2;
+  if (this->status().size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->status().data(), static_cast<int>(this->status().length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "Tango.PMR.Stubs.StubCartridgeWriteResponse.Status");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        2, this->status(), target);
+  }
+
+  // uint32 StatusWord = 3;
+  if (this->statusword() != 0) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->statusword(), target);
   }
 
   if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
@@ -321,6 +368,13 @@ size_t StubCartridgeWriteResponse::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
         (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
   }
+  // string Status = 2;
+  if (this->status().size() > 0) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::StringSize(
+        this->status());
+  }
+
   // uint32 CartridgeId = 1;
   if (this->cartridgeid() != 0) {
     total_size += 1 +
@@ -328,11 +382,11 @@ size_t StubCartridgeWriteResponse::ByteSizeLong() const {
         this->cartridgeid());
   }
 
-  // uint32 Status = 8;
-  if (this->status() != 0) {
+  // uint32 StatusWord = 3;
+  if (this->statusword() != 0) {
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::UInt32Size(
-        this->status());
+        this->statusword());
   }
 
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
@@ -364,11 +418,15 @@ void StubCartridgeWriteResponse::MergeFrom(const StubCartridgeWriteResponse& fro
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
+  if (from.status().size() > 0) {
+
+    status_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.status_);
+  }
   if (from.cartridgeid() != 0) {
     set_cartridgeid(from.cartridgeid());
   }
-  if (from.status() != 0) {
-    set_status(from.status());
+  if (from.statusword() != 0) {
+    set_statusword(from.statusword());
   }
 }
 
@@ -396,8 +454,9 @@ void StubCartridgeWriteResponse::Swap(StubCartridgeWriteResponse* other) {
 }
 void StubCartridgeWriteResponse::InternalSwap(StubCartridgeWriteResponse* other) {
   using std::swap;
+  status_.Swap(&other->status_);
   swap(cartridgeid_, other->cartridgeid_);
-  swap(status_, other->status_);
+  swap(statusword_, other->statusword_);
   _internal_metadata_.Swap(&other->_internal_metadata_);
   swap(_cached_size_, other->_cached_size_);
 }
@@ -424,19 +483,72 @@ void StubCartridgeWriteResponse::set_cartridgeid(::google::protobuf::uint32 valu
   // @@protoc_insertion_point(field_set:Tango.PMR.Stubs.StubCartridgeWriteResponse.CartridgeId)
 }
 
-// uint32 Status = 8;
+// string Status = 2;
 void StubCartridgeWriteResponse::clear_status() {
-  status_ = 0u;
+  status_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
-::google::protobuf::uint32 StubCartridgeWriteResponse::status() const {
+const ::std::string& StubCartridgeWriteResponse::status() const {
   // @@protoc_insertion_point(field_get:Tango.PMR.Stubs.StubCartridgeWriteResponse.Status)
-  return status_;
+  return status_.GetNoArena();
 }
-void StubCartridgeWriteResponse::set_status(::google::protobuf::uint32 value) {
+void StubCartridgeWriteResponse::set_status(const ::std::string& value) {
   
-  status_ = value;
+  status_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:Tango.PMR.Stubs.StubCartridgeWriteResponse.Status)
 }
+#if LANG_CXX11
+void StubCartridgeWriteResponse::set_status(::std::string&& value) {
+  
+  status_.SetNoArena(
+    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+  // @@protoc_insertion_point(field_set_rvalue:Tango.PMR.Stubs.StubCartridgeWriteResponse.Status)
+}
+#endif
+void StubCartridgeWriteResponse::set_status(const char* value) {
+  GOOGLE_DCHECK(value != NULL);
+  
+  status_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
+  // @@protoc_insertion_point(field_set_char:Tango.PMR.Stubs.StubCartridgeWriteResponse.Status)
+}
+void StubCartridgeWriteResponse::set_status(const char* value, size_t size) {
+  
+  status_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+      ::std::string(reinterpret_cast<const char*>(value), size));
+  // @@protoc_insertion_point(field_set_pointer:Tango.PMR.Stubs.StubCartridgeWriteResponse.Status)
+}
+::std::string* StubCartridgeWriteResponse::mutable_status() {
+  
+  // @@protoc_insertion_point(field_mutable:Tango.PMR.Stubs.StubCartridgeWriteResponse.Status)
+  return status_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+::std::string* StubCartridgeWriteResponse::release_status() {
+  // @@protoc_insertion_point(field_release:Tango.PMR.Stubs.StubCartridgeWriteResponse.Status)
+  
+  return status_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+void StubCartridgeWriteResponse::set_allocated_status(::std::string* status) {
+  if (status != NULL) {
+    
+  } else {
+    
+  }
+  status_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), status);
+  // @@protoc_insertion_point(field_set_allocated:Tango.PMR.Stubs.StubCartridgeWriteResponse.Status)
+}
+
+// uint32 StatusWord = 3;
+void StubCartridgeWriteResponse::clear_statusword() {
+  statusword_ = 0u;
+}
+::google::protobuf::uint32 StubCartridgeWriteResponse::statusword() const {
+  // @@protoc_insertion_point(field_get:Tango.PMR.Stubs.StubCartridgeWriteResponse.StatusWord)
+  return statusword_;
+}
+void StubCartridgeWriteResponse::set_statusword(::google::protobuf::uint32 value) {
+  
+  statusword_ = value;
+  // @@protoc_insertion_point(field_set:Tango.PMR.Stubs.StubCartridgeWriteResponse.StatusWord)
+}
 
 #endif  // PROTOBUF_INLINE_NOT_IN_HEADERS