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

This commit is contained in:
Niels Lohmann committed 2020-07-06 12:52:59 +02:00
commit 99fc6b16ab
3 files changed
+26 -26

No files matched your search

+2 -2
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)
};
}
```