diff --git a/Arrangement_2/include/CGAL/Arr_traits_2/Polyline_2.h b/Arrangement_2/include/CGAL/Arr_traits_2/Polyline_2.h index 2dedaa3e485..1406b2a5926 100644 --- a/Arrangement_2/include/CGAL/Arr_traits_2/Polyline_2.h +++ b/Arrangement_2/include/CGAL/Arr_traits_2/Polyline_2.h @@ -243,7 +243,7 @@ public: friend class _Polyline_2; }; - typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; /*! Get an iterator for the polyline points. */ const_iterator begin() const diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h index 4d7757b6166..bcc2ed61d47 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h @@ -243,7 +243,7 @@ public: friend class _Polyline_2; }; - typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; /*! Get an iterator for the polyline points. */ const_iterator begin() const diff --git a/BGL/examples/BGL_triangulation_2/dijkstra.cpp b/BGL/examples/BGL_triangulation_2/dijkstra.cpp index 309294bd0e1..4af07d46c65 100644 --- a/BGL/examples/BGL_triangulation_2/dijkstra.cpp +++ b/BGL/examples/BGL_triangulation_2/dijkstra.cpp @@ -71,20 +71,12 @@ main(int,char*[]) std::vector predecessor(boost::num_vertices(ft)); // and then turn it into a property map boost::iterator_property_map::iterator, - VertexIdPropertyMap -#ifdef CGAL_CFG_SUNPRO_RWSTD - ,vertex_descriptor,vertex_descriptor& -#endif - > + VertexIdPropertyMap> predecessor_pmap(predecessor.begin(), vertex_index_pmap); std::vector distance(boost::num_vertices(ft)); boost::iterator_property_map::iterator, - VertexIdPropertyMap -#ifdef CGAL_CFG_SUNPRO_RWSTD - ,double,double& -#endif - > + VertexIdPropertyMap> distance_pmap(distance.begin(), vertex_index_pmap); // start at an arbitrary vertex diff --git a/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp b/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp index 5ccc99c6351..38b74d624f6 100644 --- a/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp +++ b/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp @@ -67,19 +67,11 @@ main(int,char*[]) // Dijkstra's shortest path needs property maps for the predecessor and distance std::vector predecessor(boost::num_vertices(ft)); - boost::iterator_property_map::iterator, VertexIdPropertyMap -#ifdef CGAL_CFG_SUNPRO_RWSTD - ,vertex_descriptor,vertex_descriptor& -#endif - > + boost::iterator_property_map::iterator, VertexIdPropertyMap> predecessor_pmap(predecessor.begin(), vertex_index_pmap); std::vector distance(boost::num_vertices(ft)); - boost::iterator_property_map::iterator, VertexIdPropertyMap -#ifdef CGAL_CFG_SUNPRO_RWSTD - ,double,double& -#endif - > + boost::iterator_property_map::iterator, VertexIdPropertyMap> distance_pmap(distance.begin(), vertex_index_pmap); vertex_descriptor source = *boost::vertices(ft).first; diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 13bc4ee95b2..e2e09120695 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -77,18 +77,6 @@ #endif -#ifndef CGAL_CFG_SUNPRO_RWSTD -# define CGAL_reverse_iterator(T) std::reverse_iterator< T > -#else -# define CGAL_reverse_iterator(T) std::reverse_iterator< T , \ - typename T::iterator_category , \ - typename T::value_type , \ - typename T::reference , \ - typename T::pointer , \ - typename T::difference_type > -#endif - - // Big endian or little endian machine. // ==================================== diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h index e2cd02d3ebe..ad4510c57b4 100644 --- a/STL_Extension/include/CGAL/Compact_container.h +++ b/STL_Extension/include/CGAL/Compact_container.h @@ -131,8 +131,8 @@ public: typedef typename Allocator::difference_type difference_type; typedef CGALi::CC_iterator iterator; typedef CGALi::CC_iterator const_iterator; - typedef CGAL_reverse_iterator(iterator) reverse_iterator; - typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator; + typedef std::reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; friend class CGALi::CC_iterator; friend class CGALi::CC_iterator; diff --git a/STL_Extension/include/CGAL/In_place_list.h b/STL_Extension/include/CGAL/In_place_list.h index dfaeb5bae5e..e1a2aaa9bfe 100644 --- a/STL_Extension/include/CGAL/In_place_list.h +++ b/STL_Extension/include/CGAL/In_place_list.h @@ -215,8 +215,8 @@ public: typedef CGALi::In_place_list_iterator iterator; typedef CGALi::In_place_list_const_iterator const_iterator; - typedef CGAL_reverse_iterator(iterator) reverse_iterator; - typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator; + typedef std::reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; typedef In_place_list Self; diff --git a/STL_Extension/include/CGAL/Multiset.h b/STL_Extension/include/CGAL/Multiset.h index f7bf3524b9d..5986c924e20 100644 --- a/STL_Extension/include/CGAL/Multiset.h +++ b/STL_Extension/include/CGAL/Multiset.h @@ -469,8 +469,8 @@ public: friend class const_iterator; // Define the reverse iterators: - typedef CGAL_reverse_iterator(iterator) reverse_iterator; - typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator; + typedef std::reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; protected: diff --git a/STL_Extension/include/CGAL/vector.h b/STL_Extension/include/CGAL/vector.h index 719c86dba22..481b46c005f 100644 --- a/STL_Extension/include/CGAL/vector.h +++ b/STL_Extension/include/CGAL/vector.h @@ -154,8 +154,8 @@ public: const_iterator; typedef vector< T, Alloc> Self; - typedef CGAL_reverse_iterator(iterator) reverse_iterator; - typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator; + typedef std::reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; protected: #ifndef _MSC_VER