External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚨 fix warnings

Browse Source
This commit is contained in:
Niels Lohmann 2020-12-30 13:27:29 +01:00
parent 35b5de2a29
commit 77f24509d4
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/ci.cmake
View File

@ -51,12 +51,10 @@ set(CLANG_CXXFLAGS "-std=c++11 \
-Weverything \ -Weverything \
-Wno-c++98-compat \ -Wno-c++98-compat \
-Wno-c++98-compat-pedantic \ -Wno-c++98-compat-pedantic \
-Wno-c++2a-compat \
-Wno-deprecated-declarations \ -Wno-deprecated-declarations \
-Wno-documentation-unknown-command \ -Wno-documentation-unknown-command \
-Wno-exit-time-destructors \ -Wno-exit-time-destructors \
-Wno-float-equal \ -Wno-extra-semi-stmt \
-Wno-missing-prototypes \
-Wno-padded \ -Wno-padded \
-Wno-range-loop-analysis \ -Wno-range-loop-analysis \
-Wno-switch-enum -Wno-covered-switch-default \ -Wno-switch-enum -Wno-covered-switch-default \
@ -193,7 +191,7 @@ set(GCC_CXXFLAGS "-std=c++11 \
-Wmismatched-tags \ -Wmismatched-tags \
-Wmissing-attributes \ -Wmissing-attributes \
-Wmissing-braces \ -Wmissing-braces \
-Wno-missing-declarations \ -Wmissing-declarations \
-Wmissing-field-initializers \ -Wmissing-field-initializers \
-Wmissing-include-dirs \ -Wmissing-include-dirs \
-Wmissing-profile \ -Wmissing-profile \
@ -301,7 +299,7 @@ set(GCC_CXXFLAGS "-std=c++11 \
-Wunused-const-variable=2 \ -Wunused-const-variable=2 \
-Wunused-function \ -Wunused-function \
-Wunused-label \ -Wunused-label \
-Wno-unused-local-typedefs \ -Wunused-local-typedefs \
-Wunused-macros \ -Wunused-macros \
-Wunused-parameter \ -Wunused-parameter \
-Wunused-result \ -Wunused-result \

2
test/src/unit-regression2.cpp
View File

@ -94,12 +94,14 @@ struct Data
std::string b {}; std::string b {};
}; };
void from_json(const json& j, Data& data);
void from_json(const json& j, Data& data) void from_json(const json& j, Data& data)
{ {
j["a"].get_to(data.a); j["a"].get_to(data.a);
j["b"].get_to(data.b); j["b"].get_to(data.b);
} }
bool operator==(Data const& lhs, Data const& rhs);
bool operator==(Data const& lhs, Data const& rhs) bool operator==(Data const& lhs, Data const& rhs)
{ {
return lhs.a == rhs.a && lhs.b == rhs.b; return lhs.a == rhs.a && lhs.b == rhs.b;

2
test/src/unit-udt.cpp
View File

@ -199,7 +199,7 @@ template <typename BasicJsonType>
static void from_json(const BasicJsonType& j, country& c) static void from_json(const BasicJsonType& j, country& c)
{ {
const auto str = j.template get<std::string>(); const auto str = j.template get<std::string>();
static const std::map<std::string, country> m = const std::map<std::string, country> m =
{ {
{"中华人民共和国", country::china}, {"中华人民共和国", country::china},
{"France", country::france}, {"France", country::france},

7
test/src/unit-user_defined_input.cpp
View File

@ -131,6 +131,13 @@ TEST_CASE("Custom iterator")
const char* ptr; const char* ptr;
}; };
// avoid -Wunused-local-typedefs
CHECK(std::is_same<MyIterator::difference_type, std::size_t>::value);
CHECK(std::is_same<MyIterator::value_type, char>::value);
CHECK(std::is_same<MyIterator::pointer, const char*>::value);
CHECK(std::is_same<MyIterator::reference, const char&>::value);
CHECK(std::is_same<MyIterator::iterator_category, std::input_iterator_tag>::value);
MyIterator begin{raw_data}; MyIterator begin{raw_data};
MyIterator end{raw_data + strlen(raw_data)}; MyIterator end{raw_data + strlen(raw_data)};