From 35c73217e8649f8b03b6850fa6d45b8e9de0e91c Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Fri, 15 Sep 2000 07:41:23 +0000 Subject: [PATCH] *** empty log message *** --- Packages/Min_quadrilateral_2/changes.txt | 2 ++ .../include/CGAL/Min_quadrilateral_traits_2.h | 33 +++++++------------ .../Min_quadrilateral_2/long_description.txt | 7 ++++ Packages/Min_quadrilateral_2/version | 2 +- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Packages/Min_quadrilateral_2/changes.txt b/Packages/Min_quadrilateral_2/changes.txt index 27513d4bae1..80f3b6d0228 100644 --- a/Packages/Min_quadrilateral_2/changes.txt +++ b/Packages/Min_quadrilateral_2/changes.txt @@ -10,5 +10,7 @@ ALL : Fixed file headers. ALL : minimum_enclosing_* -> min_* DOCS: Changed to new manual style. +DOCS: Added some indexing commands for terms. +DOCS: Some minor fixes in documentation. DOCS: Fixed \ccPureGlobalScope. ALL : Removed superfluous window include. diff --git a/Packages/Min_quadrilateral_2/include/CGAL/Min_quadrilateral_traits_2.h b/Packages/Min_quadrilateral_2/include/CGAL/Min_quadrilateral_traits_2.h index 186b6401645..27a176f4503 100644 --- a/Packages/Min_quadrilateral_2/include/CGAL/Min_quadrilateral_traits_2.h +++ b/Packages/Min_quadrilateral_2/include/CGAL/Min_quadrilateral_traits_2.h @@ -109,28 +109,17 @@ struct Min_quadrilateral_default_traits_2 { typedef Min_strip_2< R > Strip_2; // Predicates - typedef std::equal_to< Point_2 > Equal_2; - struct Less_x_2 - : public CGAL_STD::binary_function< Point_2, Point_2, bool > - { - bool - operator()(const Point_2& p, const Point_2& q) const - { return p.x() < q.x(); } - }; - struct Less_y_2 - : public CGAL_STD::binary_function< Point_2, Point_2, bool > - { - bool - operator()(const Point_2& p, const Point_2& q) const - { return p.y() < q.y(); } - }; - struct Greater_x_2 - : public CGAL_STD::binary_function< Point_2, Point_2, bool > - { - bool - operator()(const Point_2& p, const Point_2& q) const - { return p.x() > q.x(); } - }; + typedef typename R::Equal_2 Equal_2; + // std::equal_to< Point_2 > Equal_2; + typedef typename R::Less_x_2 Less_x_2; + typedef typename R::Less_y_2 Less_y_2; + struct Greater_x_2 + : public CGAL_STD::binary_function< Point_2, Point_2, bool > + { + bool + operator()(const Point_2& p, const Point_2& q) const + { return p.x() > q.x(); } + }; struct Greater_y_2 : public CGAL_STD::binary_function< Point_2, Point_2, bool > { diff --git a/Packages/Min_quadrilateral_2/long_description.txt b/Packages/Min_quadrilateral_2/long_description.txt index b63020b0014..bbc99519472 100644 --- a/Packages/Min_quadrilateral_2/long_description.txt +++ b/Packages/Min_quadrilateral_2/long_description.txt @@ -3,6 +3,13 @@ //===================================================================== +//--------------------------------------------------------------------- +// revision 1.11 +//--------------------------------------------------------------------- + +DOCS: Added some indexing commands for terms. +DOCS: Some minor fixes in documentation. + //--------------------------------------------------------------------- // revision 1.10 //--------------------------------------------------------------------- diff --git a/Packages/Min_quadrilateral_2/version b/Packages/Min_quadrilateral_2/version index 1cb8b8d9795..5e3f81b98a6 100644 --- a/Packages/Min_quadrilateral_2/version +++ b/Packages/Min_quadrilateral_2/version @@ -1,2 +1,2 @@ -1.10 (13 September 2000) +1.11 (15 September 2000) maintainer: Michael Hoffmann