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

move SmartRangePredicates.hh from Mesh to Predicates.hh in Utils

Browse Source
This commit is contained in:
Max Lyon
2020-10-15 16:54:14 +02:00
parent 4ac19ab52e
commit 123fe55b72
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/OpenMesh/Core/Mesh/SmartRangePredicates.hh → src/OpenMesh/Core/Utils/Predicates.hh
View File

4
src/Unittests/unittests_smart_ranges.cc
View File

@@ -3,7 +3,7 @@
#include <OpenMesh/Core/Mesh/PolyConnectivity.hh> #include <OpenMesh/Core/Mesh/PolyConnectivity.hh>
#include <OpenMesh/Core/Utils/PropertyManager.hh> #include <OpenMesh/Core/Utils/PropertyManager.hh>
#include <OpenMesh/Core/Mesh/SmartRangePredicates.hh> #include <OpenMesh/Core/Utils/Predicates.hh>
#include <iostream> #include <iostream>
#include <chrono> #include <chrono>
@@ -812,7 +812,7 @@ void test_make_predicate(Mesh& _mesh)
for (auto el : set2) for (auto el : set2)
_mesh.status(el).set_selected(true); _mesh.status(el).set_selected(true);
auto set = _mesh.elements<HandleT>().filtered(Selected() || make_predicate(&test_func<HandleT>)).to_vector(); auto set = _mesh.elements<HandleT>().filtered(Selected() || make_predicate(test_func<HandleT>)).to_vector();
std::vector<HandleT> union_set; std::vector<HandleT> union_set;
std::set_union(set1.begin(), set1.end(), set2.begin(), set2.end(), std::back_inserter(union_set)); std::set_union(set1.begin(), set1.end(), set2.begin(), set2.end(), std::back_inserter(union_set));