Use std::unique_ptr for owning pointers

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

diff --git a/source/net/protocol.h b/source/net/protocol.h
index ae1c3c010c0671a8c88968b359220f9142449a92..f040a69ef1293665b3f38c79387706c04bf75e05 100644 (file)
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -3,6 +3,7 @@
 
 #include <cstdint>
 #include <map>
+#include <memory>
 #include <stdexcept>
 #include <vector>
 #include <msp/core/hash.h>
@@ -142,11 +143,10 @@ private:
        class PacketTypeDef: public PacketDefBase
        {
        private:
-               Serializer<P> *serializer;
+               std::unique_ptr<Serializer<P>> serializer;
 
        public:
                PacketTypeDef(unsigned);
-               ~PacketTypeDef();
 
                unsigned get_class_id() const override { return get_packet_class_id<P>(); }
 
@@ -171,9 +171,12 @@ private:
 
        public:
                PacketDefBuilder(const Protocol &, PacketTypeDef<P> &, const S &);
-               
+
                template<typename T>
-               PacketDefBuilder<P, typename S::template Next<T>> operator()(T P::*);
+               PacketDefBuilder<P, typename S::template Next<T>> fields(T P::*);
+
+               template<typename T1, typename T2, typename... Rest>
+               auto fields(T1 P::*first, T2 P::*second, Rest P::*...rest) { return fields(first).fields(second, rest...); }
        };
 
        struct PacketHeader
@@ -185,17 +188,13 @@ private:
                PacketHeader(std::uint16_t, std::uint16_t);
        };
 
-       typedef std::map<unsigned, PacketDefBase *> PacketMap;
-
        PacketTypeDef<PacketHeader> header_def;
        unsigned next_packet_id;
-       PacketMap packet_class_defs;
-       PacketMap packet_id_defs;
+       std::map<unsigned, std::unique_ptr<PacketDefBase>> packet_class_defs;
+       std::map<unsigned, PacketDefBase *> packet_id_defs;
 
 protected:
        Protocol(unsigned = 1);
-public:
-       ~Protocol();
 
 private:
        static unsigned get_next_packet_class_id();
@@ -203,15 +202,21 @@ private:
        template<typename P>
        static unsigned get_packet_class_id();
 
-       void add_packet(PacketDefBase *);
+       void add_packet(std::unique_ptr<PacketDefBase>);
 
 protected:
        template<typename P>
        PacketDefBuilder<P, Serializer<P>> add(unsigned);
 
+       template<typename P, typename T, typename... Rest>
+       auto add(unsigned id, T P::*field, Rest P::*...rest) { return add<P>(id).fields(field, rest...); }
+
        template<typename P>
        PacketDefBuilder<P, Serializer<P>> add();
 
+       template<typename P, typename T, typename... Rest>
+       auto add(T P::*field, Rest P::*...rest) { return add<P>().fields(field, rest...); }
+
        const PacketDefBase &get_packet_by_class_id(unsigned) const;
        const PacketDefBase &get_packet_by_id(unsigned) const;
 
@@ -239,9 +244,10 @@ unsigned Protocol::get_packet_class_id()
 template<typename P>
 Protocol::PacketDefBuilder<P, Protocol::Serializer<P>> Protocol::add(unsigned id)
 {
-       PacketTypeDef<P> *pdef = new PacketTypeDef<P>(id);
-       add_packet(pdef);
-       return PacketDefBuilder<P, Serializer<P>>(*this, *pdef, Serializer<P>());
+       std::unique_ptr<PacketTypeDef<P>> pdef = std::make_unique<PacketTypeDef<P>>(id);
+       PacketDefBuilder<P, Serializer<P>> next(*this, *pdef, Serializer<P>());
+       add_packet(move(pdef));
+       return next;
 }
 
 template<typename P>
@@ -404,21 +410,14 @@ const char *Protocol::FieldSerializer<C, Head, T>::deserialize(C &com, const cha
 template<typename P>
 Protocol::PacketTypeDef<P>::PacketTypeDef(unsigned i):
        PacketDefBase(i),
-       serializer(new Serializer<P>)
+       serializer(std::make_unique<Serializer<P>>())
 { }
 
-template<typename P>
-Protocol::PacketTypeDef<P>::~PacketTypeDef()
-{
-       delete serializer;
-}
-
 template<typename P>
 template<typename S>
 void Protocol::PacketTypeDef<P>::set_serializer(const S &ser)
 {
-       delete serializer;
-       serializer = new S(ser);
+       serializer = std::make_unique<S>(ser);
 }
 
 template<typename P>
@@ -455,7 +454,7 @@ Protocol::PacketDefBuilder<P, S>::PacketDefBuilder(const Protocol &p, PacketType
 
 template<typename P, typename S>
 template<typename T>
-Protocol::PacketDefBuilder<P, typename S::template Next<T>> Protocol::PacketDefBuilder<P, S>::operator()(T P::*ptr)
+Protocol::PacketDefBuilder<P, typename S::template Next<T>> Protocol::PacketDefBuilder<P, S>::fields(T P::*ptr)
 {
        typename S::template Next<T> next_ser(serializer, ptr, protocol);
        pktdef.set_serializer(next_ser);