From fa80e58d1df10491af6f9a9ef1dc1c521728ea36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20Sch=C3=B6nherr?= Date: Wed, 29 Sep 1999 15:39:09 +0000 Subject: [PATCH] added 'CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(...).' changed order of constructors (moved member template to the end). --- Packages/Min_circle_2/web/Min_circle_2.aw | 15 +++++++++++---- Packages/Min_ellipse_2/web/Min_ellipse_2.aw | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Packages/Min_circle_2/web/Min_circle_2.aw b/Packages/Min_circle_2/web/Min_circle_2.aw index e1dcc325053..04592df17b7 100644 --- a/Packages/Min_circle_2/web/Min_circle_2.aw +++ b/Packages/Min_circle_2/web/Min_circle_2.aw @@ -239,7 +239,7 @@ The class interface looks as follows. private: // Private member functions - // ----------------------- + // ------------------------ @ @ @@ -247,7 +247,8 @@ The class interface looks as follows. public: // Constructors // ------------ - @ + @ + @ // Destructor // ---------- @@ -411,7 +412,7 @@ a vector and shuffled at random, before being copied to \ccc{points}. Finally the private member function $mc$ is called to compute $mc(P)=mc(P,\emptyset)$. -@macro += @begin +@macro = @begin #ifndef CGAL_CFG_NO_MEMBER_TEMPLATES // STL-like constructor (member template) @@ -552,7 +553,7 @@ more convenient, a constructor is available for each size of $|S|$, ranging from 0 to 3. For $|S|=0$, we get the default constructor, building $mc(\emptyset)$. -@macro += @begin +@macro = @begin // default constructor inline @@ -2451,6 +2452,9 @@ homogeneous representation with number type \ccc{Gmpz}. typedef Homogeneous< Rt > RepH; typedef Min_circle_2_traits_2< RepC > TraitsC; typedef Min_circle_2_traits_2< RepH > TraitsH; + + CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC( RepC::Point_2); + CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC( RepH::Point_2); @end The command line option \ccc{-verbose} enables verbose output. @@ -2806,6 +2810,9 @@ representation) and corresponding data accessors. p = MyPointH2( hx, hy, hw); } }; + + CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC( MyPointC2); + CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC( MyPointH2); @end To test the traits class adapters we use the code coverage test function. diff --git a/Packages/Min_ellipse_2/web/Min_ellipse_2.aw b/Packages/Min_ellipse_2/web/Min_ellipse_2.aw index bdc84ba0224..f0e7980b714 100644 --- a/Packages/Min_ellipse_2/web/Min_ellipse_2.aw +++ b/Packages/Min_ellipse_2/web/Min_ellipse_2.aw @@ -242,7 +242,7 @@ The class interface looks as follows. private: // Private member functions - // ----------------------- + // ------------------------ @ @ @@ -250,7 +250,8 @@ The class interface looks as follows. public: // Constructors // ------------ - @ + @ + @ // Destructor // ---------- @@ -428,7 +429,7 @@ to a vector and shuffled at random, before being copied to \ccc{points}. Finally the private member function $me$ is called to compute $me(P)=me(P,\emptyset)$. -@macro += @begin +@macro = @begin #ifndef CGAL_CFG_NO_MEMBER_TEMPLATES // STL-like constructor (member template) @@ -568,7 +569,7 @@ $S$ in constant time. To make this reconstruction more convenient, a constructor is available for each size of $|S|$, ranging from 0 to 5. For $|S|=0$, we get the default constructor, building $me(\emptyset)$. -@macro += @begin +@macro = @begin // default constructor inline @@ -2646,6 +2647,9 @@ number type \ccc{Gmpz} or \ccc{integer}. typedef Homogeneous< Rt > RepH; typedef Min_ellipse_2_traits_2< RepC > TraitsC; typedef Min_ellipse_2_traits_2< RepH > TraitsH; + + CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC( RepC::Point_2); + CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC( RepH::Point_2); @end The command line option \ccc{-verbose} enables verbose output. @@ -3028,6 +3032,9 @@ representation) and corresponding data accessors. p = MyPointH2( hx, hy, hw); } }; + + CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC( MyPointC2); + CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC( MyPointH2); @end To test the traits class adapters we use the code coverage test function.