feedc0de/boost_iterator
1
0
Fork 0
forked from boostorg/iterator
Code Pull Requests 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

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

@@ -12,68 +12,58 @@
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 advance_impl(InputIterator& it, Distance n, incrementable_traversal_tag)
inline BOOST_CXX14_CONSTEXPR void {
advance_impl( while (n > 0)
InputIterator& it {
, Distance n ++it;
, incrementable_traversal_tag --n;
) }
}
template< typename BidirectionalIterator, typename Distance >
inline BOOST_CXX14_CONSTEXPR void advance_impl(BidirectionalIterator& it, Distance n, bidirectional_traversal_tag)
{
if (n >= 0)
{
while (n > 0)
{ {
while (n > 0) {
++it; ++it;
--n; --n;
} }
} }
else
template <typename BidirectionalIterator, typename Distance> {
inline BOOST_CXX14_CONSTEXPR void while (n < 0)
advance_impl(
BidirectionalIterator& it
, Distance n
, bidirectional_traversal_tag
)
{ {
if (n >= 0) {
while (n > 0) {
++it;
--n;
}
}
else {
while (n < 0) {
--it; --it;
++n; ++n;
} }
} }
} }
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 advance_adl_barrier { } // namespace detail
template <typename InputIterator, typename Distance>
inline BOOST_CXX14_CONSTEXPR void
advance(InputIterator& it, Distance n)
{
detail::advance_impl(
it, n, typename iterator_traversal<InputIterator>::type()
);
}
}
using namespace advance_adl_barrier; namespace advance_adl_barrier {
template< typename InputIterator, typename Distance >
inline BOOST_CXX14_CONSTEXPR void advance(InputIterator& it, Distance n)
{
detail::advance_impl(it, n, typename iterator_traversal< InputIterator >::type());
}
} // namespace advance_adl_barrier
using namespace advance_adl_barrier;
} // namespace iterators } // namespace iterators

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

@@ -13,48 +13,42 @@
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(SinglePassIterator first, SinglePassIterator last, single_pass_traversal_tag)
distance_impl( {
SinglePassIterator first typename iterator_difference< SinglePassIterator >::type n = 0;
, SinglePassIterator last while (first != last)
, single_pass_traversal_tag
)
{ {
typename iterator_difference<SinglePassIterator>::type n = 0;
while (first != last) {
++first; ++first;
++n; ++n;
} }
return n; return n;
} }
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 distance_adl_barrier { } // namespace detail
template <typename SinglePassIterator>
inline BOOST_CXX14_CONSTEXPR typename iterator_difference<SinglePassIterator>::type
distance(SinglePassIterator first, SinglePassIterator last)
{
return detail::distance_impl(
first, last, typename iterator_traversal<SinglePassIterator>::type()
);
}
}
using namespace distance_adl_barrier; namespace distance_adl_barrier {
template< typename SinglePassIterator >
inline BOOST_CXX14_CONSTEXPR typename iterator_difference< SinglePassIterator >::type
distance(SinglePassIterator first, SinglePassIterator last)
{
return detail::distance_impl(first, last, typename iterator_traversal< SinglePassIterator >::type());
}
} // namespace distance_adl_barrier
using namespace distance_adl_barrier;
} // namespace iterators } // namespace iterators