From 5a5fea3833880c90fa7e49e90222aa67c736ef03 Mon Sep 17 00:00:00 2001 From: Mariette Yvinec Date: Tue, 8 Jan 2002 10:29:10 +0000 Subject: [PATCH] added prefic CGAL_CLIB_STD in front of ptrdiff_t and size_t --- .../Triangulation_2/include/CGAL/Triangulation_2.h | 2 +- .../include/CGAL/Triangulation_circulators_2.h | 8 +++++--- .../include/CGAL/Triangulation_ds_circulators_2.h | 12 ++++++------ .../include/CGAL/Triangulation_ds_iterators_2.h | 4 ++-- .../include/CGAL/Triangulation_dsul_iterators_2.h | 4 ++-- .../include/CGAL/Triangulation_iterators_2.h | 12 ++++++------ .../CGAL/Triangulation_line_face_circulator_2.h | 3 ++- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_2.h index af6cd74a869..507ef6143c8 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_2.h @@ -124,7 +124,7 @@ public: Proj_point, const Point&, const Point*, - std::ptrdiff_t, + CGAL_CLIB_STD::ptrdiff_t, std::bidirectional_iterator_tag> Point_iterator; typedef Point value_type; // to have a back_inserter diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_circulators_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_circulators_2.h index 8a8826b4ea6..8ff36626404 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_circulators_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_circulators_2.h @@ -56,7 +56,8 @@ template < class Gt, class Tds> class Triangulation_face_circulator_2 : public Bidirectional_circulator_base, - CGAL_STD::ptrdiff_t,CGAL_STD::size_t>, + CGAL_CLIB_STD::ptrdiff_t, + CGAL_CLIB_STD::size_t>, public Triangulation_cw_ccw_2 { public: @@ -105,7 +106,8 @@ public: template < class Gt, class Tds> class Triangulation_vertex_circulator_2 : public Bidirectional_circulator_base, - CGAL_STD::ptrdiff_t,CGAL_STD::size_t>, + CGAL_CLIB_STD::ptrdiff_t, + CGAL_CLIB_STD::size_t>, public Triangulation_cw_ccw_2 { public: @@ -153,7 +155,7 @@ class Triangulation_edge_circulator_2 : public Bidirectional_circulator_base< typename Triangulation_2::Edge, - CGAL_STD::ptrdiff_t, CGAL_STD::size_t>, + CGAL_CLIB_STD::ptrdiff_t, CGAL_CLIB_STD::size_t>, public Triangulation_cw_ccw_2 { public: diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h index 68918067f5c..cb90876779f 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h @@ -36,8 +36,8 @@ CGAL_BEGIN_NAMESPACE template < class Vertex, class Face > class Triangulation_ds_face_circulator_2 : public Bidirectional_circulator_base, + CGAL_CLIB_STD::ptrdiff_t, + CGAL_CLIB_STD::size_t>, public Triangulation_cw_ccw_2 { @@ -75,8 +75,8 @@ public: template < class Vertex, class Face > class Triangulation_ds_vertex_circulator_2 : public Bidirectional_circulator_base, + CGAL_CLIB_STD::ptrdiff_t, + CGAL_CLIB_STD::size_t>, public Triangulation_cw_ccw_2 { public: @@ -113,8 +113,8 @@ public: template < class Vertex, class Face > class Triangulation_ds_edge_circulator_2 : public Bidirectional_circulator_base , - CGAL_STD::ptrdiff_t, - CGAL_STD::size_t>, + CGAL_CLIB_STD::ptrdiff_t, + CGAL_CLIB_STD::size_t>, public Triangulation_cw_ccw_2 { public: diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h index 6649cbb326e..d64b06c404b 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h @@ -48,8 +48,8 @@ public: typedef typename Tds::Face value_type; typedef typename Tds::Face * pointer; typedef typename Tds::Face & reference; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef CGAL_CLIB_STD::size_t size_type; + typedef CGAL_CLIB_STD::ptrdiff_t difference_type; typedef std::bidirectional_iterator_tag iterator_category; typedef typename Tds::Geom_traits Geom_traits; diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_dsul_iterators_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_dsul_iterators_2.h index e74e09337af..15795ef2c30 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_dsul_iterators_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_dsul_iterators_2.h @@ -46,8 +46,8 @@ public: typedef typename Tds::Face value_type; typedef typename Tds::Face * pointer; typedef typename Tds::Face & reference; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef CGAL_CLIB_STD::size_t size_type; + typedef CGAL_CLIB_STD::ptrdiff_t difference_type; typedef std::bidirectional_iterator_tag iterator_category; typedef Triangulation_dsul_iterator_base_2 Iterator_base; diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_iterators_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_iterators_2.h index 05a08b951fe..5bf244b4fb5 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_iterators_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_iterators_2.h @@ -51,8 +51,8 @@ public: typedef Face value_type; typedef Face* pointer; typedef Face& reference; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef CGAL_CLIB_STD::size_t size_type; + typedef CGAL_CLIB_STD::ptrdiff_t difference_type; typedef std::bidirectional_iterator_tag iterator_category; public: @@ -116,8 +116,8 @@ public: typedef Vertex value_type; typedef const Vertex * pointer; typedef const Vertex & reference; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef CGAL_CLIB_STD::size_t size_type; + typedef CGAL_CLIB_STD::ptrdiff_t difference_type; typedef std::bidirectional_iterator_tag iterator_category; @@ -186,8 +186,8 @@ public: typedef Edge value_type; typedef Edge * pointer; typedef Edge & reference; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef CGAL_CLIB_STD::size_t size_type; + typedef CGAL_CLIB_STD::ptrdiff_t difference_type; typedef std::bidirectional_iterator_tag iterator_category; diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h index 008641b64f8..2cb91e6892d 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h @@ -40,7 +40,8 @@ class Triangulation_2; template < class Gt, class Tds > class Triangulation_line_face_circulator_2 : public Bidirectional_circulator_base, - std::ptrdiff_t,std::size_t>, + CGAL_CLIB_STD::ptrdiff_t, + CGAL_CLIB_STD::size_t>, public Triangulation_cw_ccw_2, public Triangulation_face_handle_2 {