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

fix some warnings

Browse source
This commit is contained in:
Théo DELRIEU 2017-01-22 14:07:28 +01:00
parent 9c6ef74a28
commit 9f8b270ed9
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/json.hpp
View file

@ -372,7 +372,7 @@ contains a `mapped_type`, whereas `std::vector` fails the test.
public: \ public: \
static constexpr bool value = \ static constexpr bool value = \
std::is_integral<decltype(detect(std::declval<T>()))>::value; \ std::is_integral<decltype(detect(std::declval<T>()))>::value; \
}; }
NLOHMANN_JSON_HAS_HELPER(mapped_type); NLOHMANN_JSON_HAS_HELPER(mapped_type);
NLOHMANN_JSON_HAS_HELPER(key_type); NLOHMANN_JSON_HAS_HELPER(key_type);
@ -3113,7 +3113,6 @@ class basic_json
// we cannot static_assert on T being non-const, because there is support // we cannot static_assert on T being non-const, because there is support
// for get<const basic_json_t>(), which is why we still need the uncvref // for get<const basic_json_t>(), which is why we still need the uncvref
static_assert(not std::is_reference<T>::value, "get cannot be used with reference types, you might want to use get_ref"); static_assert(not std::is_reference<T>::value, "get cannot be used with reference types, you might want to use get_ref");
static_assert(not std::is_pointer<T>::value, "get cannot be used with pointer types, you might want to use get_ptr");
static_assert(std::is_default_constructible<U>::value, static_assert(std::is_default_constructible<U>::value,
"Types must be DefaultConstructible when used with get"); "Types must be DefaultConstructible when used with get");
U ret; U ret;
@ -3146,7 +3145,6 @@ class basic_json
U get() const noexcept(noexcept(JSONSerializer<T>::from_json(std::declval<const basic_json_t&>()))) U get() const noexcept(noexcept(JSONSerializer<T>::from_json(std::declval<const basic_json_t&>())))
{ {
static_assert(not std::is_reference<T>::value, "get cannot be used with reference types, you might want to use get_ref"); static_assert(not std::is_reference<T>::value, "get cannot be used with reference types, you might want to use get_ref");
static_assert(not std::is_pointer<T>::value, "get cannot be used with pointer types, you might want to use get_ptr");
return JSONSerializer<T>::from_json(*this); return JSONSerializer<T>::from_json(*this);
} }

2
src/json.hpp.re2c
View file

@ -372,7 +372,7 @@ contains a `mapped_type`, whereas `std::vector` fails the test.
public: \ public: \
static constexpr bool value = \ static constexpr bool value = \
std::is_integral<decltype(detect(std::declval<T>()))>::value; \ std::is_integral<decltype(detect(std::declval<T>()))>::value; \
}; }
NLOHMANN_JSON_HAS_HELPER(mapped_type); NLOHMANN_JSON_HAS_HELPER(mapped_type);
NLOHMANN_JSON_HAS_HELPER(key_type); NLOHMANN_JSON_HAS_HELPER(key_type);

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

@ -348,7 +348,7 @@ TEST_CASE("adl_serializer specialization", "[udt]")
json j = optPerson; json j = optPerson;
CHECK(j.is_null()); CHECK(j.is_null());
optPerson.reset(new udt::person{{42}, {"John Doe"}}); optPerson.reset(new udt::person{{42}, {"John Doe"}, udt::country::russia});
j = optPerson; j = optPerson;
CHECK_FALSE(j.is_null()); CHECK_FALSE(j.is_null());
@ -357,7 +357,7 @@ TEST_CASE("adl_serializer specialization", "[udt]")
SECTION("from_json") SECTION("from_json")
{ {
auto person = udt::person{{42}, {"John Doe"}}; auto person = udt::person{{42}, {"John Doe"}, udt::country::russia};
json j = person; json j = person;
auto optPerson = j.get<std::shared_ptr<udt::person>>(); auto optPerson = j.get<std::shared_ptr<udt::person>>();