From 27724704d749f16eb93a472828d98457b78e8bd8 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 5 Jul 2020 23:34:32 +0000
Subject: [PATCH] Use deduction guides to remove one layer of serial forwarding

---
 common/include/serial.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/include/serial.h b/common/include/serial.h
index 701b1e139..3d15f3128 100644
--- a/common/include/serial.h
+++ b/common/include/serial.h
@@ -320,8 +320,8 @@ static inline detail::sign_extend_type<extended_signed_type, wrapped_type> sign_
 	}	\
 	\
 	__attribute_unused	\
-	static inline auto udt_to_message(TYPE &NAME) -> decltype(serial::make_message MEMBERLIST) { \
-		return serial::make_message MEMBERLIST;	\
+	static inline auto udt_to_message(TYPE &NAME) { \
+		return serial::message MEMBERLIST;	\
 	}
 
 #define DEFINE_SERIAL_CONST_UDT_TO_MESSAGE(TYPE, NAME, MEMBERLIST)	\
@@ -485,10 +485,7 @@ public:
 };
 
 template <typename... Args>
-static inline message<Args &&...> make_message(Args &&... args)
-{
-	return {std::forward<Args>(args)...};
-}
+message(Args &&... args) -> message<Args && ...>;
 
 #define SERIAL_DEFINE_SIZE_SPECIFIC_USWAP_BUILTIN(HBITS,BITS)	\
 	static inline constexpr uint##BITS##_t bswap(const uint##BITS##_t &u)	\