songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved CGAL::iterator to CGAL::cpp98

This commit is contained in:
Mael Rouxel-Labbé 2018-06-13 14:43:49 +02:00
parent 0c96d06fc3
commit 6283291c8a
6 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h
View File

@ -1808,8 +1808,8 @@ public:
*/
class X_critical_points_2 :
public CGAL::binary_function< Curve_analysis_2,
CGAL::iterator<std::output_iterator_tag, Algebraic_real_2>,
CGAL::iterator<std::output_iterator_tag, Algebraic_real_2> > {
CGAL::cpp98::iterator<std::output_iterator_tag, Algebraic_real_2>,
CGAL::cpp98::iterator<std::output_iterator_tag, Algebraic_real_2> > {
public:
@ -1887,8 +1887,8 @@ public:
*/
class Y_critical_points_2 :
public CGAL::binary_function< Curve_analysis_2,
CGAL::iterator<std::output_iterator_tag, Algebraic_real_2>,
CGAL::iterator<std::output_iterator_tag, Algebraic_real_2> > {
CGAL::cpp98::iterator<std::output_iterator_tag, Algebraic_real_2>,
CGAL::cpp98::iterator<std::output_iterator_tag, Algebraic_real_2> > {
public:

8
Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h
View File

@ -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

4
Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h
View File

@ -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<std::output_iterator_tag, CGAL::Object>,
CGAL::iterator<std::output_iterator_tag, CGAL::Object> > {
CGAL::cpp98::iterator<std::output_iterator_tag, CGAL::Object>,
CGAL::cpp98::iterator<std::output_iterator_tag, CGAL::Object> > {
//!\name Public types
//!@{

2
Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h
View File

@ -693,7 +693,7 @@ class Make_x_monotone_2
typedef typename SweepCurvesAdapter_2::Generic_arc_2 Generic_arc_2;
public:
typedef CGAL::iterator<std::output_iterator_tag, Generic_arc_2>
typedef CGAL::cpp98::iterator<std::output_iterator_tag, Generic_arc_2>
result_type;
//! standard constructor

3
GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h
View File

@ -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 <typename K>
class Draw : public CGAL::iterator<std::output_iterator_tag, void, void, void, void> {
class Draw
: public CGAL::cpp98::iterator<std::output_iterator_tag, void, void, void, void> {
QPainter* painter;
QMatrix* matrix;
Converter<K> convert;

17
STL_Extension/include/CGAL/iterator.h
View File

@ -88,6 +88,8 @@ Iterator_range<Prevent_deref<I> > make_prevent_deref_range(const I& begin, const
return Iterator_range<Prevent_deref<I> >(make_prevent_deref(begin), make_prevent_deref(end));
}
namespace cpp98 {
template<typename Category, typename Tp, typename Distance = std::ptrdiff_t,
typename Pointer = Tp*, typename Reference = Tp&>
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<typename _Iterator, typename Predicate>
class Filter_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>
{
protected:
_Iterator iterator;