提交 754ce0b9 编写于 作者: N Niels Lohmann 提交者: GitHub

Merge pull request #496 from TedLyngmo/fix_effcplusplus_warnings

Fix -Weffc++ warnings (GNU 6.3.1)
此差异已折叠。
......@@ -6159,6 +6159,10 @@ class basic_json
*/
class serializer
{
private:
serializer(const serializer&) = delete;
serializer& operator=(const serializer&) = delete;
public:
/*!
@param[in] s output stream to serialize to
......
......@@ -49,16 +49,19 @@ enum class country
struct age
{
int m_val;
age(int rhs=0) : m_val(rhs) {}
};
struct name
{
std::string m_val;
name(const std::string rhs="") : m_val(rhs) {}
};
struct address
{
std::string m_val;
address(const std::string rhs="") : m_val(rhs) {}
};
struct person
......@@ -66,18 +69,24 @@ struct person
age m_age;
name m_name;
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
{
person m_person;
address m_address;
contact() : m_person(), m_address() {}
contact(const person& p, const address& a) : m_person(p), m_address(a) {}
};
struct contact_book
{
name m_book_name;
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
{
std::string number;
legacy_type() : number() {}
legacy_type(const std::string& n) : number(n) {}
};
}
......@@ -593,6 +604,8 @@ struct small_pod
struct non_pod
{
std::string s;
non_pod() : s() {}
non_pod(const std::string& S) : s(S) {}
};
template <typename BasicJsonType>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册