feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Stop using deprecated boost::iterator.

Browse Source
This commit is contained in:
Daniel James
2016-05-26 09:23:01 +01:00
parent f014802eb6
commit cc2b1a1ef1
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/changes.qbk
View File

@ -269,4 +269,8 @@ C++11 support has resulted in some breaking changes:
* Fix potential overflow when calculating number of buckets to allocate * Fix potential overflow when calculating number of buckets to allocate
([@https://github.com/boostorg/unordered/pull/4 GitHub #4]). ([@https://github.com/boostorg/unordered/pull/4 GitHub #4]).
[h2 Boost 1.62.0]
* Remove use of deprecated `boost::iterator`.
[endsect] [endsect]

10
include/boost/unordered/detail/buckets.hpp
View File

@ -21,7 +21,7 @@
#include <boost/swap.hpp> #include <boost/swap.hpp>
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/limits.hpp> #include <boost/limits.hpp>
#include <boost/iterator.hpp> #include <iterator>
namespace boost { namespace unordered { namespace detail { namespace boost { namespace unordered { namespace detail {
@ -56,7 +56,7 @@ namespace boost { namespace unordered { namespace iterator_detail {
template <typename Node, typename Policy> template <typename Node, typename Policy>
struct l_iterator struct l_iterator
: public boost::iterator< : public std::iterator<
std::forward_iterator_tag, std::forward_iterator_tag,
typename Node::value_type, typename Node::value_type,
std::ptrdiff_t, std::ptrdiff_t,
@ -116,7 +116,7 @@ namespace boost { namespace unordered { namespace iterator_detail {
template <typename Node, typename Policy> template <typename Node, typename Policy>
struct cl_iterator struct cl_iterator
: public boost::iterator< : public std::iterator<
std::forward_iterator_tag, std::forward_iterator_tag,
typename Node::value_type, typename Node::value_type,
std::ptrdiff_t, std::ptrdiff_t,
@ -184,7 +184,7 @@ namespace boost { namespace unordered { namespace iterator_detail {
template <typename Node> template <typename Node>
struct iterator struct iterator
: public boost::iterator< : public std::iterator<
std::forward_iterator_tag, std::forward_iterator_tag,
typename Node::value_type, typename Node::value_type,
std::ptrdiff_t, std::ptrdiff_t,
@ -248,7 +248,7 @@ namespace boost { namespace unordered { namespace iterator_detail {
template <typename Node> template <typename Node>
struct c_iterator struct c_iterator
: public boost::iterator< : public std::iterator<
std::forward_iterator_tag, std::forward_iterator_tag,
typename Node::value_type, typename Node::value_type,
std::ptrdiff_t, std::ptrdiff_t,

6
test/helpers/input_iterator.hpp
View File

@ -7,8 +7,8 @@
#define BOOST_UNORDERED_TEST_HELPERS_INPUT_ITERATOR_HEADER #define BOOST_UNORDERED_TEST_HELPERS_INPUT_ITERATOR_HEADER
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/iterator.hpp>
#include <boost/iterator/iterator_traits.hpp> #include <boost/iterator/iterator_traits.hpp>
#include <iterator>
namespace test namespace test
{ {
@ -28,7 +28,7 @@ namespace test
template <class Iterator> template <class Iterator>
struct input_iterator_adaptor struct input_iterator_adaptor
: public boost::iterator< : public std::iterator<
std::input_iterator_tag, std::input_iterator_tag,
BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type, BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type,
std::ptrdiff_t, std::ptrdiff_t,
@ -72,7 +72,7 @@ namespace test
template <class Iterator> template <class Iterator>
struct copy_iterator_adaptor struct copy_iterator_adaptor
: public boost::iterator< : public std::iterator<
BOOST_DEDUCED_TYPENAME boost::iterator_category<Iterator>::type, BOOST_DEDUCED_TYPENAME boost::iterator_category<Iterator>::type,
BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type, BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type,
BOOST_DEDUCED_TYPENAME boost::iterator_difference<Iterator>::type, BOOST_DEDUCED_TYPENAME boost::iterator_difference<Iterator>::type,

6
test/helpers/list.hpp
View File

@ -11,8 +11,8 @@
#if !defined(UNORDERED_TEST_LIST_HEADER) #if !defined(UNORDERED_TEST_LIST_HEADER)
#define UNORDERED_TEST_LIST_HEADER #define UNORDERED_TEST_LIST_HEADER
#include <boost/iterator.hpp>
#include <boost/limits.hpp> #include <boost/limits.hpp>
#include <iterator>
#include <functional> #include <functional>
namespace test namespace test
@ -83,7 +83,7 @@ namespace test
template <typename T> template <typename T>
class list_iterator class list_iterator
: public boost::iterator< : public std::iterator<
std::forward_iterator_tag, T, std::forward_iterator_tag, T,
int, T*, T&> int, T*, T&>
{ {
@ -109,7 +109,7 @@ namespace test
template <typename T> template <typename T>
class list_const_iterator class list_const_iterator
: public boost::iterator< : public std::iterator<
std::forward_iterator_tag, T, std::forward_iterator_tag, T,
int, T const*, T const&> int, T const*, T const&>
{ {