songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor tweak with constexpr in CT_2

This commit is contained in:
Laurent Rineau 2024-04-11 09:44:56 +02:00
parent 8e1744fbc1
commit f219cdff53
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Triangulation_2/include/CGAL/Constrained_triangulation_2.h
View File

@ -345,13 +345,9 @@ insert_constraint(Vertex_handle vaa, Vertex_handle vbb, OutputIterator out)
// if the segment (or a subpart of the segment) that we are trying to constraint is already // if the segment (or a subpart of the segment) that we are trying to constraint is already
// present in the triangulation and is already marked as constrained, // present in the triangulation and is already marked as constrained,
// then this is an intersection // then this is an intersection
if(std::is_same<Itag, No_constraint_intersection_tag>::value) { if constexpr (std::is_same_v<Itag, No_constraint_intersection_tag>) {
if(dimension() == 1) { if(fr->is_constrained(dimension() == 1 ? 2 : i)) {
if(fr->is_constrained(2)) throw Intersection_of_constraints_exception();
throw Intersection_of_constraints_exception();
} else {
if(fr->is_constrained(i))
throw Intersection_of_constraints_exception();
} }
} }
@ -727,7 +723,7 @@ insert(const Point& a, Locate_type lt, Face_handle loc, int li)
} }
if ( lt == Triangulation::EDGE && loc->is_constrained(li) ) if ( lt == Triangulation::EDGE && loc->is_constrained(li) )
{ {
if(std::is_same<Itag, No_constraint_intersection_tag>::value) if constexpr (std::is_same_v<Itag, No_constraint_intersection_tag>)
throw Intersection_of_constraints_exception(); throw Intersection_of_constraints_exception();
insert_in_constrained_edge = true; insert_in_constrained_edge = true;
@ -840,13 +836,9 @@ insert_constraint(Vertex_handle vaa, Vertex_handle vbb)
// if the segment (or a subpart of the segment) that we are trying to constraint is already // if the segment (or a subpart of the segment) that we are trying to constraint is already
// present in the triangulation and is already marked as constrained, // present in the triangulation and is already marked as constrained,
// then this is an intersection // then this is an intersection
if(std::is_same<Itag, No_constraint_intersection_tag>::value) { if constexpr (std::is_same_v<Itag, No_constraint_intersection_tag>) {
if(dimension() == 1) { if(fr->is_constrained(dimension() == 1 ? 2 : i)) {
if(fr->is_constrained(2)) throw Intersection_of_constraints_exception();
throw Intersection_of_constraints_exception();
} else {
if(fr->is_constrained(i))
throw Intersection_of_constraints_exception();
} }
} }