diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp index 09aad21e..0c1a71ea 100644 --- a/include/boost/unordered/detail/implementation.hpp +++ b/include/boost/unordered/detail/implementation.hpp @@ -159,8 +159,8 @@ namespace unordered { namespace iterator_detail { template struct iterator; template struct c_iterator; -template struct l_iterator; -template struct cl_iterator; +template struct l_iterator; +template struct cl_iterator; } } } @@ -1878,13 +1878,13 @@ namespace iterator_detail { // // all no throw -template +template struct l_iterator : public std::iterator { #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) - template + template friend struct boost::unordered::iterator_detail::cl_iterator; private: @@ -1936,13 +1936,13 @@ struct l_iterator : public std::iterator +template struct cl_iterator : public std::iterator { - friend struct boost::unordered::iterator_detail::l_iterator; + friend struct boost::unordered::iterator_detail::l_iterator; private: typedef typename Node::node_pointer node_pointer; @@ -1963,7 +1963,7 @@ struct cl_iterator } cl_iterator( - boost::unordered::iterator_detail::l_iterator const& x) + boost::unordered::iterator_detail::l_iterator const& x) BOOST_NOEXCEPT : ptr_(x.ptr_), bucket_(x.bucket_), bucket_count_(x.bucket_count_) diff --git a/include/boost/unordered/detail/map.hpp b/include/boost/unordered/detail/map.hpp index 4568e75f..172b4f4b 100644 --- a/include/boost/unordered/detail/map.hpp +++ b/include/boost/unordered/detail/map.hpp @@ -35,10 +35,8 @@ template struct map typedef boost::unordered::iterator_detail::iterator iterator; typedef boost::unordered::iterator_detail::c_iterator c_iterator; - typedef boost::unordered::iterator_detail::l_iterator - l_iterator; - typedef boost::unordered::iterator_detail::cl_iterator - cl_iterator; + typedef boost::unordered::iterator_detail::l_iterator l_iterator; + typedef boost::unordered::iterator_detail::cl_iterator cl_iterator; typedef boost::unordered::node_handle_map node_type; typedef boost::unordered::insert_return_type_map diff --git a/include/boost/unordered/detail/set.hpp b/include/boost/unordered/detail/set.hpp index fc13fa17..634ebd46 100644 --- a/include/boost/unordered/detail/set.hpp +++ b/include/boost/unordered/detail/set.hpp @@ -35,9 +35,9 @@ template struct set typedef boost::unordered::iterator_detail::c_iterator iterator; typedef boost::unordered::iterator_detail::c_iterator c_iterator; - typedef boost::unordered::iterator_detail::cl_iterator + typedef boost::unordered::iterator_detail::cl_iterator l_iterator; - typedef boost::unordered::iterator_detail::cl_iterator + typedef boost::unordered::iterator_detail::cl_iterator cl_iterator; typedef boost::unordered::node_handle_set node_type;