mirror of https://github.com/CGAL/cgal
Remove more SUNPRO + RW's STL obsolete workarounds:
CGAL_CFG_SUNPRO_RWSTD (partially) CGAL_reverse_iterator()
This commit is contained in:
parent
5c6c3a6635
commit
2b46416907
|
|
@ -243,7 +243,7 @@ public:
|
||||||
friend class _Polyline_2<SegmentTraits_>;
|
friend class _Polyline_2<SegmentTraits_>;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator;
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
||||||
|
|
||||||
/*! Get an iterator for the polyline points. */
|
/*! Get an iterator for the polyline points. */
|
||||||
const_iterator begin() const
|
const_iterator begin() const
|
||||||
|
|
|
||||||
|
|
@ -243,7 +243,7 @@ public:
|
||||||
friend class _Polyline_2<SegmentTraits_>;
|
friend class _Polyline_2<SegmentTraits_>;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator;
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
||||||
|
|
||||||
/*! Get an iterator for the polyline points. */
|
/*! Get an iterator for the polyline points. */
|
||||||
const_iterator begin() const
|
const_iterator begin() const
|
||||||
|
|
|
||||||
|
|
@ -71,20 +71,12 @@ main(int,char*[])
|
||||||
std::vector<vertex_descriptor> predecessor(boost::num_vertices(ft));
|
std::vector<vertex_descriptor> predecessor(boost::num_vertices(ft));
|
||||||
// and then turn it into a property map
|
// and then turn it into a property map
|
||||||
boost::iterator_property_map<std::vector<vertex_descriptor>::iterator,
|
boost::iterator_property_map<std::vector<vertex_descriptor>::iterator,
|
||||||
VertexIdPropertyMap
|
VertexIdPropertyMap>
|
||||||
#ifdef CGAL_CFG_SUNPRO_RWSTD
|
|
||||||
,vertex_descriptor,vertex_descriptor&
|
|
||||||
#endif
|
|
||||||
>
|
|
||||||
predecessor_pmap(predecessor.begin(), vertex_index_pmap);
|
predecessor_pmap(predecessor.begin(), vertex_index_pmap);
|
||||||
|
|
||||||
std::vector<double> distance(boost::num_vertices(ft));
|
std::vector<double> distance(boost::num_vertices(ft));
|
||||||
boost::iterator_property_map<std::vector<double>::iterator,
|
boost::iterator_property_map<std::vector<double>::iterator,
|
||||||
VertexIdPropertyMap
|
VertexIdPropertyMap>
|
||||||
#ifdef CGAL_CFG_SUNPRO_RWSTD
|
|
||||||
,double,double&
|
|
||||||
#endif
|
|
||||||
>
|
|
||||||
distance_pmap(distance.begin(), vertex_index_pmap);
|
distance_pmap(distance.begin(), vertex_index_pmap);
|
||||||
|
|
||||||
// start at an arbitrary vertex
|
// start at an arbitrary vertex
|
||||||
|
|
|
||||||
|
|
@ -67,19 +67,11 @@ main(int,char*[])
|
||||||
|
|
||||||
// Dijkstra's shortest path needs property maps for the predecessor and distance
|
// Dijkstra's shortest path needs property maps for the predecessor and distance
|
||||||
std::vector<vertex_descriptor> predecessor(boost::num_vertices(ft));
|
std::vector<vertex_descriptor> predecessor(boost::num_vertices(ft));
|
||||||
boost::iterator_property_map<std::vector<vertex_descriptor>::iterator, VertexIdPropertyMap
|
boost::iterator_property_map<std::vector<vertex_descriptor>::iterator, VertexIdPropertyMap>
|
||||||
#ifdef CGAL_CFG_SUNPRO_RWSTD
|
|
||||||
,vertex_descriptor,vertex_descriptor&
|
|
||||||
#endif
|
|
||||||
>
|
|
||||||
predecessor_pmap(predecessor.begin(), vertex_index_pmap);
|
predecessor_pmap(predecessor.begin(), vertex_index_pmap);
|
||||||
|
|
||||||
std::vector<double> distance(boost::num_vertices(ft));
|
std::vector<double> distance(boost::num_vertices(ft));
|
||||||
boost::iterator_property_map<std::vector<double>::iterator, VertexIdPropertyMap
|
boost::iterator_property_map<std::vector<double>::iterator, VertexIdPropertyMap>
|
||||||
#ifdef CGAL_CFG_SUNPRO_RWSTD
|
|
||||||
,double,double&
|
|
||||||
#endif
|
|
||||||
>
|
|
||||||
distance_pmap(distance.begin(), vertex_index_pmap);
|
distance_pmap(distance.begin(), vertex_index_pmap);
|
||||||
|
|
||||||
vertex_descriptor source = *boost::vertices(ft).first;
|
vertex_descriptor source = *boost::vertices(ft).first;
|
||||||
|
|
|
||||||
|
|
@ -77,18 +77,6 @@
|
||||||
#endif
|
#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.
|
// Big endian or little endian machine.
|
||||||
// ====================================
|
// ====================================
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -131,8 +131,8 @@ public:
|
||||||
typedef typename Allocator::difference_type difference_type;
|
typedef typename Allocator::difference_type difference_type;
|
||||||
typedef CGALi::CC_iterator<Self, false> iterator;
|
typedef CGALi::CC_iterator<Self, false> iterator;
|
||||||
typedef CGALi::CC_iterator<Self, true> const_iterator;
|
typedef CGALi::CC_iterator<Self, true> const_iterator;
|
||||||
typedef CGAL_reverse_iterator(iterator) reverse_iterator;
|
typedef std::reverse_iterator<iterator> reverse_iterator;
|
||||||
typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator;
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
||||||
|
|
||||||
friend class CGALi::CC_iterator<Self, false>;
|
friend class CGALi::CC_iterator<Self, false>;
|
||||||
friend class CGALi::CC_iterator<Self, true>;
|
friend class CGALi::CC_iterator<Self, true>;
|
||||||
|
|
|
||||||
|
|
@ -215,8 +215,8 @@ public:
|
||||||
typedef CGALi::In_place_list_iterator<T, Alloc> iterator;
|
typedef CGALi::In_place_list_iterator<T, Alloc> iterator;
|
||||||
typedef CGALi::In_place_list_const_iterator<T, Alloc> const_iterator;
|
typedef CGALi::In_place_list_const_iterator<T, Alloc> const_iterator;
|
||||||
|
|
||||||
typedef CGAL_reverse_iterator(iterator) reverse_iterator;
|
typedef std::reverse_iterator<iterator> reverse_iterator;
|
||||||
typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator;
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
||||||
|
|
||||||
typedef In_place_list<T,managed,Alloc> Self;
|
typedef In_place_list<T,managed,Alloc> Self;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -469,8 +469,8 @@ public:
|
||||||
friend class const_iterator;
|
friend class const_iterator;
|
||||||
|
|
||||||
// Define the reverse iterators:
|
// Define the reverse iterators:
|
||||||
typedef CGAL_reverse_iterator(iterator) reverse_iterator;
|
typedef std::reverse_iterator<iterator> reverse_iterator;
|
||||||
typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator;
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -154,8 +154,8 @@ public:
|
||||||
const_iterator;
|
const_iterator;
|
||||||
typedef vector< T, Alloc> Self;
|
typedef vector< T, Alloc> Self;
|
||||||
|
|
||||||
typedef CGAL_reverse_iterator(iterator) reverse_iterator;
|
typedef std::reverse_iterator<iterator> reverse_iterator;
|
||||||
typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator;
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue