🎨 cleanup after #496
Ran “make pretty” and added a note to the README file.
This commit is contained in:
parent
754ce0b991
commit
c7afb34e57
3 changed files with 870 additions and 323 deletions
|
@ -828,7 +828,7 @@ I deeply appreciate the help of the following people.
|
||||||
- [rswanson-ihi](https://github.com/rswanson-ihi) noted a typo in the README.
|
- [rswanson-ihi](https://github.com/rswanson-ihi) noted a typo in the README.
|
||||||
- [Mihai Stan](https://github.com/stanmihai4) fixed a bug in the comparison with `nullptr`s.
|
- [Mihai Stan](https://github.com/stanmihai4) fixed a bug in the comparison with `nullptr`s.
|
||||||
- [Tushar Maheshwari](https://github.com/tusharpm) added [cotire](https://github.com/sakra/cotire) support to speed up the compilation.
|
- [Tushar Maheshwari](https://github.com/tusharpm) added [cotire](https://github.com/sakra/cotire) support to speed up the compilation.
|
||||||
- [TedLyngmo](https://github.com/TedLyngmo) noted a typo in the README.
|
- [TedLyngmo](https://github.com/TedLyngmo) noted a typo in the README and fixed some `-Weffc++` warnings.
|
||||||
|
|
||||||
Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone.
|
Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone.
|
||||||
|
|
||||||
|
|
1183
src/json.hpp
1183
src/json.hpp
File diff suppressed because it is too large
Load diff
|
@ -49,19 +49,19 @@ enum class country
|
||||||
struct age
|
struct age
|
||||||
{
|
{
|
||||||
int m_val;
|
int m_val;
|
||||||
age(int rhs=0) : m_val(rhs) {}
|
age(int rhs = 0) : m_val(rhs) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct name
|
struct name
|
||||||
{
|
{
|
||||||
std::string m_val;
|
std::string m_val;
|
||||||
name(const std::string rhs="") : m_val(rhs) {}
|
name(const std::string rhs = "") : m_val(rhs) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct address
|
struct address
|
||||||
{
|
{
|
||||||
std::string m_val;
|
std::string m_val;
|
||||||
address(const std::string rhs="") : m_val(rhs) {}
|
address(const std::string rhs = "") : m_val(rhs) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct person
|
struct person
|
||||||
|
@ -69,7 +69,7 @@ struct person
|
||||||
age m_age;
|
age m_age;
|
||||||
name m_name;
|
name m_name;
|
||||||
country m_country;
|
country m_country;
|
||||||
person() : m_age(),m_name(),m_country() {}
|
person() : m_age(), m_name(), m_country() {}
|
||||||
person(const age& a, const name& n, const country& c) : m_age(a), m_name(n), m_country(c) {}
|
person(const age& a, const name& n, const country& c) : m_age(a), m_name(n), m_country(c) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue