Merge pull request #496 from TedLyngmo/fix_effcplusplus_warnings

Fix -Weffc++ warnings (GNU 6.3.1)
This commit is contained in:
Niels Lohmann 2017-03-11 15:57:10 +01:00 committed by GitHub
commit 754ce0b991
3 changed files with 318 additions and 844 deletions

File diff suppressed because it is too large Load diff

View file

@ -6159,6 +6159,10 @@ class basic_json
*/ */
class serializer class serializer
{ {
private:
serializer(const serializer&) = delete;
serializer& operator=(const serializer&) = delete;
public: public:
/*! /*!
@param[in] s output stream to serialize to @param[in] s output stream to serialize to

View file

@ -49,16 +49,19 @@ enum class country
struct age struct age
{ {
int m_val; int m_val;
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) {}
}; };
struct address struct address
{ {
std::string m_val; std::string m_val;
address(const std::string rhs="") : m_val(rhs) {}
}; };
struct person struct person
@ -66,18 +69,24 @@ 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(const age& a, const name& n, const country& c) : m_age(a), m_name(n), m_country(c) {}
}; };
struct contact struct contact
{ {
person m_person; person m_person;
address m_address; address m_address;
contact() : m_person(), m_address() {}
contact(const person& p, const address& a) : m_person(p), m_address(a) {}
}; };
struct contact_book struct contact_book
{ {
name m_book_name; name m_book_name;
std::vector<contact> m_contacts; std::vector<contact> m_contacts;
contact_book() : m_book_name(), m_contacts() {}
contact_book(const name& n, const std::vector<contact>& c) : m_book_name(n), m_contacts(c) {}
}; };
} }
@ -319,6 +328,8 @@ namespace udt
struct legacy_type struct legacy_type
{ {
std::string number; std::string number;
legacy_type() : number() {}
legacy_type(const std::string& n) : number(n) {}
}; };
} }
@ -593,6 +604,8 @@ struct small_pod
struct non_pod struct non_pod
{ {
std::string s; std::string s;
non_pod() : s() {}
non_pod(const std::string& S) : s(S) {}
}; };
template <typename BasicJsonType> template <typename BasicJsonType>