backmerge of skb_simplex_insertion_mergedevelopment

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

Former-commit-id: 923de101fab769e597e39975a89f8e59d00e2cce

1 files changed, 2 insertions, 2 deletions

diff --git a/src/GudhUI/view/Viewer_instructor.h b/src/GudhUI/view/Viewer_instructor.h
index 31a1d273..82c8e346 100644
--- a/src/GudhUI/view/Viewer_instructor.h
+++ b/src/GudhUI/view/Viewer_instructor.h
@@ -52,7 +52,7 @@ class Viewer_instructor : public QWidget {
   typedef Complex::Point Point;

   typedef Complex::Vertex_handle Vertex_handle;

   typedef Complex::Edge_handle Edge_handle;

-  typedef Complex::Simplex_handle Simplex_handle;

+  typedef Complex::Simplex Simplex;

 

   Viewer* viewer_;

   View_parameter view_params_;

@@ -98,7 +98,7 @@ class Viewer_instructor : public QWidget {
   void set_color_vertex(Vertex_handle vh);

   void set_color_edge(Edge_handle eh);

 

-  void set_color_triangle(const Simplex_handle& triangle);

+  void set_color_triangle(const Simplex& triangle);

 

  private:

   /**