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

Merge c67e101b77 into 788e5468e4

Browse Source
This commit is contained in:
luistung 2023-09-06 21:30:55 +08:00 committed by GitHub
commit 125a719a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/json.hpp
View File

@ -5157,6 +5157,10 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// @} /// @}
}; };
// Explicit instantiation
// fix for issue #3732
template class nlohmann::basic_json<nlohmann::ordered_map>;
/// @brief user-defined to_string function for JSON values /// @brief user-defined to_string function for JSON values
/// @sa https://json.nlohmann.me/api/basic_json/to_string/ /// @sa https://json.nlohmann.me/api/basic_json/to_string/
NLOHMANN_BASIC_JSON_TPL_DECLARATION NLOHMANN_BASIC_JSON_TPL_DECLARATION

4
single_include/nlohmann/json.hpp
View File

@ -24373,6 +24373,10 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// @} /// @}
}; };
// Explicit instantiation
// fix for issue #3732
template class nlohmann::basic_json<nlohmann::ordered_map>;
/// @brief user-defined to_string function for JSON values /// @brief user-defined to_string function for JSON values
/// @sa https://json.nlohmann.me/api/basic_json/to_string/ /// @sa https://json.nlohmann.me/api/basic_json/to_string/
NLOHMANN_BASIC_JSON_TPL_DECLARATION NLOHMANN_BASIC_JSON_TPL_DECLARATION

6
tests/src/unit-ordered_json.cpp
View File

@ -12,6 +12,12 @@
using nlohmann::json; using nlohmann::json;
using nlohmann::ordered_json; using nlohmann::ordered_json;
//fix for issue #3732
void test(nlohmann::detail::iteration_proxy_value <
nlohmann::detail::iter_impl<nlohmann::ordered_json >> const& val)
{
static_cast<void>(val.value());
}
TEST_CASE("ordered_json") TEST_CASE("ordered_json")
{ {