Fix order of types in bit_reader.serialize

Add enable_if to bit_reader.serialize
Add some more meta type_traits

Author: KredeGC

include/bitstream/stream/bit_reader.h

@@ -315,11 +315,9 @@ namespace bitstream
 		 * @param ...args The arguments to pass to the serialize function
 		 * @return Whether successful or not
 		*/
-		template<typename Trait, typename... Args>
-		[[nodiscard]] bool serialize(Args&&... args) noexcept(utility::is_noexcept_serialize_v<Trait, bit_reader, Args...>)
+		template<typename Trait, typename... Args, typename = utility::has_serialize_t<Trait, bit_reader, Args...>>
+		[[nodiscard]] bool serialize(Args&&... args) noexcept(utility::is_serialize_noexcept_v<Trait, bit_reader, Args...>)
 		{
-			static_assert(utility::has_serialize_v<Trait, bit_reader, Args...>, "Could not find serializable trait for the given type. Remember to specialize serializable_traits<> with the given type");
-
 			return serialize_traits<Trait>::serialize(*this, std::forward<Args>(args)...);
 		}
 
@@ -333,14 +331,10 @@ namespace bitstream
 		 * @param ...args The rest of the arguments to pass to the serialize function
 		 * @return Whether successful or not
 		*/
-		template<typename Trait, typename... Args>
-		[[nodiscard]] bool serialize(Trait&& arg, Args&&... args) noexcept(utility::is_noexcept_serialize_v<utility::deduce_trait_t<Trait, bit_reader, Args...>, bit_reader, Trait, Args...>)
+		template<typename... Args, typename Trait, typename = utility::has_deduce_serialize_t<Trait, bit_reader, Args...>>
+		[[nodiscard]] bool serialize(Trait&& arg, Args&&... args) noexcept(utility::is_deduce_serialize_noexcept_v<Trait, bit_reader, Args...>)
 		{
-			using deduce_t = utility::deduce_trait_t<Trait, bit_reader, Args...>;
-
-			static_assert(utility::has_serialize_v<deduce_t, bit_reader, Trait, Args...>, "Could not deduce serializable trait for the given arguments. Remember to specialize serializable_traits<> with the given type");
-
-			return serialize_traits<deduce_t>::serialize(*this, std::forward<Trait>(arg), std::forward<Args>(args)...);
+			return serialize_traits<utility::deduce_trait_t<Trait, bit_reader, Args...>>::serialize(*this, std::forward<Trait>(arg), std::forward<Args>(args)...);
 		}
 
 	private:

include/bitstream/stream/bit_writer.h

@@ -373,10 +373,8 @@ namespace bitstream
 		 * @return Whether successful or not
 		*/
 		template<typename Trait, typename... Args, typename = utility::has_serialize_t<Trait, bit_writer, Args...>>
-		[[nodiscard]] bool serialize(Args&&... args) noexcept(utility::is_noexcept_serialize_v<Trait, bit_writer, Args...>)
+		[[nodiscard]] bool serialize(Args&&... args) noexcept(utility::is_serialize_noexcept_v<Trait, bit_writer, Args...>)
 		{
-			static_assert(utility::has_serialize_v<Trait, bit_writer, Args...>, "Could not find serializable trait for the given type. Remember to specialize serializable_traits<> with the given type");
-
 			return serialize_traits<Trait>::serialize(*this, std::forward<Args>(args)...);
 		}
 
@@ -391,13 +389,9 @@ namespace bitstream
 		 * @return Whether successful or not
 		*/
 		template<typename... Args, typename Trait, typename = utility::has_deduce_serialize_t<Trait, bit_writer, Args...>>
-		[[nodiscard]] bool serialize(Trait&& arg, Args&&... args) noexcept(utility::is_noexcept_serialize_v<utility::deduce_trait_t<Trait, bit_writer, Args...>, bit_writer, Trait, Args...>)
+		[[nodiscard]] bool serialize(Trait&& arg, Args&&... args) noexcept(utility::is_deduce_serialize_noexcept_v<Trait, bit_writer, Args...>)
 		{
-			using deduce_t = utility::deduce_trait_t<Trait, bit_writer, Args...>;
-
-			static_assert(utility::has_serialize_v<deduce_t, bit_writer, Trait, Args...>, "Could not deduce serializable trait for the given arguments. Remember to specialize serializable_traits<> with the given type");
-
-			return serialize_traits<deduce_t>::serialize(*this, std::forward<Trait>(arg), std::forward<Args>(args)...);
+			return serialize_traits<utility::deduce_trait_t<Trait, bit_writer, Args...>>::serialize(*this, std::forward<Trait>(arg), std::forward<Args>(args)...);
 		}
 
 	private:

include/bitstream/utility/meta.h

@@ -22,14 +22,14 @@ namespace bitstream::utility
 
 	// Check if type is noexcept, if it exists
 	template<typename Void, typename T, typename Stream, typename... Args>
-	struct is_noexcept_serialize : std::false_type {};
+	struct is_serialize_noexcept : std::false_type {};
 
 	template<typename T, typename Stream, typename... Args>
-	struct is_noexcept_serialize<std::enable_if_t<has_serialize_v<T, Stream, Args...>>, T, Stream, Args...> :
+	struct is_serialize_noexcept<std::enable_if_t<has_serialize_v<T, Stream, Args...>>, T, Stream, Args...> :
 		std::bool_constant<noexcept(serialize_traits<T>::serialize(std::declval<Stream&>(), std::declval<Args>()...))> {};
 
 	template<typename T, typename Stream, typename... Args>
-	constexpr bool is_noexcept_serialize_v = is_noexcept_serialize<void, T, Stream, Args...>::value;
+	constexpr bool is_serialize_noexcept_v = is_serialize_noexcept<void, T, Stream, Args...>::value;
 
 
 	// Get the underlying type without &, &&, * or const
@@ -41,7 +41,7 @@ namespace bitstream::utility
 	template<typename Void, typename Trait, typename Stream, typename... Args>
 	struct deduce_trait
 	{
-		using type = void;
+		using type = Trait;
 	};
 
 	// Non-const value
@@ -87,6 +87,11 @@ namespace bitstream::utility
 	template<typename Trait, typename Stream, typename... Args>
 	using deduce_trait_t = typename deduce_trait<void, Trait, Stream, Args...>::type;
 
+
+	// Shorthands for deduced type_traits
 	template<typename Trait, typename Stream, typename... Args>
 	using has_deduce_serialize_t = has_serialize_t<deduce_trait_t<Trait, Stream, Args...>, Stream, Trait, Args...>;
+
+	template<typename Trait, typename Stream, typename... Args>
+	constexpr bool is_deduce_serialize_noexcept_v = is_serialize_noexcept_v<deduce_trait_t<Trait, Stream, Args...>, Stream, Trait, Args...>;
 }