boostorg/iterator
1
0
Fork 1
mirror of https://github.com/boostorg/iterator.git synced 2025-07-31 05:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reformat advance.hpp and distance.hpp.

Browse Source
This commit is contained in:
Andrey Semashev
2025-02-04 00:34:43 +03:00
parent b6a41e325c
commit c22af90b60
2 changed files with 75 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/boost/iterator/advance.hpp
View File

@ -12,38 +12,33 @@
namespace boost { namespace boost {
namespace iterators { namespace iterators {
namespace detail { namespace detail {
template< typename InputIterator, typename Distance > template< typename InputIterator, typename Distance >
inline BOOST_CXX14_CONSTEXPR void inline BOOST_CXX14_CONSTEXPR void advance_impl(InputIterator& it, Distance n, incrementable_traversal_tag)
advance_impl( {
InputIterator& it while (n > 0)
, Distance n
, incrementable_traversal_tag
)
{ {
while (n > 0) {
++it; ++it;
--n; --n;
} }
} }
template< typename BidirectionalIterator, typename Distance > template< typename BidirectionalIterator, typename Distance >
inline BOOST_CXX14_CONSTEXPR void inline BOOST_CXX14_CONSTEXPR void advance_impl(BidirectionalIterator& it, Distance n, bidirectional_traversal_tag)
advance_impl( {
BidirectionalIterator& it if (n >= 0)
, Distance n {
, bidirectional_traversal_tag while (n > 0)
)
{ {
if (n >= 0) {
while (n > 0) {
++it; ++it;
--n; --n;
} }
} }
else { else
while (n < 0) { {
while (n < 0)
{
--it; --it;
++n; ++n;
} }
@ -51,28 +46,23 @@ namespace iterators {
} }
template< typename RandomAccessIterator, typename Distance > template< typename RandomAccessIterator, typename Distance >
inline BOOST_CXX14_CONSTEXPR void inline BOOST_CXX14_CONSTEXPR void advance_impl(RandomAccessIterator& it, Distance n, random_access_traversal_tag)
advance_impl(
RandomAccessIterator& it
, Distance n
, random_access_traversal_tag
)
{ {
it += n; it += n;
} }
}
} // namespace detail
namespace advance_adl_barrier { namespace advance_adl_barrier {
template< typename InputIterator, typename Distance > template< typename InputIterator, typename Distance >
inline BOOST_CXX14_CONSTEXPR void inline BOOST_CXX14_CONSTEXPR void advance(InputIterator& it, Distance n)
advance(InputIterator& it, Distance n)
{ {
detail::advance_impl( detail::advance_impl(it, n, typename iterator_traversal< InputIterator >::type());
it, n, typename iterator_traversal<InputIterator>::type()
);
}
} }
} // namespace advance_adl_barrier
using namespace advance_adl_barrier; using namespace advance_adl_barrier;
} // namespace iterators } // namespace iterators

28
include/boost/iterator/distance.hpp
View File

@ -13,18 +13,15 @@
namespace boost { namespace boost {
namespace iterators { namespace iterators {
namespace detail { namespace detail {
template< typename SinglePassIterator > template< typename SinglePassIterator >
inline BOOST_CXX14_CONSTEXPR typename iterator_difference< SinglePassIterator >::type inline BOOST_CXX14_CONSTEXPR typename iterator_difference< SinglePassIterator >::type
distance_impl( distance_impl(SinglePassIterator first, SinglePassIterator last, single_pass_traversal_tag)
SinglePassIterator first
, SinglePassIterator last
, single_pass_traversal_tag
)
{ {
typename iterator_difference< SinglePassIterator >::type n = 0; typename iterator_difference< SinglePassIterator >::type n = 0;
while (first != last) { while (first != last)
{
++first; ++first;
++n; ++n;
} }
@ -33,27 +30,24 @@ namespace iterators {
template< typename RandomAccessIterator > template< typename RandomAccessIterator >
inline BOOST_CXX14_CONSTEXPR typename iterator_difference< RandomAccessIterator >::type inline BOOST_CXX14_CONSTEXPR typename iterator_difference< RandomAccessIterator >::type
distance_impl( distance_impl(RandomAccessIterator first, RandomAccessIterator last, random_access_traversal_tag)
RandomAccessIterator first
, RandomAccessIterator last
, random_access_traversal_tag
)
{ {
return last - first; return last - first;
} }
}
} // namespace detail
namespace distance_adl_barrier { namespace distance_adl_barrier {
template< typename SinglePassIterator > template< typename SinglePassIterator >
inline BOOST_CXX14_CONSTEXPR typename iterator_difference< SinglePassIterator >::type inline BOOST_CXX14_CONSTEXPR typename iterator_difference< SinglePassIterator >::type
distance(SinglePassIterator first, SinglePassIterator last) distance(SinglePassIterator first, SinglePassIterator last)
{ {
return detail::distance_impl( return detail::distance_impl(first, last, typename iterator_traversal< SinglePassIterator >::type());
first, last, typename iterator_traversal<SinglePassIterator>::type()
);
}
} }
} // namespace distance_adl_barrier
using namespace distance_adl_barrier; using namespace distance_adl_barrier;
} // namespace iterators } // namespace iterators