X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.h;h=fa90e6d250d87531fdc01069a90fe0cab6a90352;hb=6df110603b3a1248f52741e9d68d0bd032171b60;hp=e078caff57ac8569d36a1fd24b3e5e1f2686f8fe;hpb=c2eeb0da9f5e5de1b8de1bc66a42709e54d504e2;p=libs%2Fnet.git

diff --git a/source/net/protocol.h b/source/net/protocol.h
index e078caf..fa90e6d 100644
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -1,10 +1,10 @@
 #ifndef MSP_NET_PROTOCOL_H_
 #define MSP_NET_PROTOCOL_H_
 
+#include <cstdint>
 #include <map>
 #include <stdexcept>
 #include <vector>
-#include <msp/core/inttypes.h>
 #include "receiver.h"
 
 namespace Msp {
@@ -14,7 +14,6 @@ class bad_packet: public std::runtime_error
 {
 public:
 	bad_packet(const std::string &w): std::runtime_error(w) { }
-	virtual ~bad_packet() throw() { }
 };
 
 
@@ -22,14 +21,13 @@ class buffer_error: public std::runtime_error
 {
 public:
 	buffer_error(const std::string &w): std::runtime_error(w) { }
-	virtual ~buffer_error() throw() { }
 };
 
 
 class Protocol
 {
 private:
-	template<typename T, UInt8 K>
+	template<typename T, std::uint8_t K>
 	struct BasicTraits;
 
 	template<typename T>
@@ -76,7 +74,7 @@ private:
 		typedef std::string ValueType;
 
 	private:
-		BasicSerializer<UInt16> length_serializer;
+		BasicSerializer<std::uint16_t> length_serializer;
 
 	public:
 		StringSerializer(const Protocol &);
@@ -93,7 +91,7 @@ private:
 		typedef A ValueType;
 
 	private:
-		BasicSerializer<UInt16> length_serializer;
+		BasicSerializer<std::uint16_t> length_serializer;
 		typename Traits<typename A::value_type>::Serializer element_serializer;
 
 	public:
@@ -219,11 +217,11 @@ private:
 
 	struct PacketHeader
 	{
-		UInt16 type;
-		UInt16 length;
+		std::uint16_t type;
+		std::uint16_t length;
 
 		PacketHeader();
-		PacketHeader(UInt16, UInt16);
+		PacketHeader(std::uint16_t, std::uint16_t);
 	};
 
 	typedef std::map<unsigned, PacketDefBase *> PacketMap;
@@ -261,7 +259,7 @@ public:
 	std::size_t get_packet_size(const char *, std::size_t) const;
 	std::size_t dispatch(ReceiverBase &, const char *, std::size_t) const;
 
-	UInt64 get_hash() const;
+	std::uint64_t get_hash() const;
 
 private:
 	template<typename T>
@@ -305,7 +303,7 @@ std::size_t Protocol::serialize(const P &pkt, char *buf, std::size_t size) const
 template<typename T>
 std::string Protocol::get_type_signature()
 {
-	const UInt16 sig = Traits<T>::signature;
+	const std::uint16_t sig = Traits<T>::signature;
 	std::string result;
 	result += sig&0xFF;
 	if(sig>=0x100)
@@ -314,42 +312,42 @@ std::string Protocol::get_type_signature()
 }
 
 
-template<typename T, UInt8 K>
+template<typename T, std::uint8_t K>
 struct Protocol::BasicTraits
 {
-	static const UInt16 signature = K | (sizeof(T)<<8);
+	static const std::uint16_t signature = K | (sizeof(T)<<8);
 	typedef BasicSerializer<T> Serializer;
 };
 
 template<typename T>
 struct Protocol::Traits
 {
-	static const UInt16 signature = 'C';
+	static const std::uint16_t signature = 'C';
 	typedef CompoundSerializer<T> Serializer;
 };
 
 template<> struct Protocol::Traits<bool>: BasicTraits<bool, 'B'> { };
-template<> struct Protocol::Traits<Int8>: BasicTraits<Int8, 'I'> { };
-template<> struct Protocol::Traits<UInt8>: BasicTraits<UInt8, 'U'> { };
-template<> struct Protocol::Traits<Int16>: BasicTraits<Int16, 'I'> { };
-template<> struct Protocol::Traits<UInt16>: BasicTraits<UInt16, 'U'> { };
-template<> struct Protocol::Traits<Int32>: BasicTraits<Int32, 'I'> { };
-template<> struct Protocol::Traits<UInt32>: BasicTraits<UInt32, 'U'> { };
-template<> struct Protocol::Traits<Int64>: BasicTraits<Int64, 'I'> { };
-template<> struct Protocol::Traits<UInt64>: BasicTraits<UInt64, 'U'> { };
+template<> struct Protocol::Traits<std::int8_t>: BasicTraits<std::int8_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint8_t>: BasicTraits<std::uint8_t, 'U'> { };
+template<> struct Protocol::Traits<std::int16_t>: BasicTraits<std::int16_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint16_t>: BasicTraits<std::uint16_t, 'U'> { };
+template<> struct Protocol::Traits<std::int32_t>: BasicTraits<std::int32_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint32_t>: BasicTraits<std::uint32_t, 'U'> { };
+template<> struct Protocol::Traits<std::int64_t>: BasicTraits<std::int64_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint64_t>: BasicTraits<std::uint64_t, 'U'> { };
 template<> struct Protocol::Traits<float>: BasicTraits<float, 'F'> { };
 template<> struct Protocol::Traits<double>: BasicTraits<double, 'F'> { };
 
 template<> struct Protocol::Traits<std::string>
 {
-	static const UInt16 signature = 'S';
+	static const std::uint16_t signature = 'S';
 	typedef StringSerializer Serializer;
 };
 
 template<typename T>
 struct Protocol::Traits<std::vector<T> >
 {
-	static const UInt16 signature = 'A';
+	static const std::uint16_t signature = 'A';
 	typedef ArraySerializer<std::vector<T> > Serializer;
 };
 
@@ -403,7 +401,7 @@ char *Protocol::ArraySerializer<A>::serialize(const A &array, char *buf, char *e
 template<typename A>
 const char *Protocol::ArraySerializer<A>::deserialize(A &array, const char *buf, const char *end) const
 {
-	UInt16 length;
+	std::uint16_t length;
 	buf = length_serializer.deserialize(length, buf, end);
 	array.resize(length);
 	for(unsigned i=0; i<length; ++i)