From 7b114599ad4775f8e82f389fc3b17b68629f0bbf Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Thu, 3 Jan 2008 19:02:00 +0000 Subject: [PATCH] Get rid of CGAL_REP_CLASS_DEFINED --- Convex_hull_2/include/CGAL/convex_hull_2.h | 13 +----------- .../include/CGAL/convex_hull_traits_2.h | 5 ++--- .../Segment_Delaunay_graph_2/Traits_base_2.h | 21 ------------------- 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/Convex_hull_2/include/CGAL/convex_hull_2.h b/Convex_hull_2/include/CGAL/convex_hull_2.h index d3bc8c48257..232288b4506 100644 --- a/Convex_hull_2/include/CGAL/convex_hull_2.h +++ b/Convex_hull_2/include/CGAL/convex_hull_2.h @@ -17,16 +17,11 @@ // // Author(s) : Stefan Schirra - #ifndef CGAL_CONVEX_HULL_2_H #define CGAL_CONVEX_HULL_2_H #include - -#ifdef CGAL_REP_CLASS_DEFINED #include -#endif // CGAL_REP_CLASS_DEFINED - #include #include #include @@ -192,13 +187,7 @@ upper_hull_points_2(ForwardIterator first, ForwardIterator last, typedef typename KTraits::Kernel Kernel; return upper_hull_points_2(first, last, result, Kernel()); } + CGAL_END_NAMESPACE #endif // CGAL_CONVEX_HULL_2_H - - - - - - - diff --git a/Convex_hull_2/include/CGAL/convex_hull_traits_2.h b/Convex_hull_2/include/CGAL/convex_hull_traits_2.h index 34faaa87431..2a95f5b7feb 100644 --- a/Convex_hull_2/include/CGAL/convex_hull_traits_2.h +++ b/Convex_hull_2/include/CGAL/convex_hull_traits_2.h @@ -29,6 +29,7 @@ #include CGAL_BEGIN_NAMESPACE + template class Convex_hull_traits_2 : public K_ { @@ -72,10 +73,8 @@ public: template class convex_hull_traits_2 : public Convex_hull_traits_2 -{ -}; +{}; CGAL_END_NAMESPACE #endif // CGAL_CONVEX_HULL_TRAITS_2_H - diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_base_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_base_2.h index e19e2ea64c5..93e83e1d93c 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_base_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_base_2.h @@ -13,42 +13,22 @@ // // $URL$ // $Id$ -// // // Author(s) : Menelaos Karavelas - - #ifndef CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H #define CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H #include - -#ifndef CGAL_REP_CLASS_DEFINED -#error no representation class defined -#endif // CGAL_REP_CLASS_DEFINED - -#if defined CGAL_CARTESIAN_H || defined CGAL_SIMPLE_CARTESIAN_H #include #include -#endif - - #include - CGAL_BEGIN_NAMESPACE -//----------------------------------------------------------------------- -//----------------------------------------------------------------------- -//----------------------------------------------------------------------- //----------------------------------------------------------------------- // the Traits class //----------------------------------------------------------------------- -//----------------------------------------------------------------------- -//----------------------------------------------------------------------- -//----------------------------------------------------------------------- - template class Segment_Delaunay_graph_traits_base_2 @@ -254,7 +234,6 @@ public: }; - CGAL_END_NAMESPACE #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H