diff --git a/src/serialize.h b/src/serialize.h --- a/src/serialize.h +++ b/src/serialize.h @@ -152,8 +152,7 @@ SER_GETHASH = (1 << 2), }; -#define READWRITE(obj) (::SerReadWrite(s, (obj), ser_action)) -#define READWRITEMANY(...) (::SerReadWriteMany(s, ser_action, __VA_ARGS__)) +#define READWRITE(...) (::SerReadWriteMany(s, ser_action, __VA_ARGS__)) /** * Implement three methods for serializable objects. These are actually wrappers @@ -825,17 +824,6 @@ constexpr bool ForRead() const { return true; } }; -template -inline void SerReadWrite(Stream &s, const T &obj, - CSerActionSerialize ser_action) { - ::Serialize(s, obj); -} - -template -inline void SerReadWrite(Stream &s, T &obj, CSerActionUnserialize ser_action) { - ::Unserialize(s, obj); -} - /** * ::GetSerializeSize implementations * @@ -877,11 +865,6 @@ template void SerializeMany(Stream &s) {} -template -void SerializeMany(Stream &s, Arg &&arg) { - ::Serialize(s, std::forward(arg)); -} - template void SerializeMany(Stream &s, Arg &&arg, Args &&... args) { ::Serialize(s, std::forward(arg)); @@ -890,11 +873,6 @@ template inline void UnserializeMany(Stream &s) {} -template -inline void UnserializeMany(Stream &s, Arg &arg) { - ::Unserialize(s, arg); -} - template inline void UnserializeMany(Stream &s, Arg &arg, Args &... args) { ::Unserialize(s, arg); diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp --- a/src/test/serialize_tests.cpp +++ b/src/test/serialize_tests.cpp @@ -57,7 +57,7 @@ template inline void SerializationOp(Stream &s, Operation ser_action) { - READWRITEMANY(intval, boolval, stringval, FLATDATA(charstrval), txval); + READWRITE(intval, boolval, stringval, FLATDATA(charstrval), txval); } };