From e52d2dabc746901dfd55fef2ec3b5937be43ae49 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Tue, 27 Nov 2007 15:56:04 +0000 Subject: [PATCH] made private instead of protected --- .../Arr_batched_point_location_traits_2.h | 28 +++++++++---------- .../CGAL/Arrangement_2/Arr_traits_adaptor_2.h | 26 ++++++++--------- .../Arr_basic_insertion_traits_2.h | 24 ++++++++-------- .../CGAL/Sweep_line_2/Arr_overlay_traits_2.h | 22 +++++++-------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h index b76b7bcfff3..09962441106 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h @@ -202,7 +202,7 @@ public: * on a boundary of the parameter space along the x axis. */ class Boundary_in_x_2 { - private: + protected: //! The base traits. const Base_traits_2 *m_base; @@ -248,7 +248,7 @@ public: * on a boundary of the parameter space along the y axis. */ class Boundary_in_y_2 { - private: + protected: //! The base traits. const Base_traits_2 *m_base; @@ -292,7 +292,7 @@ public: /*! A functor that obtains the left endpoint of an x-monotone curve. */ class Construct_min_vertex_2 { - private: + protected: //! The base operator. Base_construct_min_vertex_2 m_base_min_v; @@ -332,7 +332,7 @@ public: /*! A functor that obtains the right endpoint of an x-monotone curve. */ class Construct_max_vertex_2 { - private: + protected: //! The base operator. Base_construct_max_vertex_2 m_base_max_v; @@ -372,7 +372,7 @@ public: /*! A functor that compares two points lexigoraphically: by x, then by y. */ class Compare_xy_2 { - private: + protected: //! The base operator. Base_compare_xy_2 m_base_cmp_xy; @@ -417,7 +417,7 @@ public: * x-monotone curve at the point x-coordinate. */ class Compare_y_at_x_2 { - private: + protected: //! The base operator. Base_compare_y_at_x_2 m_base_cmp_y_at_x; @@ -451,7 +451,7 @@ public: * curves immediately to the right of their intersection point. */ class Compare_y_at_x_right_2 { - private: + protected: //! The base operator. Base_compare_y_at_x_right_2 m_base_cmp_y_at_x_right; @@ -489,7 +489,7 @@ public: * identical. */ class Equal_2 { - private: + protected: //! The base operator. Base_equal_2 m_base_eq; @@ -541,7 +541,7 @@ public: /*! A functor that compares the x-coordinates of two points */ class Compare_x_2 { - private: + protected: //! The base operator. Base_compare_x_2 m_base_cmp_x; @@ -570,7 +570,7 @@ public: /*! A functor that checks whether a given x-monotone curve is vertical. */ class Is_vertical_2 { - private: + protected: //! The base operator. Base_is_vertical_2 m_base_is_vert; @@ -601,7 +601,7 @@ public: * boundary of the parameter space. */ class Compare_x_near_boundary_2 { - private: + protected: //! The base traits. const Base_traits_2 * m_base; @@ -682,7 +682,7 @@ public: * boundary of the parameter space */ class Compare_y_near_boundary_2 { - private: + protected: //! The base traits. const Base_traits_2 * m_base; @@ -738,7 +738,7 @@ public: * that lie on the horizontal identification curve. */ class Compare_x_on_identification_2 { - private: + protected: //! The base traits. const Base_traits_2 * m_base; @@ -772,7 +772,7 @@ public: * that lie on the vertical identification curve. */ class Compare_y_on_identification_2 { - private: + protected: //! The base traits. const Base_traits_2 * m_base; diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h index ddbf9cb856e..c8a186ec940 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h @@ -108,7 +108,7 @@ public: return _compare_y_at_x_left_imp (xcv1, xcv2, p, Has_left_category()); } - private: + protected: //! The base traits. const Self *m_self; @@ -243,7 +243,7 @@ public: return _boundary_in_x_imp (xcv, ind, Has_boundary_category()); } - private: + protected: //! The base traits. const Base * m_base; @@ -306,7 +306,7 @@ public: return _boundary_in_y_imp (xcv, ind, Has_boundary_category()); } - private: + protected: //! The base traits. const Base * m_base; @@ -353,7 +353,7 @@ public: * boundary of the parameter space */ class Compare_x_near_boundary_2 { - private: + protected: //! The base traits. const Base * m_base; @@ -467,7 +467,7 @@ public: * boundary of the parameter space. */ class Compare_y_near_boundary_2 { - private: + protected: //! The base traits. const Base * m_base; @@ -538,7 +538,7 @@ public: * that lie on the horizontal identification arc. */ class Compare_x_on_identification_2 { - private: + protected: //! The base traits. const Base * m_base; @@ -577,7 +577,7 @@ public: * that lie on the vertical identification arc. */ class Compare_y_on_identification_2 { - private: + protected: //! The base traits. const Base * m_base; @@ -845,7 +845,7 @@ public: return (res != LARGER); } - private: + protected: //! The base traits. const Self *m_self; @@ -1075,7 +1075,7 @@ public: } } - private: + protected: //! The base traits. const Self *m_self; @@ -1301,7 +1301,7 @@ public: } } - private: + protected: //! The base traits. const Self *m_self; @@ -1378,7 +1378,7 @@ public: return (from_top ? SMALLER : LARGER); } - private: + protected: //! The base traits. const Self *m_self; @@ -1474,7 +1474,7 @@ public: return (_are_mergeable_imp (xcv1, xcv2, Has_merge_category())); } - private: + protected: //! The base traits. const Base *m_base; @@ -1538,7 +1538,7 @@ public: _merge_imp (xcv1, xcv2, c, Has_merge_category()); } - private: + protected: //! The base traits. const Base *m_base; diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h index 8f0b5c251e5..1a55cec4949 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h @@ -242,7 +242,7 @@ public: /*! A functor that obtains the left endpoint of an x-monotone curve. */ class Construct_min_vertex_2 { - private: + protected: Base_construct_min_vertex_2 m_base_min_v; Base_equal_2 m_base_equal; Halfedge_handle invalid_he; @@ -301,7 +301,7 @@ public: /*! A functor that obtains the right endpoint of an x-monotone curve. */ class Construct_max_vertex_2 { - private: + protected: Base_construct_max_vertex_2 m_base_max_v; Base_equal_2 m_base_equal; Halfedge_handle invalid_he; @@ -361,7 +361,7 @@ public: /*! A functor that compares two points lexigoraphically: by x, then by y. */ class Compare_xy_2 { - private: + protected: Base_compare_xy_2 m_base_cmp_xy; /*! Constructor. @@ -395,7 +395,7 @@ public: * x-monotone curve at the point x-coordinate. */ class Compare_y_at_x_2 { - private: + protected: Base_compare_y_at_x_2 m_base_cmp_y_at_x; /*! Constructor. @@ -428,7 +428,7 @@ public: * curves immediately to the right of their intersection point. */ class Compare_y_at_x_right_2 { - private: + protected: Base_compare_y_at_x_right_2 m_base_cmp_y_at_x_right; /*! Constructor. @@ -465,7 +465,7 @@ public: * identical. */ class Equal_2 { - private: + protected: Base_equal_2 m_base_eq; /*! Constructor. @@ -501,7 +501,7 @@ public: /*! A functor that compares the x-coordinates of two points */ class Compare_x_2 { - private: + protected: Base_compare_x_2 m_base_cmp_x; /*! Constructor. @@ -529,7 +529,7 @@ public: /*! A functor that checks whether a given x-monotone curve is vertical. */ class Is_vertical_2 { - private: + protected: Base_is_vertical_2 m_base_is_vert; /*! Constructor. @@ -559,7 +559,7 @@ public: * on a boundary of the parameter space along the x axis. */ class Boundary_in_x_2 { - private: + protected: //! The base traits. const Traits_2 * m_base; @@ -609,7 +609,7 @@ public: * on a boundary of the parameter space along the y axis. */ class Boundary_in_y_2 { - private: + protected: //! The base traits. const Traits_2 * m_base; @@ -659,7 +659,7 @@ public: * boundary of the parameter space. */ class Compare_x_near_boundary_2 { - private: + protected: //! The base traits. const Traits_2 * m_base; @@ -751,7 +751,7 @@ public: * boundary of the parameter space. */ class Compare_y_near_boundary_2 { - private: + protected: //! The base traits. const Traits_2 * m_base; diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h index 868eb361073..718366a6ce3 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h @@ -353,7 +353,7 @@ public: /*! A functor that computes intersections between x-monotone curves. */ class Intersect_2 { - private: + protected: //! The base traits. Traits_2 * m_base_tr; @@ -513,7 +513,7 @@ public: /*! A functor that splits an arc at a point. */ class Split_2 { - private: + protected: //! The base operator. Base_split_2 m_base_split; @@ -553,7 +553,7 @@ public: /*! A functor that obtains the left endpoint of an x-monotone curve. */ class Construct_min_vertex_2 { - private: + protected: //! The base operators. Base_construct_min_vertex_2 m_base_min_v; Base_equal_2 m_base_equal; @@ -624,7 +624,7 @@ public: /*! A functor that obtains the right endpoint of an x-monotone curve. */ class Construct_max_vertex_2 { - private: + protected: //! The base operators. Base_construct_max_vertex_2 m_base_max_v; Base_equal_2 m_base_equal; @@ -695,7 +695,7 @@ public: /*! A functor that compares two points lexigoraphically: by x, then by y. */ class Compare_xy_2 { - private: + protected: //! The base operator. Base_compare_xy_2 m_base_cmp_xy; @@ -757,7 +757,7 @@ public: * x-monotone curve at the point x-coordinate. */ class Compare_y_at_x_2 { - private: + protected: //! The base operator. Base_compare_y_at_x_2 m_base_cmp_y_at_x; @@ -793,7 +793,7 @@ public: * curves immediately to the right of their intersection point. */ class Compare_y_at_x_right_2 { - private: + protected: //! The base operator. Base_compare_y_at_x_right_2 m_base_cmp_y_at_x_right; @@ -833,7 +833,7 @@ public: * on a boundary of the parameter space along the x axis. */ class Boundary_in_x_2 { - private: + protected: //! The base traits. const Traits_2 * m_base; @@ -881,7 +881,7 @@ public: * on a boundary of the parameter space along the y axis. */ class Boundary_in_y_2 { - private: + protected: //! The base traits. const Traits_2 * m_base; @@ -929,7 +929,7 @@ public: * boundary of the parameter space. */ class Compare_x_near_boundary_2 { - private: + protected: //! The base traits. const Traits_2 * m_base; @@ -1012,7 +1012,7 @@ public: * boundary of the parameter space. */ class Compare_y_near_boundary_2 { - private: + protected: //! The base traits. const Traits_2 * m_base;