X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fnet%2Fprotocol.cpp;fp=source%2Fnet%2Fprotocol.cpp;h=17e4310f5196c2f5c599cc103c8d8d5c6cf36430;hp=1be240221284a13ac5b8cbc17f83f810b3c93e0a;hb=2fbfce0c327c852d33c6713af646abf07b241108;hpb=c0b73c437d75a6fbf111969ea67c1d24586dbde7

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index 1be2402..17e4310 100644
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -69,7 +69,7 @@ size_t Protocol::get_packet_size(const char *buf, size_t size) const
 	return header.length;
 }
 
-UInt64 Protocol::get_hash() const
+uint64_t Protocol::get_hash() const
 {
 	string description;
 	for(PacketMap::const_iterator i=packet_id_defs.begin(); i!=packet_id_defs.end(); ++i)
@@ -107,25 +107,25 @@ const char *Protocol::BasicSerializer<T>::deserialize(T &value, const char *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;
-template char *Protocol::BasicSerializer<Int64>::serialize(const Int64 &, char *, char *) const;
-template char *Protocol::BasicSerializer<UInt8>::serialize(const UInt8 &, char *, char *) const;
-template char *Protocol::BasicSerializer<UInt16>::serialize(const UInt16 &, char *, char *) const;
-template char *Protocol::BasicSerializer<UInt32>::serialize(const UInt32 &, char *, char *) const;
-template char *Protocol::BasicSerializer<UInt64>::serialize(const UInt64 &, char *, char *) const;
+template char *Protocol::BasicSerializer<int8_t>::serialize(const int8_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<int16_t>::serialize(const int16_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<int32_t>::serialize(const int32_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<int64_t>::serialize(const int64_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<uint8_t>::serialize(const uint8_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<uint16_t>::serialize(const uint16_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<uint32_t>::serialize(const uint32_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<uint64_t>::serialize(const uint64_t &, 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;
-template const char *Protocol::BasicSerializer<Int64>::deserialize(Int64 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<UInt8>::deserialize(UInt8 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<UInt16>::deserialize(UInt16 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<UInt32>::deserialize(UInt32 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<UInt64>::deserialize(UInt64 &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<int8_t>::deserialize(int8_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<int16_t>::deserialize(int16_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<int32_t>::deserialize(int32_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<int64_t>::deserialize(int64_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<uint8_t>::deserialize(uint8_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<uint16_t>::deserialize(uint16_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<uint32_t>::deserialize(uint32_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<uint64_t>::deserialize(uint64_t &, const char *, const char *) const;
 template const char *Protocol::BasicSerializer<float>::deserialize(float &, const char *, const char *) const;
 template const char *Protocol::BasicSerializer<double>::deserialize(double &, const char *, const char *) const;
 
@@ -145,7 +145,7 @@ char *Protocol::StringSerializer::serialize(const string &str, char *buf, char *
 
 const char *Protocol::StringSerializer::deserialize(string &str, const char *buf, const char *end) const
 {
-	UInt16 length;
+	uint16_t length;
 	buf = length_serializer.deserialize(length, buf, end);
 	if(end-buf<static_cast<int>(length))
 		throw buffer_error("underflow");
@@ -166,7 +166,7 @@ Protocol::PacketHeader::PacketHeader():
 	length(0)
 { }
 
-Protocol::PacketHeader::PacketHeader(UInt16 t, UInt16 l):
+Protocol::PacketHeader::PacketHeader(uint16_t t, uint16_t l):
 	type(t),
 	length(l)
 { }