From 2a5458f8ab59d02dfec0c12b953f46bea9949c76 Mon Sep 17 00:00:00 2001 From: Monique Teillaud Date: Wed, 16 Jun 1999 08:39:11 +0000 Subject: [PATCH] Removing #include ... short_names --- .../include/CGAL/Delaunay_triangulation_3.h | 3 ++- .../include/CGAL/Triangulation_3.h | 16 ++++++---------- .../include/CGAL/Triangulation_cell_3.h | 4 ++-- .../include/CGAL/Triangulation_cell_base_3.h | 4 ++-- .../include/CGAL/Triangulation_circulators_3.h | 5 ++--- .../CGAL/Triangulation_data_structure_3.h | 3 ++- .../include/CGAL/Triangulation_ds_cell_3.h | 6 ++---- .../CGAL/Triangulation_ds_circulators_3.h | 5 ++--- .../include/CGAL/Triangulation_ds_iterators_3.h | 6 ++---- .../include/CGAL/Triangulation_ds_vertex_3.h | 4 ++-- .../include/CGAL/Triangulation_geom_traits_3.h | 4 ++-- .../include/CGAL/Triangulation_handles_3.h | 7 ++++--- .../include/CGAL/Triangulation_iterators_3.h | 5 ++--- .../include/CGAL/Triangulation_utils_3.h | 3 ++- .../include/CGAL/Triangulation_vertex_3.h | 4 ++-- .../include/CGAL/Triangulation_vertex_base_3.h | 5 ++--- Packages/Triangulation_3/include/CGAL/triple.h | 3 ++- 17 files changed, 40 insertions(+), 47 deletions(-) diff --git a/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h b/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h index 643c07058d0..37cc1223326 100644 --- a/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h +++ b/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h @@ -16,7 +16,8 @@ // // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_3.h index a502e907eb2..29d20febdfc 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_3.h @@ -16,7 +16,8 @@ // // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ @@ -28,8 +29,7 @@ #include #include #include -//#include -//#include + #include #include @@ -42,7 +42,6 @@ #include #include -#include #include @@ -83,8 +82,6 @@ class Triangulation_3 { friend std::istream& operator>> CGAL_NULL_TMPL_ARGS (std::istream& is, Triangulation_3 &tr); -// friend std::ostream& operator<< CGAL_NULL_TMPL_ARGS -// (std::ostream& os, const Triangulation_3 &tr); friend class Triangulation_cell_3; friend class Triangulation_vertex_3; @@ -98,7 +95,6 @@ class Triangulation_3 friend Triangulation_cell_circulator_3; public: - // typedef Triangulation_3 Triangulation; typedef typename GT::Point Point; typedef typename GT::Segment Segment; @@ -140,8 +136,8 @@ private: { infinite = (Vertex*) _tds.insert_outside_affine_hull(Vertex(Point(500,500,500))); // forces the compiler to instanciate debug : - debug( infinite ); - debug( Cell_handle() ); + handle2pointer( infinite ); + handle2pointer( Cell_handle() ); } // debug @@ -235,7 +231,7 @@ public: const Tds & tds() const { return _tds;} - inline + // inline int dimension() const { return _tds.dimension();} diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_cell_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_cell_3.h index 0988662e438..8222c11faa8 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_cell_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_cell_3.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ @@ -23,7 +24,6 @@ #define CGAL_TRIANGULATION_CELL_3_H #include -#include #include CGAL_BEGIN_NAMESPACE diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h index 4d75cc92b0f..c8163367437 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ // @@ -27,7 +28,6 @@ #define CGAL_TRIANGULATION_CELL_BASE_3_H #include -#include CGAL_BEGIN_NAMESPACE diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_circulators_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_circulators_3.h index a944147c640..bb2970a5a34 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_circulators_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_circulators_3.h @@ -16,18 +16,17 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ #ifndef CGAL_TRIANGULATION_CIRCULATORS_3_H #define CGAL_TRIANGULATION_CIRCULATORS_3_H -// #include #include #include #include -#include #include CGAL_BEGIN_NAMESPACE 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 e71ebc9939d..dcc4faace5a 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ // diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_cell_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_cell_3.h index c7bd54df224..c0051b1af4f 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_cell_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_cell_3.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ // @@ -28,7 +29,6 @@ #ifndef CGAL_TRIANGULATION_DS_CELL_3_H #define CGAL_TRIANGULATION_DS_CELL_3_H -#include #include CGAL_BEGIN_NAMESPACE @@ -39,8 +39,6 @@ class Triangulation_ds_vertex_3; template < class Vb, class Cb > class Triangulation_data_structure_3; -//template < class Tds> -//class Triangulation_ds_iterator_base_3; template < class Tds> class Triangulation_ds_cell_iterator_3; template < class Tds> diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_circulators_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_circulators_3.h index 25d5c1dae47..84d87127581 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_circulators_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_circulators_3.h @@ -15,19 +15,18 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ #ifndef CGAL_TRIANGULATION_DS_CIRCULATORS_3_H #define CGAL_TRIANGULATION_DS_CIRCULATORS_3_H -//#include #include #include #include #include -#include #include CGAL_BEGIN_NAMESPACE diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h index 98e0e81f974..cea82cffd8a 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h @@ -15,19 +15,17 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ #ifndef CGAL_TRIANGULATION_DS_ITERATORS_3_H #define CGAL_TRIANGULATION_DS_ITERATORS_3_H -//#include - #include #include #include -#include #include diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_vertex_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_vertex_3.h index 94ca36668c6..11f742dd07d 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_vertex_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_vertex_3.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ // @@ -26,7 +27,6 @@ #ifndef CGAL_TRIANGULATION_DS_VERTEX_3_H #define CGAL_TRIANGULATION_DS_VERTEX_3_H -#include #include CGAL_BEGIN_NAMESPACE diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h index 0e97a0dc2a3..98f2f80bc8b 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ // @@ -33,7 +34,6 @@ #include #include -#include CGAL_BEGIN_NAMESPACE diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_handles_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_handles_3.h index b43f3811235..717e33b4ac2 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_handles_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_handles_3.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ @@ -87,7 +88,7 @@ public: template Triangulation_vertex_3 * -debug(const Triangulation_vertex_handle_3 v) +handle2pointer(const Triangulation_vertex_handle_3 v) { return v.ptr(); } @@ -140,7 +141,7 @@ public: template Triangulation_cell_3 * -debug(const Triangulation_cell_handle_3 c) +handle2pointer(const Triangulation_cell_handle_3 c) { return c.ptr(); } diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_iterators_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_iterators_3.h index 6a51573b66a..df35b3bd630 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_iterators_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_iterators_3.h @@ -16,18 +16,17 @@ // // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ #ifndef CGAL_TRIANGULATION_ITERATORS_3_H #define CGAL_TRIANGULATION_ITERATORS_3_H -//#include #include #include #include -#include #include CGAL_BEGIN_NAMESPACE diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_utils_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_utils_3.h index ae86c426c2e..4f1f5b39adb 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_utils_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_utils_3.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_vertex_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_vertex_3.h index 95e8cdea39f..cd30482f8ff 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_vertex_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_vertex_3.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ @@ -23,7 +24,6 @@ #define CGAL_TRIANGULATION_VERTEX_3_H #include -#include #include #include diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h index 2ef6e1faf09..02f819ad000 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h @@ -15,15 +15,14 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================ #ifndef CGAL_TRIANGULATION_VERTEX_BASE_3_H #define CGAL_TRIANGULATION_VERTEX_BASE_3_H -#include - CGAL_BEGIN_NAMESPACE template < class GT > diff --git a/Packages/Triangulation_3/include/CGAL/triple.h b/Packages/Triangulation_3/include/CGAL/triple.h index b0435b24f05..40306cb7cb1 100644 --- a/Packages/Triangulation_3/include/CGAL/triple.h +++ b/Packages/Triangulation_3/include/CGAL/triple.h @@ -15,7 +15,8 @@ // revision : $Revision$ // author(s) : Monique Teillaud // -// coordinator : INRIA Sophia Antipolis (Mariette Yvinec) +// coordinator : INRIA Sophia Antipolis +// (Mariette Yvinec ) // // ============================================================================