Merge branch 'develop' of https://github.com/nlohmann/json into issue2239
This commit is contained in:
commit
99fc6b16ab
3 changed files with 26 additions and 26 deletions
|
|
@ -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)
|
||||
};
|
||||
}
|
||||
```
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue