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

Skip the MessagePack string length test for clang with libstdc++ 10

Browse Source 
C++17 builds consider the std::filesystem::path conversion for the
string type, and with clang and libstdc++ 10 that conversion is
ambiguous for a class derived from std::string. Creating the value from
its type did not avoid it, since any basic_json with that string type
instantiates the check. The binary and ext cases are still tested there.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-26 10:46:17 +02:00
parent 431a7864b4
commit 67bb400b3c
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/unit-msgpack.cpp
+13
View File
@@ -2173,6 +2173,14 @@ class beyond_uint32_binary_t : public std::vector<std::uint8_t>
} }
}; };
// with clang and libstdc++ 10, the std::filesystem::path conversion that
// C++17 builds consider for every string type is ambiguous for a class
// derived from std::string, so the string case is not tested there
#if !(defined(__clang__) && defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 11)
#define JSON_TEST_BEYOND_UINT32_STRING 1
#endif
#ifdef JSON_TEST_BEYOND_UINT32_STRING
class beyond_uint32_string_t : public std::string class beyond_uint32_string_t : public std::string
{ {
public: public:
@@ -2183,14 +2191,17 @@ class beyond_uint32_string_t : public std::string
return beyond_uint32_size(); return beyond_uint32_size();
} }
}; };
#endif
using beyond_uint32_binary_json = nlohmann::basic_json < using beyond_uint32_binary_json = nlohmann::basic_json <
std::map, std::vector, std::string, bool, std::int64_t, std::uint64_t, std::map, std::vector, std::string, bool, std::int64_t, std::uint64_t,
double, std::allocator, nlohmann::adl_serializer, beyond_uint32_binary_t, void >; double, std::allocator, nlohmann::adl_serializer, beyond_uint32_binary_t, void >;
#ifdef JSON_TEST_BEYOND_UINT32_STRING
using beyond_uint32_string_json = nlohmann::basic_json < using beyond_uint32_string_json = nlohmann::basic_json <
std::map, std::vector, beyond_uint32_string_t, bool, std::int64_t, std::uint64_t, std::map, std::vector, beyond_uint32_string_t, bool, std::int64_t, std::uint64_t,
double, std::allocator, nlohmann::adl_serializer, std::vector<std::uint8_t>, void >; double, std::allocator, nlohmann::adl_serializer, std::vector<std::uint8_t>, void >;
#endif
} // namespace } // namespace
TEST_CASE("MessagePack lengths beyond UINT32_MAX cannot be serialized") TEST_CASE("MessagePack lengths beyond UINT32_MAX cannot be serialized")
@@ -2208,11 +2219,13 @@ TEST_CASE("MessagePack lengths beyond UINT32_MAX cannot be serialized")
const beyond_uint32_binary_json ext = beyond_uint32_binary_json::binary(beyond_uint32_binary_t{}, 42); const beyond_uint32_binary_json ext = beyond_uint32_binary_json::binary(beyond_uint32_binary_t{}, 42);
CHECK_THROWS_WITH_AS(beyond_uint32_binary_json::to_msgpack(ext), expected, beyond_uint32_binary_json::out_of_range&); CHECK_THROWS_WITH_AS(beyond_uint32_binary_json::to_msgpack(ext), expected, beyond_uint32_binary_json::out_of_range&);
#ifdef JSON_TEST_BEYOND_UINT32_STRING
// created from its type rather than from a beyond_uint32_string_t: // created from its type rather than from a beyond_uint32_string_t:
// that would consider the std::filesystem::path conversion, which // that would consider the std::filesystem::path conversion, which
// libstdc++ 10 cannot decide for a class derived from std::string // libstdc++ 10 cannot decide for a class derived from std::string
const beyond_uint32_string_json string(beyond_uint32_string_json::value_t::string); const beyond_uint32_string_json string(beyond_uint32_string_json::value_t::string);
CHECK_THROWS_WITH_AS(beyond_uint32_string_json::to_msgpack(string), expected, beyond_uint32_string_json::out_of_range&); CHECK_THROWS_WITH_AS(beyond_uint32_string_json::to_msgpack(string), expected, beyond_uint32_string_json::out_of_range&);
#endif
} }
#endif #endif
} }