amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-30 03:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Select the BON8 float prefix by type

Browse Source 
get_bon8_float_prefix only depends on the type of its argument, so make
the type a template parameter instead of passing an unused value.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-25 17:55:20 +02:00
parent 9f7c0f3ea7
commit 2994bcd9e2
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/output/binary_writer.hpp
+6 -9
View File
@@ -1447,14 +1447,11 @@ class binary_writer
return to_char_type(0xCB); // float 64
}
static constexpr CharType get_bon8_float_prefix(float /*unused*/)
/// @return the BON8 type marker for binary32 (float) or binary64 (double)
template<typename FloatType>
static constexpr CharType get_bon8_float_prefix()
{
return to_char_type(0x8E); // binary32
}
static constexpr CharType get_bon8_float_prefix(double /*unused*/)
{
return to_char_type(0x8F); // binary64
return to_char_type(std::is_same<FloatType, float>::value ? 0x8E : 0x8F);
}
////////////
@@ -2511,7 +2508,7 @@ class binary_writer
oa.write_character(format == detail::input_format_t::cbor
? get_cbor_float_prefix(static_cast<float>(n))
: format == detail::input_format_t::bon8
? get_bon8_float_prefix(static_cast<float>(n))
? get_bon8_float_prefix<float>()
: get_msgpack_float_prefix(static_cast<float>(n)));
write_number(static_cast<float>(n));
}
@@ -2520,7 +2517,7 @@ class binary_writer
oa.write_character(format == detail::input_format_t::cbor
? get_cbor_float_prefix(n)
: format == detail::input_format_t::bon8
? get_bon8_float_prefix(n)
? get_bon8_float_prefix<number_float_t>()
: get_msgpack_float_prefix(n));
write_number(n);
}
single_include/nlohmann/json.hpp
+6 -9
View File
@@ -21000,14 +21000,11 @@ class binary_writer
return to_char_type(0xCB); // float 64
}
static constexpr CharType get_bon8_float_prefix(float /*unused*/)
/// @return the BON8 type marker for binary32 (float) or binary64 (double)
template<typename FloatType>
static constexpr CharType get_bon8_float_prefix()
{
return to_char_type(0x8E); // binary32
}
static constexpr CharType get_bon8_float_prefix(double /*unused*/)
{
return to_char_type(0x8F); // binary64
return to_char_type(std::is_same<FloatType, float>::value ? 0x8E : 0x8F);
}
////////////
@@ -22064,7 +22061,7 @@ class binary_writer
oa.write_character(format == detail::input_format_t::cbor
? get_cbor_float_prefix(static_cast<float>(n))
: format == detail::input_format_t::bon8
? get_bon8_float_prefix(static_cast<float>(n))
? get_bon8_float_prefix<float>()
: get_msgpack_float_prefix(static_cast<float>(n)));
write_number(static_cast<float>(n));
}
@@ -22073,7 +22070,7 @@ class binary_writer
oa.write_character(format == detail::input_format_t::cbor
? get_cbor_float_prefix(n)
: format == detail::input_format_t::bon8
? get_bon8_float_prefix(n)
? get_bon8_float_prefix<number_float_t>()
: get_msgpack_float_prefix(n));
write_number(n);
}