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

🚨 fix linter errors

Browse source
This commit is contained in:
Niels Lohmann 2019-11-05 20:23:17 +01:00
parent 62dada05ca
commit c0ae88bf50
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/src/unit-regression.cpp
View file

@ -166,7 +166,7 @@ namespace
{ {
struct NonDefaultFromJsonStruct { }; struct NonDefaultFromJsonStruct { };
inline bool operator== (NonDefaultFromJsonStruct const& lhs, NonDefaultFromJsonStruct const& rhs) inline bool operator== (NonDefaultFromJsonStruct const&, NonDefaultFromJsonStruct const&)
{ {
return true; return true;
} }
@ -185,7 +185,7 @@ namespace nlohmann
template <> template <>
struct adl_serializer<NonDefaultFromJsonStruct> struct adl_serializer<NonDefaultFromJsonStruct>
{ {
static NonDefaultFromJsonStruct from_json (json const& j) static NonDefaultFromJsonStruct from_json (json const&)
{ {
return {}; return {};
} }
@ -1872,8 +1872,16 @@ TEST_CASE("regression tests")
SECTION("issue #1647 - compile error when deserializing enum if both non-default from_json and non-member operator== exists for other type") SECTION("issue #1647 - compile error when deserializing enum if both non-default from_json and non-member operator== exists for other type")
{ {
{
json j;
NonDefaultFromJsonStruct x = j;
NonDefaultFromJsonStruct y;
CHECK(x == y);
}
auto val = nlohmann::json("one").get<for_1647>(); auto val = nlohmann::json("one").get<for_1647>();
CHECK(val == for_1647::one); CHECK(val == for_1647::one);
json j = val;
} }
SECTION("issue #1805 - A pair<T1, T2> is json constructible only if T1 and T2 are json constructible") SECTION("issue #1805 - A pair<T1, T2> is json constructible only if T1 and T2 are json constructible")