mirrors/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-05-12 06:01:39 +00:00
Code Issues Projects Releases Wiki Activity

👷 build ci_module_cpp20 with MSVC

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann 2025-04-28 23:18:35 +02:00
parent c17c7a8bd8
commit 41c94e06fc
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/nlohmann/json.hpp
View File

@ -39,6 +39,7 @@
#include <nlohmann/detail/hash.hpp> #include <nlohmann/detail/hash.hpp>
#include <nlohmann/detail/input/binary_reader.hpp> #include <nlohmann/detail/input/binary_reader.hpp>
#include <nlohmann/detail/input/input_adapters.hpp> #include <nlohmann/detail/input/input_adapters.hpp>
#include <nlohmann/detail/input/json_sax.hpp>
#include <nlohmann/detail/input/lexer.hpp> #include <nlohmann/detail/input/lexer.hpp>
#include <nlohmann/detail/input/parser.hpp> #include <nlohmann/detail/input/parser.hpp>
#include <nlohmann/detail/iterators/internal_iterator.hpp> #include <nlohmann/detail/iterators/internal_iterator.hpp>

2
single_include/nlohmann/json.hpp
View File

@ -12889,6 +12889,8 @@ NLOHMANN_JSON_NAMESPACE_END
// #include <nlohmann/detail/input/input_adapters.hpp> // #include <nlohmann/detail/input/input_adapters.hpp>
// #include <nlohmann/detail/input/json_sax.hpp>
// #include <nlohmann/detail/input/lexer.hpp> // #include <nlohmann/detail/input/lexer.hpp>
// #include <nlohmann/detail/input/parser.hpp> // #include <nlohmann/detail/input/parser.hpp>

10
tests/src/unit-msgpack.cpp
View File

@ -1914,10 +1914,12 @@ TEST_CASE("MessagePack with std::byte")
SECTION("empty vector") SECTION("empty vector")
{ {
const std::vector<std::byte> empty_data; const std::vector<std::byte> empty_data;
CHECK_THROWS_WITH_AS([&]() { CHECK_THROWS_WITH_AS([&]()
{
[[maybe_unused]] auto result = json::from_msgpack(empty_data); [[maybe_unused]] auto result = json::from_msgpack(empty_data);
return true; return true;
}(), }
(),
"[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing MessagePack value: unexpected end of input", "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing MessagePack value: unexpected end of input",
json::parse_error&); json::parse_error&);
} }
@ -1946,8 +1948,8 @@ TEST_CASE("MessagePack with std::byte")
json direct_result = json::from_msgpack(msgpack_data); json direct_result = json::from_msgpack(msgpack_data);
// Test the workaround approach: reinterpret as unsigned char* and use iterator range // Test the workaround approach: reinterpret as unsigned char* and use iterator range
const auto *const char_start = reinterpret_cast<unsigned char const*>(msgpack_data.data()); const auto* const char_start = reinterpret_cast<unsigned char const*>(msgpack_data.data());
const auto *const char_end = char_start + msgpack_data.size(); const auto* const char_end = char_start + msgpack_data.size();
json workaround_result = json::from_msgpack(char_start, char_end); json workaround_result = json::from_msgpack(char_start, char_end);
// Verify that the final deserialized JSON matches the original JSON // Verify that the final deserialized JSON matches the original JSON