From c8a67a77f94886f773bb53536f98dcb171026e08 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Thu, 23 Jan 2003 13:58:11 +0000 Subject: [PATCH] Changed category name to Has_left --- .../include/CGAL/Arr_circles_real_traits.h | 6 ++++-- .../Arrangement/include/CGAL/Arr_conic_traits_2.h | 14 +++++++------- .../include/CGAL/Arr_leda_polyline_traits.h | 4 ++-- .../Arrangement/include/CGAL/Arr_polyline_traits.h | 4 ++-- .../include/CGAL/Arr_segment_circle_traits.h | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Packages/Arrangement/include/CGAL/Arr_circles_real_traits.h b/Packages/Arrangement/include/CGAL/Arr_circles_real_traits.h index 77da34d048c..1726953e541 100644 --- a/Packages/Arrangement/include/CGAL/Arr_circles_real_traits.h +++ b/Packages/Arrangement/include/CGAL/Arr_circles_real_traits.h @@ -24,7 +24,7 @@ #include #include -#include +#include CGAL_BEGIN_NAMESPACE @@ -113,7 +113,9 @@ private: template class Arr_circles_real_traits { public: - typedef Lazy_intersection_tag Intersection_category; + // Categories: + typedef Tag_false Has_left_category; + typedef _NT NT; //the difference between Curve and X_curve is semantical only, diff --git a/Packages/Arrangement/include/CGAL/Arr_conic_traits_2.h b/Packages/Arrangement/include/CGAL/Arr_conic_traits_2.h index 2472b483552..0c1a4b16d54 100644 --- a/Packages/Arrangement/include/CGAL/Arr_conic_traits_2.h +++ b/Packages/Arrangement/include/CGAL/Arr_conic_traits_2.h @@ -22,14 +22,12 @@ #define CGAL_ARR_CONIC_TRAITS_2_H #include -#include +#include #include "CGAL/Arrangement_2/Conic_arc_2.h" #include CGAL_BEGIN_NAMESPACE -// #define REFLECT - // ---------------------------------------------------------------------------- // Arrangement traits for conic arcs. // @@ -41,10 +39,12 @@ class Arr_conic_traits_2 typedef Kernel_ Kernel; typedef typename Kernel::FT NT; -#if defined(REFLECT) - typedef Lazy_intersection_tag Intersection_category; + // Categories: +//#define HAS_LEFT_NOT +#if !defined(HAS_LEFT_NOT) + typedef Tag_true Has_left_category; #else - typedef Efficient_intersection_tag Intersection_category; + typedef Tag_false Has_left_category; #endif // The difference between Curve_2 and X_curve_2 is semantical only, @@ -822,7 +822,7 @@ class Arr_conic_traits_2 Point_2::User_defined)); } -#if defined(REFLECT) +#if defined(HAS_LEFT_NOT) // Reflect a point in y. Point_2 point_reflect_in_y (const Point_2& p) const { diff --git a/Packages/Arrangement/include/CGAL/Arr_leda_polyline_traits.h b/Packages/Arrangement/include/CGAL/Arr_leda_polyline_traits.h index 4a3e19048fb..f9a6cb93715 100644 --- a/Packages/Arrangement/include/CGAL/Arr_leda_polyline_traits.h +++ b/Packages/Arrangement/include/CGAL/Arr_leda_polyline_traits.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include //the following is for a type check (creates compiler problems,not implemented) //#include @@ -44,7 +44,7 @@ template > class Arr_leda_polyline_traits : public leda_rat_kernel_traits { public: - typedef Lazy_intersection_tag Intersection_category; + typedef Tag_false Has_left_category; typedef FT_ FT; typedef Arr_leda_polyline_traits Self; diff --git a/Packages/Arrangement/include/CGAL/Arr_polyline_traits.h b/Packages/Arrangement/include/CGAL/Arr_polyline_traits.h index 7b4df5ddf96..1ff45f9254b 100644 --- a/Packages/Arrangement/include/CGAL/Arr_polyline_traits.h +++ b/Packages/Arrangement/include/CGAL/Arr_polyline_traits.h @@ -37,7 +37,7 @@ #include #include -#include +#include CGAL_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ template Self; diff --git a/Packages/Arrangement/include/CGAL/Arr_segment_circle_traits.h b/Packages/Arrangement/include/CGAL/Arr_segment_circle_traits.h index 34a49d69619..4d4c7ce63f5 100644 --- a/Packages/Arrangement/include/CGAL/Arr_segment_circle_traits.h +++ b/Packages/Arrangement/include/CGAL/Arr_segment_circle_traits.h @@ -25,7 +25,7 @@ #include #include -#include +#include CGAL_BEGIN_NAMESPACE @@ -37,7 +37,7 @@ template class Arr_segment_circle_traits { public: - typedef Lazy_intersection_tag Intersection_category; + typedef Tag_false Has_left_category; typedef _NT NT;