X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fnet%2Fprotocol.h;fp=source%2Fnet%2Fprotocol.h;h=35d3cb2cbfe177de4214816d70643f9ff97e32bd;hp=ae1c3c010c0671a8c88968b359220f9142449a92;hb=1565dec0f4a86e4bda7095dd7415234f7c7a84e9;hpb=e900bb4a8fe086fac55ffe51c75915be0003c5e4

diff --git a/source/net/protocol.h b/source/net/protocol.h
index ae1c3c0..35d3cb2 100644
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -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
@@ -209,9 +212,15 @@ 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;
 
@@ -455,7 +464,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);