From 6283291c8a3befe985e14f89588dfdcc304d2cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 13 Jun 2018 14:43:49 +0200 Subject: [PATCH] Moved CGAL::iterator to CGAL::cpp98 --- .../Algebraic_curve_kernel_2.h | 8 ++++---- .../Curved_kernel_via_analysis_2_functors.h | 8 ++++---- .../Make_x_monotone_2.h | 4 ++-- .../Sweep_curves_adapter_2.h | 2 +- .../CGAL/Qt/PointsInKdTreeGraphicsItem.h | 3 ++- STL_Extension/include/CGAL/iterator.h | 17 ++++++++++------- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h index adcd86758f9..b8a82d66cbd 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h @@ -1808,8 +1808,8 @@ public: */ class X_critical_points_2 : public CGAL::binary_function< Curve_analysis_2, - CGAL::iterator, - CGAL::iterator > { + CGAL::cpp98::iterator, + CGAL::cpp98::iterator > { public: @@ -1887,8 +1887,8 @@ public: */ class Y_critical_points_2 : public CGAL::binary_function< Curve_analysis_2, - CGAL::iterator, - CGAL::iterator > { + CGAL::cpp98::iterator, + CGAL::cpp98::iterator > { public: diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h index 97c81889536..9520105d9be 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h @@ -1432,7 +1432,7 @@ public: CGAL_CKvA_2_GRAB_BASE_FUNCTOR_TYPES //! the result type - typedef CGAL::iterator< std::output_iterator_tag, CGAL::Object > + typedef CGAL::cpp98::iterator< std::output_iterator_tag, CGAL::Object > result_type; //! the arity of the functor @@ -1888,7 +1888,7 @@ public: CGAL_CKvA_2_GRAB_BASE_FUNCTOR_TYPES //! the result type - typedef CGAL::iterator< std::output_iterator_tag, CGAL::Object > + typedef CGAL::cpp98::iterator< std::output_iterator_tag, CGAL::Object > result_type; //! the arity of the functor @@ -2511,7 +2511,7 @@ public: typedef typename Curve_analysis_2::Coordinate_2 Coordinate_2; //! the result type - typedef CGAL::iterator< std::output_iterator_tag, Coordinate_2 > + typedef CGAL::cpp98::iterator< std::output_iterator_tag, Coordinate_2 > result_type; //! the arity of the functor @@ -2576,7 +2576,7 @@ public: typedef typename Curve_analysis_2::Coordinate_2 Coordinate_2; //! the result type - typedef CGAL::iterator< std::output_iterator_tag, Coordinate_2 > + typedef CGAL::cpp98::iterator< std::output_iterator_tag, Coordinate_2 > result_type; //! the arity of the functor diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h index e9f9fd3e5ee..42688e11618 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h @@ -58,8 +58,8 @@ template < class CurvedKernelViaAnalysis_2, typename CurvedKernelViaAnalysis_2::Construct_arc_2 > struct Make_x_monotone_2 : public CGAL::binary_function< typename CurvedKernelViaAnalysis_2::Curve_2, - CGAL::iterator, - CGAL::iterator > { + CGAL::cpp98::iterator, + CGAL::cpp98::iterator > { //!\name Public types //!@{ diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h index d998a3e5600..57cc08578ce 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h @@ -693,7 +693,7 @@ class Make_x_monotone_2 typedef typename SweepCurvesAdapter_2::Generic_arc_2 Generic_arc_2; public: - typedef CGAL::iterator + typedef CGAL::cpp98::iterator result_type; //! standard constructor diff --git a/GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h b/GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h index 4110846e01b..174df6b81ca 100644 --- a/GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h +++ b/GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h @@ -54,7 +54,8 @@ class PointsInKdTreeGraphicsItem : public GraphicsItem // Instead of first collecting points into a container, and then draw them // we use an output iterator that draws them on the fly template - class Draw : public CGAL::iterator { + class Draw + : public CGAL::cpp98::iterator { QPainter* painter; QMatrix* matrix; Converter convert; diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h index adc95996dd1..c7207a10c8b 100644 --- a/STL_Extension/include/CGAL/iterator.h +++ b/STL_Extension/include/CGAL/iterator.h @@ -88,6 +88,8 @@ Iterator_range > make_prevent_deref_range(const I& begin, const return Iterator_range >(make_prevent_deref(begin), make_prevent_deref(end)); } +namespace cpp98 { + template struct iterator @@ -104,7 +106,8 @@ struct iterator typedef Reference reference; }; - +} // end namespace cpp98 + // +----------------------------------------------------------------+ // | Emptyset_iterator // +----------------------------------------------------------------+ @@ -112,7 +115,7 @@ struct iterator // +----------------------------------------------------------------+ struct Emptyset_iterator - : public CGAL::iterator< std::output_iterator_tag, void, void, void, void > + : public CGAL::cpp98::iterator< std::output_iterator_tag, void, void, void, void > { template< class T > Emptyset_iterator& operator=(const T&) { return *this; } @@ -132,7 +135,7 @@ struct Emptyset_iterator template < class Container > class Insert_iterator - : public CGAL::iterator< std::output_iterator_tag, void, void, void, void > + : public CGAL::cpp98::iterator< std::output_iterator_tag, void, void, void, void > { protected: Container *container; @@ -173,8 +176,8 @@ inserter(Container &x) template < class T > class Oneset_iterator - : public CGAL::iterator< std::bidirectional_iterator_tag, - void, void, void, void > + : public CGAL::cpp98::iterator< std::bidirectional_iterator_tag, + void, void, void, void > { T* t; @@ -280,7 +283,7 @@ private: // Undocumented, because there is some hope to merge it into Counting_iterator class Counting_output_iterator - : public CGAL::iterator< std::output_iterator_tag, void, void, void, void > + : public CGAL::cpp98::iterator< std::output_iterator_tag, void, void, void, void > { std::size_t *c; public: @@ -1216,7 +1219,7 @@ public: template class Filter_output_iterator - : public CGAL::iterator + : public CGAL::cpp98::iterator { protected: _Iterator iterator;