diff --git a/Packages/Triangulation_3/changes.txt b/Packages/Triangulation_3/changes.txt index 2ddaf40eb74..734055b7d86 100644 --- a/Packages/Triangulation_3/changes.txt +++ b/Packages/Triangulation_3/changes.txt @@ -1,3 +1,6 @@ +Version 1.88 (?? September 01) +- Use Pointer<> directly, no need for Triangulation_*_handle_3<>. + Version 1.87 (11 September 01) - Remove deprecated code. - Internal classes now templated either by Tds or Tr so they are more easily diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h index ac7f4aad8e6..78049ec83e6 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h @@ -42,14 +42,13 @@ #include #include -#include +#include #include #include #include #include -#include #include @@ -59,7 +58,6 @@ template class Triangulation_data_structure_3 : public Triangulation_utils_3 { - typedef Triangulation_data_structure_3 Self; public: typedef Triangulation_data_structure_3 Tds; @@ -69,13 +67,10 @@ public: typedef Triangulation_ds_vertex_3 Vertex; typedef Triangulation_ds_cell_3 Cell; - typedef Triangulation_cell_handle_3 Cell_handle; - typedef Triangulation_vertex_handle_3 Vertex_handle; - // TODO : The following (simpler), should work. One day... - //typedef Pointer Cell_handle; - //typedef Pointer Vertex_handle; - //typedef Cell * Cell_handle; - //typedef Vertex * Vertex_handle; + typedef Pointer Cell_handle; + typedef Pointer Vertex_handle; + // typedef Cell * Cell_handle; + // typedef Vertex * Vertex_handle; typedef std::pair Facet; typedef triple Edge; diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_handles_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_handles_3.h deleted file mode 100644 index 308ecd4eab6..00000000000 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_handles_3.h +++ /dev/null @@ -1,92 +0,0 @@ -// ============================================================================ -// -// Copyright (c) 1999 The CGAL Consortium -// -// This software and related documentation is part of an INTERNAL release -// of the Computational Geometry Algorithms Library (CGAL). It is not -// intended for general use. -// -// ---------------------------------------------------------------------------- -// -// release : -// release_date : -// -// file : include/CGAL/Triangulation_handles_3.h -// revision : $Revision$ -// author(s) : Monique Teillaud -// -// coordinator : INRIA Sophia Antipolis () -// -// ============================================================================ - -#ifndef CGAL_TRIANGULATION_HANDLES_3_H -#define CGAL_TRIANGULATION_HANDLES_3_H - -#include -#include - -CGAL_BEGIN_NAMESPACE - -template -class Triangulation_vertex_handle_3 - : public Pointer -{ - typedef typename Tr::Vertex Vertex; - typedef Pointer Ptr; - typedef Triangulation_vertex_handle_3 Vertex_handle; -public: - - Triangulation_vertex_handle_3() - : Ptr(NULL) - {} - - Triangulation_vertex_handle_3(const Vertex * v) - : Ptr(const_cast(v)) - {} - - Vertex_handle & operator=(Vertex * v) - { - ptr() = v; - return *this; - } - - Vertex_handle & operator=(const Vertex_handle & v) - { - ptr() = v.ptr(); - return *this; - } -}; - -template -class Triangulation_cell_handle_3 - : public Pointer -{ - typedef typename Tr::Cell Cell; - typedef Pointer Ptr; - typedef Triangulation_cell_handle_3 Cell_handle; -public: - - Triangulation_cell_handle_3() - : Ptr(NULL) - {} - - Triangulation_cell_handle_3(const Cell * c) - : Ptr(const_cast(c)) - {} - - Cell_handle & operator=(Cell * c) - { - ptr() = c; - return *this; - } - - Cell_handle & operator=(const Cell_handle & c) - { - ptr() = c.ptr(); - return *this; - } -}; - -CGAL_END_NAMESPACE - -#endif // CGAL_TRIANGULATION_HANDLES_3_H diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_short_names_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_short_names_3.h index a82daaf6105..3d9b1972c4e 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_short_names_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_short_names_3.h @@ -26,8 +26,6 @@ #define Triangulation_vertex_base_3 T_vb #define Triangulation_cell_base_3 T_cb -#define Triangulation_geom_traits_3 T_gt - #define Triangulation_data_structure_3 TDS #define Triangulation_ds_vertex_3 TDS_v @@ -41,9 +39,6 @@ #define Triangulation_3 TR -#define Triangulation_vertex_handle_3 T_vh -#define Triangulation_cell_handle_3 T_ch - #define Triangulation_finite_iterator_3 T_Fit #define Triangulation_finite_iterator2_3 T_Fit2