From 71a5f40ea8a84b044dfbbc3c154556df847b244e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 17 Jan 2022 15:32:09 +0100 Subject: [PATCH 1/5] Try to fix implicit operator= --- src/OpenMesh/Core/Mesh/SmartRange.hh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/OpenMesh/Core/Mesh/SmartRange.hh b/src/OpenMesh/Core/Mesh/SmartRange.hh index 6524042c..e10d04bb 100644 --- a/src/OpenMesh/Core/Mesh/SmartRange.hh +++ b/src/OpenMesh/Core/Mesh/SmartRange.hh @@ -452,6 +452,8 @@ struct FilteredSmartRangeT : public SmartRangeT Date: Mon, 17 Jan 2022 15:56:53 +0100 Subject: [PATCH 2/5] Fixed Warnings in Normalcone Geometry --- src/OpenMesh/Core/Geometry/NormalConeT.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenMesh/Core/Geometry/NormalConeT.hh b/src/OpenMesh/Core/Geometry/NormalConeT.hh index cad08037..c2442f5d 100644 --- a/src/OpenMesh/Core/Geometry/NormalConeT.hh +++ b/src/OpenMesh/Core/Geometry/NormalConeT.hh @@ -89,10 +89,10 @@ public: //! default constructor (not initialized) - NormalConeT() {} + NormalConeT() : angle_(0.0) {} //! Initialize cone with center (unit vector) and angle (radius in radians) - NormalConeT(const Vec3& _center_normal, Scalar _angle=0.0); + explicit NormalConeT(const Vec3& _center_normal, Scalar _angle=0.0); //! return max. distance (radians) unit vector to cone (distant side) Scalar max_angle(const Vec3&) const; From 65abe0b9261e706bd6a46bb26d9ece40809e0eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 17 Jan 2022 15:57:37 +0100 Subject: [PATCH 3/5] Fixed size_t int comparisons --- src/Unittests/unittests_smart_ranges.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Unittests/unittests_smart_ranges.cc b/src/Unittests/unittests_smart_ranges.cc index a547686d..5ac7b834 100644 --- a/src/Unittests/unittests_smart_ranges.cc +++ b/src/Unittests/unittests_smart_ranges.cc @@ -310,26 +310,26 @@ TEST_F(OpenMeshSmartRanges, Filtered) auto to_id = [](VH vh) { return vh.idx(); }; auto even_vertices = mesh_.vertices().filtered(is_even).to_vector(to_id); - EXPECT_EQ(even_vertices.size(), 4); + EXPECT_EQ(even_vertices.size(), 4u); EXPECT_EQ(even_vertices[0], 0); EXPECT_EQ(even_vertices[1], 2); EXPECT_EQ(even_vertices[2], 4); EXPECT_EQ(even_vertices[3], 6); auto odd_vertices = mesh_.vertices().filtered(is_odd).to_vector(to_id); - EXPECT_EQ(odd_vertices.size(), 4); + EXPECT_EQ(odd_vertices.size(), 4u); EXPECT_EQ(odd_vertices[0], 1); EXPECT_EQ(odd_vertices[1], 3); EXPECT_EQ(odd_vertices[2], 5); EXPECT_EQ(odd_vertices[3], 7); auto even_3_vertices = mesh_.vertices().filtered(is_even).filtered(is_divisible_by_3).to_vector(to_id); - EXPECT_EQ(even_3_vertices.size(), 2); + EXPECT_EQ(even_3_vertices.size(), 2u); EXPECT_EQ(even_3_vertices[0], 0); EXPECT_EQ(even_3_vertices[1], 6); auto odd_3_vertices = mesh_.vertices().filtered(is_odd).filtered(is_divisible_by_3).to_vector(to_id); - EXPECT_EQ(odd_3_vertices.size(), 1); + EXPECT_EQ(odd_3_vertices.size(), 1u); EXPECT_EQ(odd_3_vertices[0], 3); @@ -346,8 +346,8 @@ TEST_F(OpenMeshSmartRanges, Filtered) { OpenMesh::FProp to_be_visited(true, mesh_); - int visited_faces_in_main_loop = 0; - int visited_faces_in_sub_loop = 0; + size_t visited_faces_in_main_loop = 0; + size_t visited_faces_in_sub_loop = 0; for (auto fh : mesh_.faces().filtered(to_be_visited)) { to_be_visited(fh) = false; @@ -367,8 +367,8 @@ TEST_F(OpenMeshSmartRanges, Filtered) { OpenMesh::FProp to_be_visited(true, mesh_); const auto& to_be_visited_const_ref = to_be_visited; - int visited_faces_in_main_loop = 0; - int visited_faces_in_sub_loop = 0; + size_t visited_faces_in_main_loop = 0; + size_t visited_faces_in_sub_loop = 0; for (auto fh : mesh_.faces().filtered(to_be_visited_const_ref)) { to_be_visited(fh) = false; From 275a8e4e941b101d4349d0ae1d98f1ac47ab9ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 17 Jan 2022 16:05:15 +0100 Subject: [PATCH 4/5] Silence some warnings in unittests --- src/Unittests/unittests_smart_ranges.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Unittests/unittests_smart_ranges.cc b/src/Unittests/unittests_smart_ranges.cc index 5ac7b834..6dc73e05 100644 --- a/src/Unittests/unittests_smart_ranges.cc +++ b/src/Unittests/unittests_smart_ranges.cc @@ -293,7 +293,7 @@ TEST_F(OpenMeshSmartRanges, ForEach) ASSERT_EQ(vec.size(), mesh_.n_vertices()) << "vec has wrong size"; for (size_t i = 0; i < vec.size(); ++i) - EXPECT_EQ(vec[i], i) << "wrong index in vector"; + EXPECT_EQ(vec[i], static_cast(i)) << "wrong index in vector"; } @@ -892,19 +892,19 @@ TEST_F(OpenMeshSmartRanges, MemberFunctionFunctor) int factor = 3; MemberFunctionWrapperTestStruct test_object(factor); - // Test using a MemberFunctionWrapper as Functor - EXPECT_EQ(mesh_.n_edges() / 2, mesh_.edges().count_if(make_member_function_wrapper(test_object, &MemberFunctionWrapperTestStruct::id_divisible_by_2))); + // Test using a MemberFunctionWrapper as Functorstatic_cast( + EXPECT_EQ(static_cast(mesh_.n_edges() / 2), mesh_.edges().count_if(make_member_function_wrapper(test_object, &MemberFunctionWrapperTestStruct::id_divisible_by_2))); // Test using a MemberFunctionWrapper as Functor that is created using the convenience macro from inside the struct for (auto vh : mesh_.vertices()) - EXPECT_EQ(test_object.valence_times_i(vh), vh.valence() * factor); + EXPECT_EQ(test_object.valence_times_i(vh), static_cast(vh.valence()) * factor); factor = 4; test_object.i_ = factor; for (auto vh : mesh_.vertices()) { - EXPECT_EQ(test_object.valence_times_i(vh), vh.valence() * factor); + EXPECT_EQ(test_object.valence_times_i(vh), static_cast(vh.valence() * factor)); } From be2a4d99638160d3b4783417162df54e0bff2cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 17 Jan 2022 16:13:05 +0100 Subject: [PATCH 5/5] Removed warning --- src/Unittests/unittests_trimesh_ranges.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Unittests/unittests_trimesh_ranges.cc b/src/Unittests/unittests_trimesh_ranges.cc index c57bcf75..9a3811bc 100644 --- a/src/Unittests/unittests_trimesh_ranges.cc +++ b/src/Unittests/unittests_trimesh_ranges.cc @@ -89,7 +89,7 @@ void compare_ranges(RangeT1&& range1, RangeT2&& range2, int offset, bool reverse auto vec2 = range2.to_vector(); ASSERT_EQ(vec1.size(), vec2.size()) << "Ranges have different number of elements"; - ASSERT_GT(vec1.size(), 0) << "Ranges are empty"; + ASSERT_GT(vec1.size(), 0u) << "Ranges are empty"; size_t n = vec1.size();