@@ -587,8 +587,8 @@ namespace msgpack23 {
587
587
588
588
[[nodiscard]] std::size_t unpack_map_header () {
589
589
std::size_t map_size = 0 ;
590
- if (read_conditional<FormatConstants::map32, std::uint32_t >(map_size)) {
591
- } else if ( read_conditional<FormatConstants::map16, std::uint16_t >(map_size)) {
590
+ if (read_conditional<FormatConstants::map32, std::uint32_t >(map_size)
591
+ or read_conditional<FormatConstants::map16, std::uint16_t >(map_size)) {
592
592
} else {
593
593
map_size = std::to_integer<std::size_t >(current () & static_cast <std::byte>(0b00001111 ));
594
594
increment ();
@@ -598,8 +598,8 @@ namespace msgpack23 {
598
598
599
599
[[nodiscard]] std::size_t unpack_array_header () {
600
600
std::size_t array_size = 0 ;
601
- if (read_conditional<FormatConstants::array32, std::uint32_t >(array_size)) {
602
- } else if ( read_conditional<FormatConstants::array16, std::uint16_t >(array_size)) {
601
+ if (read_conditional<FormatConstants::array32, std::uint32_t >(array_size)
602
+ or read_conditional<FormatConstants::array16, std::uint16_t >(array_size)) {
603
603
} else {
604
604
array_size = std::to_integer<std::size_t >(current () & static_cast <std::byte>(0b00001111 ));
605
605
increment ();
@@ -745,7 +745,7 @@ namespace msgpack23 {
745
745
}
746
746
case FormatConstants::ext8: {
747
747
increment ();
748
- auto const _ = read_integral<std::uint8_t >();
748
+ [[maybe_unused]] auto const size = read_integral<std::uint8_t >();
749
749
if (static_cast <std::int8_t >(current ()) == -1 ) {
750
750
increment ();
751
751
auto const nano_seconds = read_integral<std::uint32_t >();
@@ -999,9 +999,9 @@ namespace msgpack23 {
999
999
1000
1000
void unpack_type (std::string &value) {
1001
1001
std::size_t str_size = 0 ;
1002
- if (read_conditional<FormatConstants::str32, std::uint32_t >(str_size)) {
1003
- } else if ( read_conditional<FormatConstants::str16, std::uint16_t >(str_size)) {
1004
- } else if ( read_conditional<FormatConstants::str8, std::uint8_t >(str_size)) {
1002
+ if (read_conditional<FormatConstants::str32, std::uint32_t >(str_size)
1003
+ or read_conditional<FormatConstants::str16, std::uint16_t >(str_size)
1004
+ or read_conditional<FormatConstants::str8, std::uint8_t >(str_size)) {
1005
1005
} else {
1006
1006
str_size = std::to_integer<std::size_t >(current () & static_cast <std::byte>(0b00011111 ));
1007
1007
increment ();
@@ -1015,9 +1015,9 @@ namespace msgpack23 {
1015
1015
1016
1016
void unpack_type (std::vector<std::uint8_t > &value) {
1017
1017
std::size_t bin_size = 0 ;
1018
- if (read_conditional<FormatConstants::bin32, std::uint32_t >(bin_size)) {
1019
- } else if ( read_conditional<FormatConstants::bin16, std::uint16_t >(bin_size)) {
1020
- } else if ( read_conditional<FormatConstants::bin8, std::uint8_t >(bin_size)) {
1018
+ if (read_conditional<FormatConstants::bin32, std::uint32_t >(bin_size)
1019
+ or read_conditional<FormatConstants::bin16, std::uint16_t >(bin_size)
1020
+ or read_conditional<FormatConstants::bin8, std::uint8_t >(bin_size)) {
1021
1021
} else {
1022
1022
throw std::logic_error (" Unexpected value" );
1023
1023
}
0 commit comments