diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-15 13:20:12 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-15 13:20:12 +0000 |
commit | 6a8f01b2d30abda7e6184d9a4eb21460ae36d7d2 (patch) | |
tree | 8349679953459a9141624fe8aaa3577f580e9cae /src/Simplex_tree/include | |
parent | aa82d3856abe9e7b009c2c5bfa01540b82e17fdd (diff) | |
parent | 059c906152ca90608238bc82b07d8e28e18218dc (diff) |
Merged latest trunk changes to my_branch and fix
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/TDA_dev_1.1.0@409 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2463ee9b0f8b69e3edbda4e8189eb61606e0af93
Diffstat (limited to 'src/Simplex_tree/include')
-rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index c866d179..8d5dddce 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -39,7 +39,6 @@ namespace Gudhi { /** \defgroup simplex_tree Filtered Complexes -/** \defgroup simplex_tree Filtered Complexes * * A simplicial complex \f$\mathbf{K}\f$ * on a set of vertices \f$V = \{1, \cdots ,|V|\}\f$ is a collection of simplices @@ -647,7 +646,7 @@ class Simplex_tree { typename boost::graph_traits<OneSkeletonGraph>::vertex_iterator v_it, v_it_end; - for (tie(v_it, v_it_end) = boost::vertices(skel_graph); v_it != v_it_end; + for (std::tie(v_it, v_it_end) = boost::vertices(skel_graph); v_it != v_it_end; ++v_it) { root_.members_.emplace_hint( root_.members_.end(), *v_it, @@ -655,7 +654,7 @@ class Simplex_tree { } typename boost::graph_traits<OneSkeletonGraph>::edge_iterator e_it, e_it_end; - for (tie(e_it, e_it_end) = boost::edges(skel_graph); e_it != e_it_end; + for (std::tie(e_it, e_it_end) = boost::edges(skel_graph); e_it != e_it_end; ++e_it) { auto u = source(*e_it, skel_graph); auto v = target(*e_it, skel_graph); |