Prefer range-based for loops where possible

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

diff --git a/source/net/protocol.h b/source/net/protocol.h
index cd68d5148735024eaa77f9ef1ebe06a16064de72..9f09fe5a1c7e9eda0ece48162254c8f5484fa80f 100644 (file)
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -36,7 +36,7 @@ private:
        template<typename C>
        struct CompoundTypeDef
        {
-               virtual ~CompoundTypeDef() { }
+               virtual ~CompoundTypeDef() = default;
 
                virtual std::string describe() const = 0;
                virtual char *serialize(const C &, char *, char *) const = 0;
@@ -50,9 +50,9 @@ private:
 
                CompoundDef(const S &);
 
-               virtual std::string describe() const;
-               virtual char *serialize(const C &, char *, char *) const;
-               virtual const char *deserialize(C &, const char *, const char *) const;
+               std::string describe() const override;
+               char *serialize(const C &, char *, char *) const override;
+               const char *deserialize(C &, const char *, const char *) const override;
        };
 
        template<typename T>
@@ -165,7 +165,8 @@ private:
 
                PacketDefBase(unsigned);
        public:
-               virtual ~PacketDefBase() { }
+               virtual ~PacketDefBase() = default;
+
                virtual unsigned get_class_id() const = 0;
                unsigned get_id() const { return id; }
                virtual std::string describe() const = 0;
@@ -182,17 +183,17 @@ private:
                PacketTypeDef(unsigned);
                ~PacketTypeDef();
 
-               virtual unsigned get_class_id() const { return get_packet_class_id<P>(); }
+               unsigned get_class_id() const override { return get_packet_class_id<P>(); }
 
                template<typename S>
                void set_serializer(const S &);
 
                const CompoundTypeDef<P> &get_compound() const { return *compound; }
 
-               virtual std::string describe() const { return compound->describe(); }
+               std::string describe() const override { 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;
+               const char *dispatch(ReceiverBase &, const char *, const char *) const override;
        };
 
        template<typename P, typename S>
@@ -400,8 +401,8 @@ template<typename A>
 char *Protocol::ArraySerializer<A>::serialize(const A &array, char *buf, char *end) const
 {
        buf = length_serializer.serialize(array.size(), buf, end);
-       for(typename A::const_iterator i=array.begin(); i!=array.end(); ++i)
-               buf = element_serializer.serialize(*i, buf, end);
+       for(const auto &e: array)
+               buf = element_serializer.serialize(e, buf, end);
        return buf;
 }