a

2 files changed, 10 insertions, 9 deletions

diff --git a/serialize/packbits-write.cpp b/serialize/packbits-write.cpp
index 76b1398a..85130c12 100644
--- a/serialize/packbits-write.cpp
+++ b/serialize/packbits-write.cpp
@@ -13,7 +13,8 @@ static_assert(count_bits<u8, std::tuple<>> == 0);
 //static_assert(count_bits<u8, std::tuple< f8<9> >> == 0);
 //static_assert(count_bits<u8, std::tuple< f8<7>, f8<2> >> == 9);
 
-template u32 write_(output<u32, 32>, std::index_sequence<0>, const std::tuple<f32<1>>&);
+template u32 write_(const std::tuple<f32<1>>&, output<u32, 32>, output_bits<32>, std::index_sequence<0>);
+static_assert(write_(std::tuple<output_field<u32, 13>>{4242}, output<u32, 32>{0}, output_bits<32>{}, std::index_sequence<0>{}) == 4242);
 
 static_assert(output<u32, 32>::next<1>::Capacity == 31);
 static_assert(output<u32, 32>::next<1>::next<2>::Capacity == 29);
diff --git a/serialize/packbits-write.hpp b/serialize/packbits-write.hpp
index 8bcd14af..a0ebe2ff 100644
--- a/serialize/packbits-write.hpp
+++ b/serialize/packbits-write.hpp
@@ -58,8 +58,8 @@ struct output_field
 
 template<std::unsigned_integral Type, typename Tuple> struct count_bits_;
 
-
-template<std::unsigned_integral Int, size_t N, typename... Ts> struct count_bits_<Int, std::tuple<output_field<Int, N>, Ts...>>
+template<std::unsigned_integral Int, size_t N, typename... Ts>
+struct count_bits_<Int, std::tuple<output_field<Int, N>, Ts...>>
 {
     static constexpr size_t length = N + count_bits_<Int, std::tuple<Ts...>>::length;
     static_assert(length <= sizeof(Int)*8);
@@ -78,20 +78,20 @@ constexpr std::index_sequence<sizeof...(Is)-1uz-Is...> reverse_index_sequence(st
 template <std::size_t N>
 using make_reverse_index_sequence = decltype(reverse_index_sequence(std::make_index_sequence<N>{}));
 
-template<typename T, size_t Left, size_t I, size_t... Is, typename Tuple>
-constexpr T write_(output<T, Left> st, std::index_sequence<I, Is...>, const Tuple& tuple)
+template<typename T, size_t Capacity, size_t Left, size_t I, size_t... Is, typename Tuple>
+constexpr T write_(const Tuple& tuple, output<T, Left> st, output_bits<Capacity>, std::index_sequence<I, Is...>)
 {
     constexpr size_t N = std::tuple_element_t<I, Tuple>::Length;
-    if constexpr(Left != sizeof(T)*8)
-        st.value <<= N;
+    static_assert(Capacity <= sizeof(T)*8);
+    static_assert(Left <= Capacity);
     T x = std::get<I>(tuple).value;
     T value = st.set(x, output_bits<N>{});
     using next = typename output<T, Left>::template next<N>;
-    return write_(next{value}, std::index_sequence<Is...>{}, tuple);
+    return write_(tuple, next{value}, std::index_sequence<Is...>{});
 }
 
 template<typename T, size_t Left, typename Tuple>
-constexpr T write_(output<T, Left> st, std::index_sequence<>, const Tuple&)
+constexpr T write_(const Tuple&, output<T, Left> st, std::index_sequence<>)
 {
     return st.value;
 }