From efcc826ecb9b55893397f749e5514316ba8629bb Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 6 Jul 2020 12:37:39 +0200 Subject: [PATCH] :rotating_light: fix warning --- Makefile | 2 +- README.md | 4 ++-- test/src/unit-udt_macro.cpp | 46 ++++++++++++++++++------------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 8579fb5db..ff62d6e7d 100644 --- a/Makefile +++ b/Makefile @@ -253,7 +253,7 @@ pedantic_gcc: -Wmismatched-tags \ -Wmissing-attributes \ -Wmissing-braces \ - -Wmissing-declarations \ + -Wno-missing-declarations \ -Wmissing-field-initializers \ -Wmissing-include-dirs \ -Wmissing-profile \ diff --git a/README.md b/README.md index 6d21e2d85..3bb92d38b 100644 --- a/README.md +++ b/README.md @@ -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) }; } ``` diff --git a/test/src/unit-udt_macro.cpp b/test/src/unit-udt_macro.cpp index 4535ae5b5..a6b66e955 100644 --- a/test/src/unit-udt_macro.cpp +++ b/test/src/unit-udt_macro.cpp @@ -37,9 +37,9 @@ namespace persons class person_with_private_data { private: - std::string name; + std::string name = ""; int age = 0; - json metadata; + json metadata = nullptr; public: bool operator==(const person_with_private_data& rhs) const @@ -48,21 +48,21 @@ class person_with_private_data } person_with_private_data() = default; - person_with_private_data(std::string name, int age, json metadata) - : name(std::move(name)) - , age(age) - , metadata(std::move(metadata)) + person_with_private_data(std::string name_, int age_, json metadata_) + : name(std::move(name_)) + , age(age_) + , metadata(std::move(metadata_)) {} - NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_data, age, name, metadata); + NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_data, age, name, metadata) }; class person_without_private_data_1 { public: - std::string name; - int age = 0; - json metadata; + std::string name = ""; + int age = 0; + json metadata = nullptr; bool operator==(const person_without_private_data_1& rhs) const { @@ -70,21 +70,21 @@ class person_without_private_data_1 } person_without_private_data_1() = default; - person_without_private_data_1(std::string name, int age, json metadata) - : name(std::move(name)) - , age(age) - , metadata(std::move(metadata)) + person_without_private_data_1(std::string name_, int age_, json metadata_) + : name(std::move(name_)) + , age(age_) + , metadata(std::move(metadata_)) {} - NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_without_private_data_1, age, name, metadata); + NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_without_private_data_1, age, name, metadata) }; class person_without_private_data_2 { public: - std::string name; - int age = 0; - json metadata; + std::string name = ""; + int age = 0; + json metadata = nullptr; bool operator==(const person_without_private_data_2& rhs) const { @@ -92,14 +92,14 @@ class person_without_private_data_2 } person_without_private_data_2() = default; - person_without_private_data_2(std::string name, int age, json metadata) - : name(std::move(name)) - , age(age) - , metadata(std::move(metadata)) + person_without_private_data_2(std::string name_, int age_, json metadata_) + : name(std::move(name_)) + , age(age_) + , metadata(std::move(metadata_)) {} }; -NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_without_private_data_2, age, name, metadata); +NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_without_private_data_2, age, name, metadata) } // namespace persons TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRUSIVE", T,