Prefer range-based for loops where possible

[libs/net.git] / source / net / protocol.cpp

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index 52678af2d9009cf9279d88ce3e1856d0fee1be9b..9cba6382d307dcae861d3f4298c76ee4f86ac09b 100644 (file)
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -5,7 +5,6 @@
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include "protocol.h"
-#include "protocol_impl.h"
 
 using namespace std;
 
@@ -22,8 +21,14 @@ Protocol::Protocol(unsigned npi):
 
 Protocol::~Protocol()
 {
-       for(map<unsigned, PacketDefBase *>::iterator i=packet_class_defs.begin(); i!=packet_class_defs.end(); ++i)
-               delete i->second;
+       for(auto &kvp: packet_class_defs)
+               delete kvp.second;
+}
+
+unsigned Protocol::get_next_packet_class_id()
+{
+       static unsigned next_id = 1;
+       return next_id++;
 }
 
 void Protocol::add_packet(PacketDefBase *pdef)
@@ -49,7 +54,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 +65,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;
@@ -69,12 +74,12 @@ unsigned Protocol::get_packet_size(const char *buf, unsigned 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)
-               description += format("%d:%s\n", i->first, i->second->describe());
-       return hash64(description);
+       for(auto &kvp: packet_id_defs)
+               description += format("%d:%s\n", kvp.first, kvp.second->describe());
+       return hash<64>(description);
 }
 
 
@@ -87,7 +92,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,30 +105,32 @@ 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<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<bool>::serialize(const bool &, 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<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<bool>::deserialize(bool &, 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;
 
@@ -143,7 +150,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");
@@ -152,8 +159,6 @@ const char *Protocol::StringSerializer::deserialize(string &str, const char *buf
 }
 
 
-unsigned Protocol::PacketDefBase::next_class_id = 1;
-
 Protocol::PacketDefBase::PacketDefBase(unsigned i):
        id(i)
 { }
@@ -164,7 +169,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)
 { }