boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-29 19:07:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove policy template parameter from local iterators

Browse Source
This commit is contained in:
Daniel James
2017-04-30 10:41:22 +01:00
parent c243895fc0
commit e7a3487df4
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/unordered/detail/implementation.hpp
View File

@ -159,8 +159,8 @@ namespace unordered {
namespace iterator_detail {
template <typename Node> struct iterator;
template <typename Node> struct c_iterator;
template <typename Node, typename Policy> struct l_iterator;
template <typename Node, typename Policy> struct cl_iterator;
template <typename Node> struct l_iterator;
template <typename Node> struct cl_iterator;
}
}
}
@ -1878,13 +1878,13 @@ namespace iterator_detail {
//
// all no throw
template <typename Node, typename Policy>
template <typename Node>
struct l_iterator : public std::iterator<std::forward_iterator_tag,
typename Node::value_type, std::ptrdiff_t,
typename Node::value_type*, typename Node::value_type&>
{
#if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
template <typename Node2, typename Policy2>
template <typename Node2>
friend struct boost::unordered::iterator_detail::cl_iterator;
private:
@ -1936,13 +1936,13 @@ struct l_iterator : public std::iterator<std::forward_iterator_tag,
}
};
template <typename Node, typename Policy>
template <typename Node>
struct cl_iterator
: public std::iterator<std::forward_iterator_tag, typename Node::value_type,
std::ptrdiff_t, typename Node::value_type const*,
typename Node::value_type const&>
{
friend struct boost::unordered::iterator_detail::l_iterator<Node, Policy>;
friend struct boost::unordered::iterator_detail::l_iterator<Node>;
private:
typedef typename Node::node_pointer node_pointer;
@ -1963,7 +1963,7 @@ struct cl_iterator
}
cl_iterator(
boost::unordered::iterator_detail::l_iterator<Node, Policy> const& x)
boost::unordered::iterator_detail::l_iterator<Node> const& x)
BOOST_NOEXCEPT : ptr_(x.ptr_),
bucket_(x.bucket_),
bucket_count_(x.bucket_count_)

6
include/boost/unordered/detail/map.hpp
View File

@ -35,10 +35,8 @@ template <typename A, typename K, typename M, typename H, typename P> struct map
typedef boost::unordered::iterator_detail::iterator<node> iterator;
typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator;
typedef boost::unordered::iterator_detail::l_iterator<node, policy>
l_iterator;
typedef boost::unordered::iterator_detail::cl_iterator<node, policy>
cl_iterator;
typedef boost::unordered::iterator_detail::l_iterator<node> l_iterator;
typedef boost::unordered::iterator_detail::cl_iterator<node> cl_iterator;
typedef boost::unordered::node_handle_map<node, K, M, A> node_type;
typedef boost::unordered::insert_return_type_map<node, K, M, A>

4
include/boost/unordered/detail/set.hpp
View File

@ -35,9 +35,9 @@ template <typename A, typename T, typename H, typename P> struct set
typedef boost::unordered::iterator_detail::c_iterator<node> iterator;
typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator;
typedef boost::unordered::iterator_detail::cl_iterator<node, policy>
typedef boost::unordered::iterator_detail::cl_iterator<node>
l_iterator;
typedef boost::unordered::iterator_detail::cl_iterator<node, policy>
typedef boost::unordered::iterator_detail::cl_iterator<node>
cl_iterator;
typedef boost::unordered::node_handle_set<node, T, A> node_type;