summaryrefslogtreecommitdiff
path: root/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-01-07 13:34:00 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-01-07 13:34:00 +0000
commitd91d9248c66451a765f58b6d03db2124b52c3ae2 (patch)
tree67747dc96cf2316ae4d9d0b4da8973ca01ec16c1 /src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h
parente5c82f8817a48b2675d1e6318086de26e9b82d35 (diff)
Cppcheck fixes after merge
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@951 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 4b66d24e46b604e2066c4c2e506b147af4be7e6a
Diffstat (limited to 'src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h')
-rw-r--r--src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h8
1 files changed, 4 insertions, 4 deletions
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 c5027f22..794060ee 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
@@ -99,11 +99,13 @@ class Simplex_tree_boundary_simplex_iterator : public boost::iterator_facade<
// any end() iterator
explicit Simplex_tree_boundary_simplex_iterator(SimplexTree * st)
- : sh_(st->null_simplex()) {
+ : sib_(NULL),
+ sh_(st->null_simplex()) {
}
Simplex_tree_boundary_simplex_iterator(SimplexTree * st, Simplex_handle sh)
: suffix_(),
+ sib_(st->self_siblings(sh)),
st_(st) {
last_ = sh->first;
Siblings * sib = st->self_siblings(sh);
@@ -137,9 +139,7 @@ class Simplex_tree_boundary_simplex_iterator : public boost::iterator_facade<
Siblings * for_sib = sib_;
Siblings * new_sib = sib_->oncles();
auto rit = suffix_.rbegin();
- if (SimplexTree::Options::contiguous_vertices
- && new_sib == nullptr
- && rit != suffix_.rend()) {
+ if (SimplexTree::Options::contiguous_vertices && new_sib == nullptr && rit != suffix_.rend()) {
// We reached the root, use a short-cut to find a vertex. We could also
// optimize finding the second vertex of a segment, but people are
// expected to call endpoints().