External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve CI errors and use qualified std::uint64_t

Browse Source 
The fix was relying on implicit conversions in the non-taken branch.
- Ordinarily (work on a C++20 codebase) I would have used `if constexpr` here, sidestepping the issue, but that's not available on C++11 so I didn't bother.
- So instead of an `if` statement, I used a compile-time constant to select the correct overload.
- This is arguably better in this case, anyway.

I was using function-style casts for typed constants, which I consider superior for constants, but the CI checks disagree, so changed all to `static_cast`.
- For some reason, the CI checks didn't point at all of them, so I hope I caught them all myself.

Built with clang14 and all unit tests pass.
This commit is contained in:
Juan Carlos Arevalo Baeza (JCAB) 2023-12-10 20:00:47 -08:00
parent 1402ca4865
commit 5af4ec4f6b
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/nlohmann/detail/conversions/to_json.hpp
View File

@ -320,14 +320,8 @@ template<typename BasicJsonType, typename EnumType,
inline void to_json(BasicJsonType& j, EnumType e) noexcept
{
using underlying_type = typename std::underlying_type<EnumType>::type;
if (std::is_unsigned<underlying_type>::value)
{
external_constructor<value_t::number_unsigned>::construct(j, static_cast<underlying_type>(e));
}
else
{
external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
}
static constexpr value_t integral_value_t = std::is_unsigned<underlying_type>::value ? value_t::number_unsigned : value_t::number_integer;
external_constructor<integral_value_t>::construct(j, static_cast<underlying_type>(e));
}
#endif // JSON_DISABLE_ENUM_SERIALIZATION

10
single_include/nlohmann/json.hpp
View File

@ -5697,14 +5697,8 @@ template<typename BasicJsonType, typename EnumType,
inline void to_json(BasicJsonType& j, EnumType e) noexcept
{
using underlying_type = typename std::underlying_type<EnumType>::type;
if (std::is_unsigned<underlying_type>::value)
{
external_constructor<value_t::number_unsigned>::construct(j, static_cast<underlying_type>(e));
}
else
{
external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
}
static constexpr value_t integral_value_t = std::is_unsigned<underlying_type>::value ? value_t::number_unsigned : value_t::number_integer;
external_constructor<integral_value_t>::construct(j, static_cast<underlying_type>(e));
}
#endif // JSON_DISABLE_ENUM_SERIALIZATION

12
tests/src/unit-udt.cpp
View File

@ -67,7 +67,7 @@ struct contact
contact(person p, address a) : m_person(std::move(p)), m_address(std::move(a)) {}
};
enum class book_id : uint64_t;
enum class book_id : std::uint64_t;
struct contact_book
{
@ -75,7 +75,7 @@ struct contact_book
book_id m_book_id{};
std::vector<contact> m_contacts{};
contact_book() = default;
contact_book(name n, book_id i, std::vector<contact> c) : m_book_name(std::move(n)), m_book_id(std::move(i)), m_contacts(std::move(c)) {}
contact_book(name n, book_id i, std::vector<contact> c) : m_book_name(std::move(n)), m_book_id(i), m_contacts(std::move(c)) {}
};
} // namespace udt
@ -241,8 +241,8 @@ TEST_CASE("basic usage" * doctest::test_suite("udt"))
const udt::person senior_programmer{{42}, {"王芳"}, udt::country::china};
const udt::address addr{"Paris"};
const udt::contact cpp_programmer{sfinae_addict, addr};
const udt::book_id large_id{udt::book_id(uint64_t(1) << 63)}; // verify large unsigned enums are handled correctly
const udt::contact_book book{{"C++"}, {udt::book_id(42u)}, {cpp_programmer, {senior_programmer, addr}}};
const udt::book_id large_id{static_cast<udt::book_id>(static_cast<std::uint64_t>(1) << 63)}; // verify large unsigned enums are handled correctly
const udt::contact_book book{{"C++"}, static_cast<udt::book_id>(42u), {cpp_programmer, {senior_programmer, addr}}};
SECTION("conversion to json via free-functions")
{
@ -253,7 +253,7 @@ TEST_CASE("basic usage" * doctest::test_suite("udt"))
CHECK(json("Paris") == json(addr));
CHECK(json(cpp_programmer) ==
R"({"person" : {"age":23, "name":"theo", "country":"France"}, "address":"Paris"})"_json);
CHECK(json(large_id) == json(uint64_t(1) << 63));
CHECK(json(large_id) == json(static_cast<std::uint64_t>(1) << 63));
CHECK(json(large_id) > 0u);
CHECK(to_string(json(large_id)) == "9223372036854775808");
CHECK(json(large_id).is_number_unsigned());
@ -332,7 +332,7 @@ TEST_CASE("basic usage" * doctest::test_suite("udt"))
CHECK(contact == cpp_programmer);
CHECK(contacts == book.m_contacts);
CHECK(book_name == udt::name{"C++"});
CHECK(book_id == udt::book_id(42u));
CHECK(book_id == static_cast<udt::book_id>(42u));
CHECK(book == parsed_book);
}
#endif