Manual merge of skb_simplex_insertion after last trunk big modifications on Skbl

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/skb_simplex_insertion_merge@855 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: d7f7721e2963de439a28040196423d4c0df07d3f

1 files changed, 9 insertions, 9 deletions

diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h
index 28f5805d..116023d7 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h
@@ -37,15 +37,15 @@ namespace skbl {
 template<typename Complex, typename LinkType>
 class Triangle_around_vertex_iterator : public boost::iterator_facade
 < Triangle_around_vertex_iterator <Complex, LinkType>
-, typename Complex::Simplex_handle const
+, typename Complex::Simplex const
 , boost::forward_traversal_tag
-, typename Complex::Simplex_handle const> {
+, typename Complex::Simplex const> {
   friend class boost::iterator_core_access;
   template<typename T> friend class Triangle_iterator;
  private:
   typedef typename LinkType::Vertex_handle Vertex_handle;
   typedef typename LinkType::Root_vertex_handle Root_vertex_handle;
-  typedef typename LinkType::Simplex_handle Simplex_handle;
+  typedef typename LinkType::Simplex Simplex;
   typedef typename Complex::Complex_edge_iterator Complex_edge_iterator_;
 
   const Complex* complex_;
@@ -87,10 +87,10 @@ class Triangle_around_vertex_iterator : public boost::iterator_facade
     return (complex_ == other.complex_) && ((finished() && other.finished()) || current_edge_ == other.current_edge_);
   }
 
-  Simplex_handle dereference() const {
+  Simplex dereference() const {
     Root_vertex_handle v1 = (*link_)[*current_edge_].first();
     Root_vertex_handle v2 = (*link_)[*current_edge_].second();
-    return Simplex_handle(v_, *(complex_->get_address(v1)), *(complex_->get_address(v2)));
+    return Simplex(v_, *(complex_->get_address(v1)), *(complex_->get_address(v2)));
   }
 
   void increment() {
@@ -112,14 +112,14 @@ class Triangle_around_vertex_iterator : public boost::iterator_facade
 template<typename SkeletonBlockerComplex>
 class Triangle_iterator : public boost::iterator_facade<
 Triangle_iterator <SkeletonBlockerComplex>,
-typename SkeletonBlockerComplex::Simplex_handle const
+typename SkeletonBlockerComplex::Simplex const
 , boost::forward_traversal_tag
-, typename SkeletonBlockerComplex::Simplex_handle const> {
+, typename SkeletonBlockerComplex::Simplex const> {
   friend class boost::iterator_core_access;
  private:
   typedef typename SkeletonBlockerComplex::Vertex_handle Vertex_handle;
   typedef typename SkeletonBlockerComplex::Root_vertex_handle Root_vertex_handle;
-  typedef typename SkeletonBlockerComplex::Simplex_handle Simplex_handle;
+  typedef typename SkeletonBlockerComplex::Simplex Simplex;
   typedef typename SkeletonBlockerComplex::Superior_triangle_around_vertex_iterator STAVI;
   typedef typename SkeletonBlockerComplex::Complex_vertex_iterator Complex_vertex_iterator;
 
@@ -175,7 +175,7 @@ typename SkeletonBlockerComplex::Simplex_handle const
         current_vertex_ == other.current_vertex_ && current_triangle_ == other.current_triangle_));
   }
 
-  Simplex_handle dereference() const {
+  Simplex dereference() const {
     return *current_triangle_;
   }