From 5f312d842b55f53ac78ae2c658cab064debe74e6 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 9 Oct 2016 20:34:33 +0300
Subject: [PATCH] Some largely cosmetic touch-up

---
 source/net/communicator.cpp |  2 --
 source/net/protocol.h       | 29 ++++++++---------------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index 07c3be4..051e45a 100644
--- a/source/net/communicator.cpp
+++ b/source/net/communicator.cpp
@@ -116,9 +116,7 @@ void Communicator::data_available()
 		while(more)
 		{
 			if(handshake_status==2)
-			{
 				more = receive_packet(protocol, receiver);
-			}
 			else
 			{
 				HandshakeProtocol hsproto;
diff --git a/source/net/protocol.h b/source/net/protocol.h
index 0a8110c..7ff63cb 100644
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -48,10 +48,9 @@ private:
 	template<typename C, typename S>
 	struct CompoundDef: public CompoundTypeDef<C>
 	{
-		S *serializer;
+		S serializer;
 
 		CompoundDef(const S &);
-		virtual ~CompoundDef();
 
 		virtual std::string describe() const;
 		virtual char *serialize(const C &, char *, char *) const;
@@ -197,7 +196,7 @@ private:
 
 		const CompoundTypeDef<P> &get_compound() const { return *compound; }
 
-		virtual std::string describe() const;
+		virtual std::string describe() const { return compound->describe(); }
 		char *serialize(const P &, char *, char *) const;
 		const char *deserialize(P &, const char *, const char *) const;
 		virtual const char *dispatch(ReceiverBase &, const char *, const char *) const;
@@ -355,31 +354,25 @@ struct Protocol::Traits<std::vector<T> >
 
 template<typename C, typename S>
 Protocol::CompoundDef<C, S>::CompoundDef(const S &s):
-	serializer(new S(s))
+	serializer(s)
 { }
 
-template<typename C, typename S>
-Protocol::CompoundDef<C, S>::~CompoundDef()
-{
-	delete serializer;
-}
-
 template<typename C, typename S>
 std::string Protocol::CompoundDef<C, S>::describe() const
 {
-	return "{"+serializer->describe()+"}";
+	return "{"+serializer.describe()+"}";
 }
 
 template<typename C, typename S>
 char *Protocol::CompoundDef<C, S>::serialize(const C &com, char *buf, char *end) const
 {
-	return serializer->serialize(com, buf, end);
+	return serializer.serialize(com, buf, end);
 }
 
 template<typename C, typename S>
 const char *Protocol::CompoundDef<C, S>::deserialize(C &com, const char *buf, const char *end) const
 {
-	return serializer->deserialize(com, buf, end);
+	return serializer.deserialize(com, buf, end);
 }
 
 
@@ -448,14 +441,14 @@ std::string Protocol::Serializer<P, Head, S>::describe() const
 }
 
 template<typename P, typename Head, typename S>
-char * Protocol::Serializer<P, Head, S>::serialize(const P &pkt, char *buf, char *end) const
+char *Protocol::Serializer<P, Head, S>::serialize(const P &pkt, char *buf, char *end) const
 {
 	buf = Head::serialize(pkt, buf, end);
 	return ser.serialize(pkt.*ptr, buf, end);
 }
 
 template<typename P, typename Head, typename S>
-const char * Protocol::Serializer<P, Head, S>::deserialize(P &pkt, const char *buf, const char *end) const
+const char *Protocol::Serializer<P, Head, S>::deserialize(P &pkt, const char *buf, const char *end) const
 {
 	buf = Head::deserialize(pkt, buf, end);
 	return ser.deserialize(pkt.*ptr, buf, end);
@@ -488,12 +481,6 @@ void Protocol::PacketTypeDef<P>::set_serializer(const S &ser)
 	compound = new CompoundDef<P, S>(ser);
 }
 
-template<typename P>
-std::string Protocol::PacketTypeDef<P>::describe() const
-{
-	return compound->describe();
-}
-
 template<typename P>
 char *Protocol::PacketTypeDef<P>::serialize(const P &pkt, char *buf, char *end) const
 {
-- 
2.43.0