From bea833bbcd9d99dd4dc81f74e50cfd493f314404 Mon Sep 17 00:00:00 2001 From: Henry Fredrick Schreiner Date: Mon, 26 Mar 2018 10:54:32 +0200 Subject: [PATCH] Adding and fixing more warnings --- .ci/check_tidy.sh | 2 +- CMakeLists.txt | 2 +- include/CLI/App.hpp | 4 ++-- tests/AppTest.cpp | 16 ++++++++-------- tests/CMakeLists.txt | 2 +- tests/HelpersTest.cpp | 4 ++-- tests/NewParseTest.cpp | 24 ++++++++++++------------ 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.ci/check_tidy.sh b/.ci/check_tidy.sh index bf7bef8d..505b68eb 100755 --- a/.ci/check_tidy.sh +++ b/.ci/check_tidy.sh @@ -6,7 +6,7 @@ set -evx mkdir -p build-tidy cd build-tidy -CXX_FLAGS="-Werror -Wall -Wextra -pedantic -std=c++11" cmake .. -DCLANG_TIDY_FIX=ON +CXX_FLAGS="-Werror -Wcast-align -Wfloat-equal -Wimplicit-atomic-properties -Wmissing-declarations -Woverlength-strings -Wshadow -Wstrict-selector-match -Wundeclared-selector -Wunreachable-code -std=c++11" cmake .. -DCLANG_TIDY_FIX=ON cmake --build . set -evx diff --git a/CMakeLists.txt b/CMakeLists.txt index f31547e3..7fd2f5db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) if(MSVC) add_definitions("/W4") else() - add_definitions("-Wall -Wextra -pedantic") + add_definitions(-Wall -Wextra -pedantic) endif() if(CMAKE_VERSION VERSION_GREATER 3.6) diff --git a/include/CLI/App.hpp b/include/CLI/App.hpp index 939e2a40..255f2728 100644 --- a/include/CLI/App.hpp +++ b/include/CLI/App.hpp @@ -1048,10 +1048,10 @@ class App { /// This returns the number of remaining options, minus the -- seperator size_t remaining_size(bool recurse = false) const { - size_t count = std::count_if( + size_t count = static_cast(std::count_if( std::begin(missing_), std::end(missing_), [](const std::pair &val) { return val.first != detail::Classifer::POSITIONAL_MARK; - }); + })); if(recurse) { for(const App_p &sub : subcommands_) { count += sub->remaining_size(recurse); diff --git a/tests/AppTest.cpp b/tests/AppTest.cpp index d5a58080..38b87a0f 100644 --- a/tests/AppTest.cpp +++ b/tests/AppTest.cpp @@ -633,24 +633,24 @@ TEST_F(TApp, RequiredFlags) { TEST_F(TApp, CallbackFlags) { - int value = 0; + size_t value = 0; auto func = [&value](size_t x) { value = x; }; app.add_flag_function("-v", func); run(); - EXPECT_EQ(value, 0); + EXPECT_EQ(value, (size_t)0); app.reset(); args = {"-v"}; run(); - EXPECT_EQ(value, 1); + EXPECT_EQ(value, (size_t)1); app.reset(); args = {"-vv"}; run(); - EXPECT_EQ(value, 2); + EXPECT_EQ(value, (size_t)2); EXPECT_THROW(app.add_flag_function("hi", func), CLI::IncorrectConstruction); } @@ -658,24 +658,24 @@ TEST_F(TApp, CallbackFlags) { #if __cplusplus >= 201402L TEST_F(TApp, CallbackFlagsAuto) { - int value = 0; + size_t value = 0; auto func = [&value](size_t x) { value = x; }; app.add_flag("-v", func); run(); - EXPECT_EQ(value, 0); + EXPECT_EQ(value, (size_t)0); app.reset(); args = {"-v"}; run(); - EXPECT_EQ(value, 1); + EXPECT_EQ(value, (size_t)1); app.reset(); args = {"-vv"}; run(); - EXPECT_EQ(value, 2); + EXPECT_EQ(value, (size_t)2); EXPECT_THROW(app.add_flag("hi", func), CLI::IncorrectConstruction); } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e2ae6d2c..c3d8b756 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -set(GOOGLE_TEST_INDIVIDUAL ON) +set(GOOGLE_TEST_INDIVIDUAL OFF) include(AddGoogletest) set(CLI_TESTS diff --git a/tests/HelpersTest.cpp b/tests/HelpersTest.cpp index 0f6d87a6..281b8f6d 100644 --- a/tests/HelpersTest.cpp +++ b/tests/HelpersTest.cpp @@ -415,8 +415,8 @@ TEST(Types, LexicalCastParsable) { std::complex output; EXPECT_TRUE(CLI::detail::lexical_cast(input, output)); - EXPECT_EQ(output.real(), 4.2); // Doing this in one go sometimes has trouble - EXPECT_EQ(output.imag(), 7.3); // on clang + c++4.8 due to missing const + EXPECT_DOUBLE_EQ(output.real(), 4.2); // Doing this in one go sometimes has trouble + EXPECT_DOUBLE_EQ(output.imag(), 7.3); // on clang + c++4.8 due to missing const EXPECT_FALSE(CLI::detail::lexical_cast(fail_input, output)); EXPECT_FALSE(CLI::detail::lexical_cast(extra_input, output)); diff --git a/tests/NewParseTest.cpp b/tests/NewParseTest.cpp index 5c38870f..a465618f 100644 --- a/tests/NewParseTest.cpp +++ b/tests/NewParseTest.cpp @@ -34,8 +34,8 @@ TEST_F(TApp, AddingComplexParser) { run(); - EXPECT_EQ(1.5, comp.real()); - EXPECT_EQ(2.5, comp.imag()); + EXPECT_DOUBLE_EQ(1.5, comp.real()); + EXPECT_DOUBLE_EQ(2.5, comp.imag()); } TEST_F(TApp, DefaultComplex) { @@ -48,13 +48,13 @@ TEST_F(TApp, DefaultComplex) { EXPECT_THAT(help, HasSubstr("1")); EXPECT_THAT(help, HasSubstr("2")); - EXPECT_EQ(1, comp.real()); - EXPECT_EQ(2, comp.imag()); + EXPECT_DOUBLE_EQ(1, comp.real()); + EXPECT_DOUBLE_EQ(2, comp.imag()); run(); - EXPECT_EQ(4, comp.real()); - EXPECT_EQ(3, comp.imag()); + EXPECT_DOUBLE_EQ(4, comp.real()); + EXPECT_DOUBLE_EQ(3, comp.imag()); } TEST_F(TApp, BuiltinComplex) { @@ -68,13 +68,13 @@ TEST_F(TApp, BuiltinComplex) { EXPECT_THAT(help, HasSubstr("2")); EXPECT_THAT(help, HasSubstr("COMPLEX")); - EXPECT_EQ(1, comp.real()); - EXPECT_EQ(2, comp.imag()); + EXPECT_DOUBLE_EQ(1, comp.real()); + EXPECT_DOUBLE_EQ(2, comp.imag()); run(); - EXPECT_EQ(4, comp.real()); - EXPECT_EQ(3, comp.imag()); + EXPECT_DOUBLE_EQ(4, comp.real()); + EXPECT_DOUBLE_EQ(3, comp.imag()); } TEST_F(TApp, BuiltinComplexIgnoreI) { @@ -85,8 +85,8 @@ TEST_F(TApp, BuiltinComplexIgnoreI) { run(); - EXPECT_EQ(4, comp.real()); - EXPECT_EQ(3, comp.imag()); + EXPECT_DOUBLE_EQ(4, comp.real()); + EXPECT_DOUBLE_EQ(3, comp.imag()); } TEST_F(TApp, BuiltinComplexFail) {