Allow std::byte serialization

MarcoFalke · MarcoFalke · commit fac6af16f4a2 · 2023-06-30T12:09:45.000+02:00
diff --git a/src/serialize.h b/src/serialize.h
@@ -192,6 +192,7 @@ template<typename X> const X& ReadWriteAsHelper(const X& x) { return x; }
 #ifndef CHAR_EQUALS_INT8
 template <typename Stream> void Serialize(Stream&, char) = delete; // char serialization forbidden. Use uint8_t or int8_t
 #endif
+template <typename Stream> void Serialize(Stream& s, std::byte a) { ser_writedata8(s, uint8_t(a)); }
 template<typename Stream> inline void Serialize(Stream& s, int8_t a  ) { ser_writedata8(s, a); }
 template<typename Stream> inline void Serialize(Stream& s, uint8_t a ) { ser_writedata8(s, a); }
 template<typename Stream> inline void Serialize(Stream& s, int16_t a ) { ser_writedata16(s, a); }
@@ -207,6 +208,7 @@ template <typename Stream, typename B> void Serialize(Stream& s, Span<B> span) {
 #ifndef CHAR_EQUALS_INT8
 template <typename Stream> void Unserialize(Stream&, char) = delete; // char serialization forbidden. Use uint8_t or int8_t
 #endif
+template <typename Stream> void Unserialize(Stream& s, std::byte& a) { a = std::byte{ser_readdata8(s)}; }
 template<typename Stream> inline void Unserialize(Stream& s, int8_t& a  ) { a = ser_readdata8(s); }
 template<typename Stream> inline void Unserialize(Stream& s, uint8_t& a ) { a = ser_readdata8(s); }
 template<typename Stream> inline void Unserialize(Stream& s, int16_t& a ) { a = ser_readdata16(s); }
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
@@ -244,11 +244,13 @@ BOOST_AUTO_TEST_CASE(class_methods)
     {
         DataStream ds;
         const std::string in{"ab"};
-        ds << Span{in};
+        ds << Span{in} << std::byte{'c'};
         std::array<std::byte, 2> out;
-        ds >> Span{out};
+        std::byte out_3;
+        ds >> Span{out} >> out_3;
         BOOST_CHECK_EQUAL(out.at(0), std::byte{'a'});
         BOOST_CHECK_EQUAL(out.at(1), std::byte{'b'});
+        BOOST_CHECK_EQUAL(out_3, std::byte{'c'});
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -244,11 +244,13 @@ BOOST_AUTO_TEST_CASE(class_methods)`
`244`	`244`	`{`
`245`	`245`	`DataStream ds;`
`246`	`246`	`const std::string in{"ab"};`
`247`		`- ds << Span{in};`
	`247`	`+ ds << Span{in} << std::byte{'c'};`
`248`	`248`	`std::array<std::byte, 2> out;`
`249`		`- ds >> Span{out};`
	`249`	`+ std::byte out_3;`
	`250`	`+ ds >> Span{out} >> out_3;`
`250`	`251`	`BOOST_CHECK_EQUAL(out.at(0), std::byte{'a'});`
`251`	`252`	`BOOST_CHECK_EQUAL(out.at(1), std::byte{'b'});`
	`253`	`+ BOOST_CHECK_EQUAL(out_3, std::byte{'c'});`
`252`	`254`	`}`
`253`	`255`	`}`
`254`	`256`