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

Merge branch 'develop' of https://github.com/nlohmann/json into issue2239

Browse source
This commit is contained in:
Niels Lohmann 2020-07-06 12:52:59 +02:00
commit 99fc6b16ab
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -253,7 +253,7 @@ pedantic_gcc:
-Wmismatched-tags \
-Wmissing-attributes \
-Wmissing-braces \
-Wmissing-declarations \
-Wno-missing-declarations \
-Wmissing-field-initializers \
-Wmissing-include-dirs \
-Wmissing-profile \

4
README.md
View file

@ -886,7 +886,7 @@ The `to_json`/`from_json` functions for the `person` struct above can be created
```cpp
namespace ns {
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person, name, address, age);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person, name, address, age)
}
```
@ -901,7 +901,7 @@ namespace ns {
int postcode;
public:
NLOHMANN_DEFINE_TYPE_INTRUSIVE(address, street, housenumber, postcode);
NLOHMANN_DEFINE_TYPE_INTRUSIVE(address, street, housenumber, postcode)
};
}
```

46
test/src/unit-udt_macro.cpp
View file

@ -37,9 +37,9 @@ namespace persons
class person_with_private_data
{
private:
std::string name;
std::string name = "";
int age = 0;
json metadata;
json metadata = nullptr;
public:
bool operator==(const person_with_private_data& rhs) const
@ -48,21 +48,21 @@ class person_with_private_data
}
person_with_private_data() = default;
person_with_private_data(std::string name, int age, json metadata)
: name(std::move(name))
, age(age)
, metadata(std::move(metadata))
person_with_private_data(std::string name_, int age_, json metadata_)
: name(std::move(name_))
, age(age_)
, metadata(std::move(metadata_))
{}
NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_data, age, name, metadata);
NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_data, age, name, metadata)
};
class person_without_private_data_1
{
public:
std::string name;
int age = 0;
json metadata;
std::string name = "";
int age = 0;
json metadata = nullptr;
bool operator==(const person_without_private_data_1& rhs) const
{
@ -70,21 +70,21 @@ class person_without_private_data_1
}
person_without_private_data_1() = default;
person_without_private_data_1(std::string name, int age, json metadata)
: name(std::move(name))
, age(age)
, metadata(std::move(metadata))
person_without_private_data_1(std::string name_, int age_, json metadata_)
: name(std::move(name_))
, age(age_)
, metadata(std::move(metadata_))
{}
NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_without_private_data_1, age, name, metadata);
NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_without_private_data_1, age, name, metadata)
};
class person_without_private_data_2
{
public:
std::string name;
int age = 0;
json metadata;
std::string name = "";
int age = 0;
json metadata = nullptr;
bool operator==(const person_without_private_data_2& rhs) const
{
@ -92,14 +92,14 @@ class person_without_private_data_2
}
person_without_private_data_2() = default;
person_without_private_data_2(std::string name, int age, json metadata)
: name(std::move(name))
, age(age)
, metadata(std::move(metadata))
person_without_private_data_2(std::string name_, int age_, json metadata_)
: name(std::move(name_))
, age(age_)
, metadata(std::move(metadata_))
{}
};
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_without_private_data_2, age, name, metadata);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_without_private_data_2, age, name, metadata)
} // namespace persons
TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRUSIVE", T,