Backmerge from trunk

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

Former-commit-id: 06624ae4ed4031c7bae56e0b8fa305a318b934bc

1 files changed, 3 insertions, 8 deletions

diff --git a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h
index 2759b540..d6350a2c 100644
--- a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h
+++ b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h
@@ -107,13 +107,8 @@ typename GeometricSimplifiableComplex::Vertex_handle> {
  public:
   typedef typename GeometricSimplifiableComplex::Graph_vertex Graph_vertex;
   typedef typename GeometricSimplifiableComplex::Vertex_handle Vertex_handle;
-  typedef typename GeometricSimplifiableComplex::Simplex_handle Simplex_handle;
-  typedef typename GeometricSimplifiableComplex::Simplex_handle_iterator Simplex_handle_iterator;
-
-
-
+  typedef typename GeometricSimplifiableComplex::Simplex Simplex;
   typedef typename GeometricSimplifiableComplex::Root_vertex_handle Root_vertex_handle;
-
   typedef typename GeometricSimplifiableComplex::Graph_edge Graph_edge;
   typedef typename GeometricSimplifiableComplex::Edge_handle Edge_handle;
   typedef typename GeometricSimplifiableComplex::Point Point;
@@ -535,14 +530,14 @@ typename GeometricSimplifiableComplex::Vertex_handle> {
    * All the edges that passes through the blocker may be edge-contractible
    * again and are thus reinserted in the heap.
    */
-  void on_delete_blocker(const Simplex_handle * blocker) override {
+  void on_delete_blocker(const Simplex * blocker) override {
     // we go for all pairs xy that belongs to the blocker
     // note that such pairs xy are necessarily edges of the complex
     // by definition of a blocker
 
     // todo uniqument utile pour la link condition
     // laisser a l'utilisateur ? booleen update_heap_on_removed_blocker?
-    Simplex_handle blocker_copy(*blocker);
+    Simplex blocker_copy(*blocker);
     for (auto x = blocker_copy.begin(); x != blocker_copy.end(); ++x) {
       for (auto y = x; ++y != blocker_copy.end();) {
         auto edge_descr(complex_[std::make_pair(*x, *y)]);