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

fix for STL debug mode 

It is invalid to try to detect if an iterator is singular or value-initialized.
The only operations allowed with value-initialized iterators are:
  - copy the iterator, or
  - destroy or assign the iterator.

Comparisons like `vertex_it == Vertex_it{}` are not allowed.
This commit is contained in:
Laurent Rineau 2025-01-30 17:51:20 +01:00
parent 571c2ccadc
commit d837dbde21
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Triangulation_2/include/CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h
View File

@ -365,26 +365,11 @@ public:
// - Otherwise all members must be valid pointers or dereferencable iterators. // - Otherwise all members must be valid pointers or dereferencable iterators.
bool is_singular() const { bool is_singular() const {
CGAL_assertion((hierarchy == nullptr) == (constraint_it == Constraint_iterator{}));
CGAL_assertion((hierarchy != nullptr) || (vertex_it == Vertex_it{}));
return hierarchy == nullptr; return hierarchy == nullptr;
} }
bool is_valid() const { bool is_valid() const {
if(hierarchy == nullptr) { return (hierarchy != nullptr);
CGAL_assertion(is_singular());
return false;
}
if(constraint_it == Constraint_iterator{}) {
return false;
}
if(constraint_it == hierarchy->constraints_end()) {
return vertex_it == Vertex_it{};
}
if(vertex_it == Vertex_it{}) {
return false;
}
return true;
} }
bool is_end() const { bool is_end() const {
@ -406,8 +391,8 @@ public:
bool equal(const Subconstraint_iterator& other) const { bool equal(const Subconstraint_iterator& other) const {
if(hierarchy != other.hierarchy) return false; if(hierarchy != other.hierarchy) return false;
if(is_singular()) return true; if(is_singular()) return true;
return (constraint_it == other.constraint_it &&
vertex_it == other.vertex_it); return (constraint_it == other.constraint_it) && (this->is_end() == other.is_end());
} }
Vertex_it begin_or_null(Constraint_iterator constraint_it) const { Vertex_it begin_or_null(Constraint_iterator constraint_it) const {