X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.cpp;h=1be240221284a13ac5b8cbc17f83f810b3c93e0a;hb=13c6c5f4431aeeb3432c8692bc18990db0a3283f;hp=52678af2d9009cf9279d88ce3e1856d0fee1be9b;hpb=8248f2912454229f4ded72b8fb4db3e76ea3ad15;p=libs%2Fnet.git

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index 52678af..1be2402 100644
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -49,7 +49,7 @@ const Protocol::PacketDefBase &Protocol::get_packet_by_id(unsigned id) const
 	return *get_item(packet_id_defs, id);
 }
 
-unsigned Protocol::dispatch(ReceiverBase &rcv, const char *buf, unsigned size) const
+size_t Protocol::dispatch(ReceiverBase &rcv, const char *buf, size_t size) const
 {
 	PacketHeader header;
 	buf = header_def.deserialize(header, buf, buf+size);
@@ -60,7 +60,7 @@ unsigned Protocol::dispatch(ReceiverBase &rcv, const char *buf, unsigned size) c
 	return ptr-buf;
 }
 
-unsigned Protocol::get_packet_size(const char *buf, unsigned size) const
+size_t Protocol::get_packet_size(const char *buf, size_t size) const
 {
 	if(size<4)
 		return 0;
@@ -74,7 +74,7 @@ UInt64 Protocol::get_hash() const
 	string description;
 	for(PacketMap::const_iterator i=packet_id_defs.begin(); i!=packet_id_defs.end(); ++i)
 		description += format("%d:%s\n", i->first, i->second->describe());
-	return hash64(description);
+	return hash<64>(description);
 }
 
 
@@ -87,7 +87,7 @@ char *Protocol::BasicSerializer<T>::serialize(const T &value, char *buf, char *e
 		throw buffer_error("overflow");
 
 	const char *ptr = reinterpret_cast<const char *>(&value)+sizeof(T);
-	for(unsigned i=0; i<sizeof(T); ++i)
+	for(size_t i=0; i<sizeof(T); ++i)
 		*buf++ = *--ptr;
 
 	return buf;
@@ -100,12 +100,13 @@ const char *Protocol::BasicSerializer<T>::deserialize(T &value, const char *buf,
 		throw buffer_error("underflow");
 
 	char *ptr = reinterpret_cast<char *>(&value)+sizeof(T);
-	for(unsigned i=0; i<sizeof(T); ++i)
+	for(size_t i=0; i<sizeof(T); ++i)
 		*--ptr = *buf++;
 
 	return buf;
 }
 
+template char *Protocol::BasicSerializer<bool>::serialize(const bool &, char *, char *) const;
 template char *Protocol::BasicSerializer<Int8>::serialize(const Int8 &, char *, char *) const;
 template char *Protocol::BasicSerializer<Int16>::serialize(const Int16 &, char *, char *) const;
 template char *Protocol::BasicSerializer<Int32>::serialize(const Int32 &, char *, char *) const;
@@ -116,6 +117,7 @@ template char *Protocol::BasicSerializer<UInt32>::serialize(const UInt32 &, char
 template char *Protocol::BasicSerializer<UInt64>::serialize(const UInt64 &, char *, char *) const;
 template char *Protocol::BasicSerializer<float>::serialize(const float &, char *, char *) const;
 template char *Protocol::BasicSerializer<double>::serialize(const double &, char *, char *) const;
+template const char *Protocol::BasicSerializer<bool>::deserialize(bool &, const char *, const char *) const;
 template const char *Protocol::BasicSerializer<Int8>::deserialize(Int8 &, const char *, const char *) const;
 template const char *Protocol::BasicSerializer<Int16>::deserialize(Int16 &, const char *, const char *) const;
 template const char *Protocol::BasicSerializer<Int32>::deserialize(Int32 &, const char *, const char *) const;