From 8079f0a538d0747fffe7f1a9d9f1b29dbb988ac2 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 5 Jun 2018 16:10:17 +0000 Subject: Fix warning from branch warning_fix_vincent git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3537 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 830cd74dcec65ed8944639732acd9e72d4a19632 --- .../include/gudhi/Simplex_tree/Simplex_tree_iterators.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h') diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h index 335bac1e..02c8bb64 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h @@ -101,7 +101,9 @@ class Simplex_tree_boundary_simplex_iterator : public boost::iterator_facade< // any end() iterator explicit Simplex_tree_boundary_simplex_iterator(SimplexTree * st) - : sib_(nullptr), + : last_(st->null_vertex()), + next_(st->null_vertex()), + sib_(nullptr), sh_(st->null_simplex()), st_(st) { } @@ -109,7 +111,9 @@ class Simplex_tree_boundary_simplex_iterator : public boost::iterator_facade< template Simplex_tree_boundary_simplex_iterator(SimplexTree * st, SimplexHandle sh) : last_(sh->first), + next_(st->null_vertex()), sib_(nullptr), + sh_(st->null_simplex()), st_(st) { // Only check once at the beginning instead of for every increment, as this is expensive. if (SimplexTree::Options::contiguous_vertices) @@ -123,9 +127,7 @@ class Simplex_tree_boundary_simplex_iterator : public boost::iterator_facade< sh_ = sib_->members_.begin()+next_; else sh_ = sib_->find(next_); - } else { - sh_ = st->null_simplex(); - } // vertex: == end() + } } private: -- cgit v1.2.3