Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed size_t int comparisons

Browse Source
This commit is contained in:
Jan Möbius
2022-01-17 15:57:37 +01:00
parent 6f4d14374b
commit 65abe0b926
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Unittests/unittests_smart_ranges.cc
View File

@@ -310,26 +310,26 @@ TEST_F(OpenMeshSmartRanges, Filtered)
auto to_id = [](VH vh) { return vh.idx(); }; auto to_id = [](VH vh) { return vh.idx(); };
auto even_vertices = mesh_.vertices().filtered(is_even).to_vector(to_id); 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[0], 0);
EXPECT_EQ(even_vertices[1], 2); EXPECT_EQ(even_vertices[1], 2);
EXPECT_EQ(even_vertices[2], 4); EXPECT_EQ(even_vertices[2], 4);
EXPECT_EQ(even_vertices[3], 6); EXPECT_EQ(even_vertices[3], 6);
auto odd_vertices = mesh_.vertices().filtered(is_odd).to_vector(to_id); 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[0], 1);
EXPECT_EQ(odd_vertices[1], 3); EXPECT_EQ(odd_vertices[1], 3);
EXPECT_EQ(odd_vertices[2], 5); EXPECT_EQ(odd_vertices[2], 5);
EXPECT_EQ(odd_vertices[3], 7); EXPECT_EQ(odd_vertices[3], 7);
auto even_3_vertices = mesh_.vertices().filtered(is_even).filtered(is_divisible_by_3).to_vector(to_id); 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[0], 0);
EXPECT_EQ(even_3_vertices[1], 6); 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); 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); EXPECT_EQ(odd_3_vertices[0], 3);
@@ -346,8 +346,8 @@ TEST_F(OpenMeshSmartRanges, Filtered)
{ {
OpenMesh::FProp<bool> to_be_visited(true, mesh_); OpenMesh::FProp<bool> to_be_visited(true, mesh_);
int visited_faces_in_main_loop = 0; size_t visited_faces_in_main_loop = 0;
int visited_faces_in_sub_loop = 0; size_t visited_faces_in_sub_loop = 0;
for (auto fh : mesh_.faces().filtered(to_be_visited)) for (auto fh : mesh_.faces().filtered(to_be_visited))
{ {
to_be_visited(fh) = false; to_be_visited(fh) = false;
@@ -367,8 +367,8 @@ TEST_F(OpenMeshSmartRanges, Filtered)
{ {
OpenMesh::FProp<bool> to_be_visited(true, mesh_); OpenMesh::FProp<bool> to_be_visited(true, mesh_);
const auto& to_be_visited_const_ref = to_be_visited; const auto& to_be_visited_const_ref = to_be_visited;
int visited_faces_in_main_loop = 0; size_t visited_faces_in_main_loop = 0;
int visited_faces_in_sub_loop = 0; size_t visited_faces_in_sub_loop = 0;
for (auto fh : mesh_.faces().filtered(to_be_visited_const_ref)) for (auto fh : mesh_.faces().filtered(to_be_visited_const_ref))
{ {
to_be_visited(fh) = false; to_be_visited(fh) = false;