Updated PacketGen submodule. Moved output and input operators for obj…

…serializable to objectstream. Removed objserializable create method from C++.
MichaelWallace30 · Apr 10, 2017 · 077ef19 · 077ef19
1 parent a63bb2a
commit 077ef19
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/CommProto-PacketGen b/CommProto-PacketGen
diff --git a/CommProto/include/CommProto/serialization/objectstream.h b/CommProto/include/CommProto/serialization/objectstream.h
@@ -114,6 +114,7 @@ namespace comnet {
 			ObjectStream& operator<<(const uint64_t& data);
 			ObjectStream& operator<<(const real32_t& data);
 			ObjectStream& operator<<(const real64_t& data);
+			ObjectStream& operator<<(const ObjSerializable& data);
 
 			/** OVerloaded output stream operators to output variables to a variable from the object stream
 				string_t (char*) must use malloc when inputing data into new c-string variable*/
@@ -130,8 +131,7 @@ namespace comnet {
 			ObjectStream& operator>>(int64_t& data);
 			ObjectStream& operator>>(real32_t& data);
 			ObjectStream& operator>>(real64_t& data);
-
-
+			ObjectStream& operator>>(ObjSerializable& data);
 
 			/*
 			p means pointer compatible.  If it is there that means that it is compatible

diff --git a/CommProto/include/CommProto/serialization/objserializable.h b/CommProto/include/CommProto/serialization/objserializable.h
@@ -40,24 +40,7 @@ namespace comnet {
 
 			//Used to parse objects from stream (equivalent to ABSPacket::Unpack)
 			virtual void Output(ObjectStream& obj) = 0;
-
-			//Return a new instance of a derived class
-			virtual ObjSerializable* Create() = 0;
 		};
-
-		//Output operator for ObjSerializables
-		inline ObjectStream& operator<<(ObjectStream& os, const ObjSerializable& objSerializable)
-		{
-			objSerializable.Input(os);
-			return os;
-		}
-
-		//Input operator for ObjSerializables
-		inline ObjectStream& operator>>(ObjectStream& os, ObjSerializable& objSerializable)
-		{
-			objSerializable.Output(os);
-			return os;
-		}
 	}
 }
 #endif
diff --git a/CommProto/src/serialization/objectstream.cpp b/CommProto/src/serialization/objectstream.cpp
@@ -264,6 +264,12 @@ ObjectStream& ObjectStream::operator<<(const real64_t& data)
  return *this;
 }
 
+ObjectStream & comnet::serialization::ObjectStream::operator<<(const ObjSerializable & data)
+{
+	data.Input(*this);
+	return *this;
+}
+
 
 /*******************************************************/
 /*******************************************************/
@@ -463,5 +469,12 @@ ObjectStream& ObjectStream::operator>>(real64_t& data)
  }
  return *this;
 }
+
+
+ObjectStream & comnet::serialization::ObjectStream::operator>>(ObjSerializable & data)
+{
+	data.Output(*this);
+	return *this;
+}
 } // serialization.
 } // comnet.
+0 −8		PacketGen/template/templateObj.h
+0 −8		prebuilt/Ubuntu16_x32/templateObj.h
+0 −8		prebuilt/Windows10_x32/templateObj.h