From 36151af19dbe44cf185153aee45c847bb7a7d787 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Sun, 18 Jan 2004 14:03:18 +0000 Subject: [PATCH] - Remove obsolete *ITERATOR_TRAITS_POINTER_SPEC* workarounds. --- Packages/Kernel_23/changes.txt | 3 + .../Kernel_23/examples/Kernel_23/MyKernel.h | 2 - .../Kernel_23/include/CGAL/user_classes.h | 74 ------------------- Packages/Number_types/changes.txt | 3 + Packages/Number_types/include/CGAL/Gmpq.h | 5 -- Packages/Number_types/include/CGAL/Gmpz.h | 7 -- Packages/Stream_support/changes.txt | 6 +- .../include/CGAL/IO/Istream_iterator.h | 24 ------ .../include/CGAL/IO/Ostream_iterator.h | 19 ----- 9 files changed, 10 insertions(+), 133 deletions(-) diff --git a/Packages/Kernel_23/changes.txt b/Packages/Kernel_23/changes.txt index 6e871ec91ac..67383d1ff6c 100644 --- a/Packages/Kernel_23/changes.txt +++ b/Packages/Kernel_23/changes.txt @@ -1,3 +1,6 @@ +1.104 (18 January 2004) +- Remove obsolete *ITERATOR_TRAITS_POINTER_SPEC* workarounds. + 1.103 (18 January 2004) - Remove obsolete CGAL_VC7_BUG_PROTECTED workaround (VC++ <= 7.0). diff --git a/Packages/Kernel_23/examples/Kernel_23/MyKernel.h b/Packages/Kernel_23/examples/Kernel_23/MyKernel.h index 3b955033faf..6b6182b03fd 100644 --- a/Packages/Kernel_23/examples/Kernel_23/MyKernel.h +++ b/Packages/Kernel_23/examples/Kernel_23/MyKernel.h @@ -31,6 +31,4 @@ struct MyKernel : public MyCartesian_base, CGAL::Cartesian > {}; -CGAL_ITERATOR_TRAITS_POINTER_SPEC_TEMPLATE(MyKernel) - #endif // MYKERNEL_H diff --git a/Packages/Kernel_23/include/CGAL/user_classes.h b/Packages/Kernel_23/include/CGAL/user_classes.h index 24af006b275..3abb89bf611 100644 --- a/Packages/Kernel_23/include/CGAL/user_classes.h +++ b/Packages/Kernel_23/include/CGAL/user_classes.h @@ -50,78 +50,4 @@ #include #include -#ifdef CGAL_LIMITED_ITERATOR_TRAITS_SUPPORT -# define CGAL_ITERATOR_TRAITS_POINTER_SPEC_2(K) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Point_2< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Vector_2< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Direction_2< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Line_2< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Segment_2< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Ray_2< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Iso_rectangle_2< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Triangle_2< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Circle_2< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Aff_transformation_2< K >) - -# define CGAL_ITERATOR_TRAITS_POINTER_SPEC_3(K) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Point_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Vector_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Direction_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Plane_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Line_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Segment_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Ray_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Triangle_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Tetrahedron_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Sphere_3< K >) \ - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Aff_transformation_3< K >) - -# define CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_2(K) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_3(K) - -#if defined(LEDA_NAMESPACE) -namespace leda { -class real; -class integer; -class rational; -class bigfloat; -} -#else -class leda_real; -class leda_integer; -class leda_rational; -class leda_bigfloat; -#endif - -namespace CGAL { -class Gmpz; -template class Quotient; -} - -// NB : we could add MP_Float, and maybe other useful NTs. - -# define CGAL_ITERATOR_TRAITS_POINTER_SPEC_TEMPLATE(K) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K ) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K ) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K ) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K ) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K ) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K ) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K ) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K ) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K ) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K >) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K >) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K >) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K >) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K >) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K >) \ - CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K >) - -#else -# define CGAL_ITERATOR_TRAITS_POINTER_SPEC_(K) -# define CGAL_ITERATOR_TRAITS_POINTER_SPEC_TEMPLATE(K) -#endif - #endif // CGAL_USER_CLASSES_H diff --git a/Packages/Number_types/changes.txt b/Packages/Number_types/changes.txt index 47b6f5bd1a2..d4e893ea525 100644 --- a/Packages/Number_types/changes.txt +++ b/Packages/Number_types/changes.txt @@ -1,3 +1,6 @@ +4.130 (18 Jan 2004) +- Remove obsolete *ITERATOR_TRAITS_POINTER_SPEC* workarounds. + 4.129 (18 Jan 2004) - Remove obsolete CGAL_CFG_MATCHING_BUG_2 workaround (VC++ <= 7.0). diff --git a/Packages/Number_types/include/CGAL/Gmpq.h b/Packages/Number_types/include/CGAL/Gmpq.h index 45c90930160..5fde638661e 100644 --- a/Packages/Number_types/include/CGAL/Gmpq.h +++ b/Packages/Number_types/include/CGAL/Gmpq.h @@ -494,9 +494,4 @@ struct Rational_traits { CGAL_END_NAMESPACE -#if defined( _MSC_VER ) && ( _MSC_VER == 1300 ) - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Gmpq); - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Gmpq*); -#endif - #endif // CGAL_GMPQ_H diff --git a/Packages/Number_types/include/CGAL/Gmpz.h b/Packages/Number_types/include/CGAL/Gmpz.h index 4aeadf7e65b..ed0305de60e 100644 --- a/Packages/Number_types/include/CGAL/Gmpz.h +++ b/Packages/Number_types/include/CGAL/Gmpz.h @@ -632,11 +632,4 @@ double to_double(const Quotient& quot) CGAL_END_NAMESPACE -#if defined( _MSC_VER ) && ( _MSC_VER == 1300 ) - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Gmpz); - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Gmpz*); - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Quotient); - CGAL_DEFINE_ITERATOR_TRAITS_POINTER_SPEC(CGAL::Quotient*); -#endif - #endif // CGAL_GMPZ_H diff --git a/Packages/Stream_support/changes.txt b/Packages/Stream_support/changes.txt index 4f0560690f1..9674f70ab5d 100644 --- a/Packages/Stream_support/changes.txt +++ b/Packages/Stream_support/changes.txt @@ -1,10 +1,12 @@ -Stream_support Package: Release changes: ---------------------------------------------------------------------- +2.27 (18 Jan 2004) +- Remove obsolete *ITERATOR_TRAITS_POINTER_SPEC* workarounds. 2.26 (10 Dec 2003) [rursu] - Files with common functionality were moved into this package from Polyhedron_IO +=========================== CGAL 3.0 ============================ + 2.25 (22 Octo 2003) - changed headers diff --git a/Packages/Stream_support/include/CGAL/IO/Istream_iterator.h b/Packages/Stream_support/include/CGAL/IO/Istream_iterator.h index 3b8f58c6385..923d6570384 100644 --- a/Packages/Stream_support/include/CGAL/IO/Istream_iterator.h +++ b/Packages/Stream_support/include/CGAL/IO/Istream_iterator.h @@ -78,30 +78,6 @@ public: } }; -#ifdef CGAL_CFG_NO_ITERATOR_TRAITS -template inline -std::input_iterator_tag -iterator_category( const Istream_iterator&) { - return std::input_iterator_tag(); -} -template inline -T* -value_type( const Istream_iterator&) { - return (T*)0; -} -template inline -std::ptrdiff_t* -distance_type( const Istream_iterator&) { - return (std::ptrdiff_t*)0; -} -template inline -Iterator_tag -query_circulator_or_iterator( - const Istream_iterator&) { - return Iterator_tag(); -} -#endif - CGAL_END_NAMESPACE #endif // CGAL_IO_ISTREAM_ITERATOR_H diff --git a/Packages/Stream_support/include/CGAL/IO/Ostream_iterator.h b/Packages/Stream_support/include/CGAL/IO/Ostream_iterator.h index 9b1d0134ae1..c8cadd30822 100644 --- a/Packages/Stream_support/include/CGAL/IO/Ostream_iterator.h +++ b/Packages/Stream_support/include/CGAL/IO/Ostream_iterator.h @@ -60,25 +60,6 @@ public: } }; -#ifdef CGAL_CFG_NO_ITERATOR_TRAITS -template inline -std::output_iterator_tag -iterator_category( const Ostream_iterator&) { - return std::output_iterator_tag(); -} -template inline -T* -value_type( const Ostream_iterator&) { - return (T*)0; -} -template inline -Iterator_tag -query_circulator_or_iterator( - const Ostream_iterator&) { - return Iterator_tag(); -} -#endif - CGAL_END_NAMESPACE #endif // CGAL_IO_OSTREAM_ITERATOR_H