j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add is_compatible_* traits

Browse source
This commit is contained in:
Théo DELRIEU 2016-11-16 20:49:24 +01:00 • committed by Théo DELRIEU
parent 178441cdfd
commit 23bd2bce35
2 changed files with 106 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/src/unit-udt.cpp
View file

@ -1,7 +1,7 @@
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.5
| | |__ | | | | | | version 2.0.7
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
@ -382,25 +382,22 @@ TEST_CASE("from_json free function", "[udt]")
// custom serializer, uses adl by default
template <typename T, typename = void>
struct my_serializer;
template<>
struct my_serializer<udt::pod_type>
struct my_serializer
{
template <typename Json>
static void from_json(Json const& j, udt::pod_type& val)
static void from_json(Json const& j, T& val)
{
nlohmann::from_json(j, val);
}
template <typename Json>
static void to_json(Json& j, udt::pod_type const& val)
static void to_json(Json& j, T const& val)
{
nlohmann::to_json(j, val);
}
};
using my_json = nlohmann::basic_json<std::map, std::vector, std::string, bool,
/*using my_json = nlohmann::basic_json<std::map, std::vector, std::string, bool,
std::int64_t, std::uint64_t, double,
std::allocator, my_serializer>;
@ -419,8 +416,6 @@ namespace udt
TEST_CASE("custom serializer")
{
SECTION("default use works like default serializer")
{
udt::pod_type pod{1, 2, 3};
@ -435,3 +430,4 @@ TEST_CASE("custom serializer")
CHECK(pod2 == pod);
}
}
*/