boost_mirror/graph
1
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2025-05-09 23:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed usage of deprecated header boost/detail/iterator.hpp.

Browse Source 
The header was deprecated in favor of <iterator>. It generates compiler
warnings and will be removed in a future release.
This commit is contained in:
Andrey Semashev 2020-05-11 19:59:23 +03:00
parent ca17604dca
commit f364ee7be2
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/detail/algorithm.hpp
View File

@ -30,7 +30,7 @@
#ifndef BOOST_ALGORITHM_HPP #ifndef BOOST_ALGORITHM_HPP
#define BOOST_ALGORITHM_HPP #define BOOST_ALGORITHM_HPP
#include <boost/detail/iterator.hpp>
// Algorithms on sequences // Algorithms on sequences
// //
// The functions in this file have not yet gone through formal // The functions in this file have not yet gone through formal

6
include/boost/graph/adjacency_iterator.hpp
View File

@ -10,7 +10,7 @@
#ifndef BOOST_ADJACENCY_ITERATOR_HPP #ifndef BOOST_ADJACENCY_ITERATOR_HPP
#define BOOST_ADJACENCY_ITERATOR_HPP #define BOOST_ADJACENCY_ITERATOR_HPP
#include <boost/detail/iterator.hpp> #include <iterator>
#include <boost/iterator/iterator_adaptor.hpp> #include <boost/iterator/iterator_adaptor.hpp>
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
@ -45,7 +45,7 @@ template < class Graph,
class adjacency_iterator_generator class adjacency_iterator_generator
{ {
typedef typedef
typename boost::detail::iterator_traits< OutEdgeIter >::difference_type typename std::iterator_traits< OutEdgeIter >::difference_type
difference_type; difference_type;
public: public:
@ -81,7 +81,7 @@ template < class Graph,
class inv_adjacency_iterator_generator class inv_adjacency_iterator_generator
{ {
typedef typedef
typename boost::detail::iterator_traits< InEdgeIter >::difference_type typename std::iterator_traits< InEdgeIter >::difference_type
difference_type; difference_type;
public: public:

5
include/boost/graph/detail/adjacency_list.hpp
View File

@ -21,6 +21,7 @@
#include <boost/range/irange.hpp> #include <boost/range/irange.hpp>
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <memory> #include <memory>
#include <iterator>
#include <algorithm> #include <algorithm>
#include <boost/limits.hpp> #include <boost/limits.hpp>
@ -2370,7 +2371,7 @@ namespace detail
typedef typename OutEdgeList::size_type degree_size_type; typedef typename OutEdgeList::size_type degree_size_type;
typedef typename OutEdgeList::iterator OutEdgeIter; typedef typename OutEdgeList::iterator OutEdgeIter;
typedef boost::detail::iterator_traits< OutEdgeIter > typedef std::iterator_traits< OutEdgeIter >
OutEdgeIterTraits; OutEdgeIterTraits;
typedef typedef
typename OutEdgeIterTraits::iterator_category OutEdgeIterCat; typename OutEdgeIterTraits::iterator_category OutEdgeIterCat;
@ -2398,7 +2399,7 @@ namespace detail
// Edge Iterator // Edge Iterator
typedef boost::detail::iterator_traits< EdgeIter > EdgeIterTraits; typedef std::iterator_traits< EdgeIter > EdgeIterTraits;
typedef typename EdgeIterTraits::iterator_category EdgeIterCat; typedef typename EdgeIterTraits::iterator_category EdgeIterCat;
typedef typename EdgeIterTraits::difference_type EdgeIterDiff; typedef typename EdgeIterTraits::difference_type EdgeIterDiff;

6
include/boost/graph/incremental_components.hpp
View File

@ -13,10 +13,10 @@
#ifndef BOOST_INCREMENTAL_COMPONENTS_HPP #ifndef BOOST_INCREMENTAL_COMPONENTS_HPP
#define BOOST_INCREMENTAL_COMPONENTS_HPP #define BOOST_INCREMENTAL_COMPONENTS_HPP
#include <boost/detail/iterator.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/graph/detail/incremental_components.hpp> #include <boost/graph/detail/incremental_components.hpp>
#include <boost/iterator/counting_iterator.hpp> #include <boost/iterator/counting_iterator.hpp>
#include <boost/make_shared.hpp> #include <boost/smart_ptr/make_shared.hpp>
#include <boost/pending/disjoint_sets.hpp> #include <boost/pending/disjoint_sets.hpp>
#include <iterator> #include <iterator>
@ -69,7 +69,7 @@ void compress_components(ParentIterator first, ParentIterator last)
} }
template < class ParentIterator > template < class ParentIterator >
typename boost::detail::iterator_traits< ParentIterator >::difference_type typename std::iterator_traits< ParentIterator >::difference_type
component_count(ParentIterator first, ParentIterator last) component_count(ParentIterator first, ParentIterator last)
{ {
std::ptrdiff_t count = 0; std::ptrdiff_t count = 0;