skbl renaming, new link methods for abstract link of geometrical complex

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

Former-commit-id: cb85e1ae86635857fbaaa0781526cb3eeaa9a50a

1 files changed, 4 insertions, 3 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 1fdbdfc9..e137d1ea 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
@@ -49,7 +49,7 @@ 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 Complex_edge_iterator<Complex> Complex_edge_iterator_;
+	typedef typename Complex::Complex_edge_iterator Complex_edge_iterator_;
 
 	const Complex* complex_;
 	Vertex_handle v_;
@@ -133,9 +133,10 @@ private:
 	typedef typename SkeletonBlockerComplex::Root_vertex_handle Root_vertex_handle;
 	typedef typename SkeletonBlockerComplex::Simplex_handle Simplex_handle;
 	typedef typename SkeletonBlockerComplex::Superior_triangle_around_vertex_iterator STAVI;
+	typedef typename SkeletonBlockerComplex::Complex_vertex_iterator Complex_vertex_iterator;
 
 	const SkeletonBlockerComplex* complex_;
-	Complex_vertex_iterator<SkeletonBlockerComplex> current_vertex_;
+	Complex_vertex_iterator current_vertex_;
 	STAVI current_triangle_;
 	bool is_end_;
 public:
@@ -176,7 +177,7 @@ public:
 
 	Triangle_iterator& operator=(const Triangle_iterator & other){
 		complex_ = other.complex_;
-		Complex_vertex_iterator<SkeletonBlockerComplex> current_vertex_;
+		Complex_vertex_iterator current_vertex_;
 		STAVI current_triangle_;
 		return *this;
 	}