From 99e4c28ff64aa9edf4065858063f17a3991faa13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Tue, 12 Jul 2022 22:38:00 +0200 Subject: [PATCH 1/6] Add missing returns in non-void functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Distributions like openSUSE compile packages with the "-Werror=return-type". Signed-off-by: Jaime Marquínez Ferrándiz --- 3party/opening_hours/rules_evaluation.cpp | 1 + generator/generator_tests/collector_building_parts_tests.cpp | 1 + generator/generator_tests/relation_tags_tests.cpp | 1 + geometry/clipping.cpp | 2 ++ routing/cross_mwm_graph.cpp | 1 + routing/fake_vertex.hpp | 1 + 6 files changed, 7 insertions(+) diff --git a/3party/opening_hours/rules_evaluation.cpp b/3party/opening_hours/rules_evaluation.cpp index 6df560b683..5add206af0 100644 --- a/3party/opening_hours/rules_evaluation.cpp +++ b/3party/opening_hours/rules_evaluation.cpp @@ -108,6 +108,7 @@ osmoh::RuleState ModifierToRuleState(osmoh::RuleSequence::Modifier const modifie case Modifier::Unknown: case Modifier::Comment: + default: return osmoh::RuleState::Unknown; } } diff --git a/generator/generator_tests/collector_building_parts_tests.cpp b/generator/generator_tests/collector_building_parts_tests.cpp index 3b75223f31..46daf1453d 100644 --- a/generator/generator_tests/collector_building_parts_tests.cpp +++ b/generator/generator_tests/collector_building_parts_tests.cpp @@ -32,6 +32,7 @@ public: // OSMElementCacheReaderInterface overrides: bool Read(generator::cache::Key /* id */, WayElement & /* value */) override { CHECK(false, ("Should not be called")); + return false; } bool Read(generator::cache::Key id, RelationElement & value) override diff --git a/generator/generator_tests/relation_tags_tests.cpp b/generator/generator_tests/relation_tags_tests.cpp index e360be9da1..03b4819052 100644 --- a/generator/generator_tests/relation_tags_tests.cpp +++ b/generator/generator_tests/relation_tags_tests.cpp @@ -24,6 +24,7 @@ public: // OSMElementCacheReaderInterface overrides: bool Read(Key /* id */, WayElement & /* value */) override { CHECK(false, ("Should not be called")); + return false; } bool Read(Key id, RelationElement & value) override diff --git a/geometry/clipping.cpp b/geometry/clipping.cpp index 3382a88210..5c8f7b3516 100644 --- a/geometry/clipping.cpp +++ b/geometry/clipping.cpp @@ -206,6 +206,7 @@ vector ClipSplineByRect(m2::RectD const & rect, m2::SharedSpli case RectCase::Inside: return {spline}; case RectCase::Outside: return {}; case RectCase::Intersect: return ClipPathByRectImpl(rect, spline->GetPath()); + default: return {}; } } @@ -217,6 +218,7 @@ std::vector ClipPathByRect(m2::RectD const & rect, case RectCase::Inside: return {m2::SharedSpline(path)}; case RectCase::Outside: return {}; case RectCase::Intersect: return ClipPathByRectImpl(rect, path); + default: return {}; } } diff --git a/routing/cross_mwm_graph.cpp b/routing/cross_mwm_graph.cpp index 71c4a5b50f..901ca1ff46 100644 --- a/routing/cross_mwm_graph.cpp +++ b/routing/cross_mwm_graph.cpp @@ -209,6 +209,7 @@ CrossMwmGraph::MwmStatus CrossMwmGraph::GetMwmStatus(NumMwmId numMwmId, string c case MwmDataSource::MwmNotLoaded: return MwmStatus::NotLoaded; case MwmDataSource::SectionExists: return MwmStatus::SectionExists; case MwmDataSource::NoSection: return MwmStatus::NoSection; + default: return MwmStatus::NoSection; } } diff --git a/routing/fake_vertex.hpp b/routing/fake_vertex.hpp index ec81449aa6..1be07454ca 100644 --- a/routing/fake_vertex.hpp +++ b/routing/fake_vertex.hpp @@ -70,6 +70,7 @@ inline std::string DebugPrint(FakeVertex::Type type) { case FakeVertex::Type::PureFake: return "PureFake"; case FakeVertex::Type::PartOfReal: return "PartOfReal"; + default: return "UnkonwFakeVertexType"; } } } // namespace routing -- 2.45.3 From a41dc0548d0a2570cc90ba05e7824d0f70885585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Wed, 13 Jul 2022 17:00:26 +0200 Subject: [PATCH 2/6] Mark non-void functions that don't return with the noreturn attribute MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaime Marquínez Ferrándiz --- generator/generator_tests/collector_building_parts_tests.cpp | 3 +-- generator/generator_tests/relation_tags_tests.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/generator/generator_tests/collector_building_parts_tests.cpp b/generator/generator_tests/collector_building_parts_tests.cpp index 46daf1453d..3ff73efc73 100644 --- a/generator/generator_tests/collector_building_parts_tests.cpp +++ b/generator/generator_tests/collector_building_parts_tests.cpp @@ -30,9 +30,8 @@ public: } // OSMElementCacheReaderInterface overrides: - bool Read(generator::cache::Key /* id */, WayElement & /* value */) override { + [[noreturn]] bool Read(generator::cache::Key /* id */, WayElement & /* value */) override { CHECK(false, ("Should not be called")); - return false; } bool Read(generator::cache::Key id, RelationElement & value) override diff --git a/generator/generator_tests/relation_tags_tests.cpp b/generator/generator_tests/relation_tags_tests.cpp index 03b4819052..ca832d8b37 100644 --- a/generator/generator_tests/relation_tags_tests.cpp +++ b/generator/generator_tests/relation_tags_tests.cpp @@ -22,9 +22,8 @@ public: } // OSMElementCacheReaderInterface overrides: - bool Read(Key /* id */, WayElement & /* value */) override { + [[noreturn]] bool Read(Key /* id */, WayElement & /* value */) override { CHECK(false, ("Should not be called")); - return false; } bool Read(Key id, RelationElement & value) override -- 2.45.3 From c0ffabeea7dcf18d1665818b51e4917da1135bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Thu, 14 Jul 2022 20:35:22 +0200 Subject: [PATCH 3/6] Remove incorrect usage of default in switch statements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaime Marquínez Ferrándiz --- 3party/opening_hours/rules_evaluation.cpp | 2 +- geometry/clipping.cpp | 4 ++-- routing/cross_mwm_graph.cpp | 2 +- routing/fake_vertex.hpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3party/opening_hours/rules_evaluation.cpp b/3party/opening_hours/rules_evaluation.cpp index 5add206af0..8d0cb94844 100644 --- a/3party/opening_hours/rules_evaluation.cpp +++ b/3party/opening_hours/rules_evaluation.cpp @@ -108,9 +108,9 @@ osmoh::RuleState ModifierToRuleState(osmoh::RuleSequence::Modifier const modifie case Modifier::Unknown: case Modifier::Comment: - default: return osmoh::RuleState::Unknown; } + return osmoh::RuleState::Unknown; } // Transform timspan with extended end of the form of diff --git a/geometry/clipping.cpp b/geometry/clipping.cpp index 5c8f7b3516..c5dfe6a66d 100644 --- a/geometry/clipping.cpp +++ b/geometry/clipping.cpp @@ -206,8 +206,8 @@ vector ClipSplineByRect(m2::RectD const & rect, m2::SharedSpli case RectCase::Inside: return {spline}; case RectCase::Outside: return {}; case RectCase::Intersect: return ClipPathByRectImpl(rect, spline->GetPath()); - default: return {}; } + return {}; } std::vector ClipPathByRect(m2::RectD const & rect, @@ -218,8 +218,8 @@ std::vector ClipPathByRect(m2::RectD const & rect, case RectCase::Inside: return {m2::SharedSpline(path)}; case RectCase::Outside: return {}; case RectCase::Intersect: return ClipPathByRectImpl(rect, path); - default: return {}; } + return {}; } void ClipPathByRectBeforeSmooth(m2::RectD const & rect, std::vector const & path, diff --git a/routing/cross_mwm_graph.cpp b/routing/cross_mwm_graph.cpp index 901ca1ff46..d6799e14ea 100644 --- a/routing/cross_mwm_graph.cpp +++ b/routing/cross_mwm_graph.cpp @@ -209,8 +209,8 @@ CrossMwmGraph::MwmStatus CrossMwmGraph::GetMwmStatus(NumMwmId numMwmId, string c case MwmDataSource::MwmNotLoaded: return MwmStatus::NotLoaded; case MwmDataSource::SectionExists: return MwmStatus::SectionExists; case MwmDataSource::NoSection: return MwmStatus::NoSection; - default: return MwmStatus::NoSection; } + return MwmStatus::NoSection; } CrossMwmGraph::MwmStatus CrossMwmGraph::GetCrossMwmStatus(NumMwmId numMwmId) const diff --git a/routing/fake_vertex.hpp b/routing/fake_vertex.hpp index 1be07454ca..28aed43c38 100644 --- a/routing/fake_vertex.hpp +++ b/routing/fake_vertex.hpp @@ -70,7 +70,7 @@ inline std::string DebugPrint(FakeVertex::Type type) { case FakeVertex::Type::PureFake: return "PureFake"; case FakeVertex::Type::PartOfReal: return "PartOfReal"; - default: return "UnkonwFakeVertexType"; } + return "UnkonwFakeVertexType"; } } // namespace routing -- 2.45.3 From 0a3817ac94dbe494104fbf6845a85454a1851feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Fri, 15 Jul 2022 15:20:36 +0200 Subject: [PATCH 4/6] Fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaime Marquínez Ferrándiz --- routing/fake_vertex.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routing/fake_vertex.hpp b/routing/fake_vertex.hpp index 28aed43c38..f84e594deb 100644 --- a/routing/fake_vertex.hpp +++ b/routing/fake_vertex.hpp @@ -71,6 +71,6 @@ inline std::string DebugPrint(FakeVertex::Type type) case FakeVertex::Type::PureFake: return "PureFake"; case FakeVertex::Type::PartOfReal: return "PartOfReal"; } - return "UnkonwFakeVertexType"; + return "UnknownFakeVertexType"; } } // namespace routing -- 2.45.3 From 9f6a24a26fce4af1e647b29ea53907601ff1a5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Fri, 15 Jul 2022 17:42:41 +0200 Subject: [PATCH 5/6] Add call to CHECK macro before returns that shouldn't be reached MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaime Marquínez Ferrándiz --- 3party/opening_hours/CMakeLists.txt | 2 ++ 3party/opening_hours/rules_evaluation.cpp | 3 +++ geometry/clipping.cpp | 2 ++ routing/cross_mwm_graph.cpp | 1 + routing/fake_vertex.hpp | 1 + 5 files changed, 9 insertions(+) diff --git a/3party/opening_hours/CMakeLists.txt b/3party/opening_hours/CMakeLists.txt index 18fb702d92..a2754ba291 100644 --- a/3party/opening_hours/CMakeLists.txt +++ b/3party/opening_hours/CMakeLists.txt @@ -19,6 +19,8 @@ set(SRC omim_add_library(${PROJECT_NAME} ${SRC}) +target_link_libraries(${PROJECT_NAME} base) + target_include_directories(${PROJECT_NAME} INTERFACE .) target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated-copy) diff --git a/3party/opening_hours/rules_evaluation.cpp b/3party/opening_hours/rules_evaluation.cpp index 8d0cb94844..d3422a458d 100644 --- a/3party/opening_hours/rules_evaluation.cpp +++ b/3party/opening_hours/rules_evaluation.cpp @@ -1,6 +1,8 @@ #include "rules_evaluation.hpp" #include "rules_evaluation_private.hpp" +#include "base/assert.hpp" + #include #include #include @@ -110,6 +112,7 @@ osmoh::RuleState ModifierToRuleState(osmoh::RuleSequence::Modifier const modifie case Modifier::Comment: return osmoh::RuleState::Unknown; } + CHECK(false, ("Unreachable")); return osmoh::RuleState::Unknown; } diff --git a/geometry/clipping.cpp b/geometry/clipping.cpp index c5dfe6a66d..0ddf4a86f0 100644 --- a/geometry/clipping.cpp +++ b/geometry/clipping.cpp @@ -207,6 +207,7 @@ vector ClipSplineByRect(m2::RectD const & rect, m2::SharedSpli case RectCase::Outside: return {}; case RectCase::Intersect: return ClipPathByRectImpl(rect, spline->GetPath()); } + CHECK(false, ("Unreachable")); return {}; } @@ -219,6 +220,7 @@ std::vector ClipPathByRect(m2::RectD const & rect, case RectCase::Outside: return {}; case RectCase::Intersect: return ClipPathByRectImpl(rect, path); } + CHECK(false, ("Unreachable")); return {}; } diff --git a/routing/cross_mwm_graph.cpp b/routing/cross_mwm_graph.cpp index d6799e14ea..70f731ba33 100644 --- a/routing/cross_mwm_graph.cpp +++ b/routing/cross_mwm_graph.cpp @@ -210,6 +210,7 @@ CrossMwmGraph::MwmStatus CrossMwmGraph::GetMwmStatus(NumMwmId numMwmId, string c case MwmDataSource::SectionExists: return MwmStatus::SectionExists; case MwmDataSource::NoSection: return MwmStatus::NoSection; } + CHECK(false, ("Unreachable")); return MwmStatus::NoSection; } diff --git a/routing/fake_vertex.hpp b/routing/fake_vertex.hpp index f84e594deb..72a1f65b76 100644 --- a/routing/fake_vertex.hpp +++ b/routing/fake_vertex.hpp @@ -71,6 +71,7 @@ inline std::string DebugPrint(FakeVertex::Type type) case FakeVertex::Type::PureFake: return "PureFake"; case FakeVertex::Type::PartOfReal: return "PartOfReal"; } + CHECK(false, ("Unreachable")); return "UnknownFakeVertexType"; } } // namespace routing -- 2.45.3 From aa43b2db8d095bd291a4da2a26a59aff6cae52bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Fri, 15 Jul 2022 22:13:04 +0200 Subject: [PATCH 6/6] Remove reference to base from opening_hours MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaime Marquínez Ferrándiz --- 3party/opening_hours/CMakeLists.txt | 2 -- 3party/opening_hours/rules_evaluation.cpp | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/3party/opening_hours/CMakeLists.txt b/3party/opening_hours/CMakeLists.txt index a2754ba291..18fb702d92 100644 --- a/3party/opening_hours/CMakeLists.txt +++ b/3party/opening_hours/CMakeLists.txt @@ -19,8 +19,6 @@ set(SRC omim_add_library(${PROJECT_NAME} ${SRC}) -target_link_libraries(${PROJECT_NAME} base) - target_include_directories(${PROJECT_NAME} INTERFACE .) target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated-copy) diff --git a/3party/opening_hours/rules_evaluation.cpp b/3party/opening_hours/rules_evaluation.cpp index d3422a458d..96218904cb 100644 --- a/3party/opening_hours/rules_evaluation.cpp +++ b/3party/opening_hours/rules_evaluation.cpp @@ -1,11 +1,11 @@ #include "rules_evaluation.hpp" #include "rules_evaluation_private.hpp" -#include "base/assert.hpp" - #include +#include #include #include +#include #include #include @@ -112,7 +112,8 @@ osmoh::RuleState ModifierToRuleState(osmoh::RuleSequence::Modifier const modifie case Modifier::Comment: return osmoh::RuleState::Unknown; } - CHECK(false, ("Unreachable")); + std::cerr << "Unreachable\n"; + std::abort(); return osmoh::RuleState::Unknown; } -- 2.45.3