King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

fix iterator distance implementation and adapt-interface

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-09-26 18:42:43 +09:00
parent a4c7df65e0
commit aec15c55a8
15 changed files with 194 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sprout/iterator/bytes_iterator.hpp
View file

@ -183,11 +183,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename Iterator, typename Traits>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::bytes_iterator<Iterator, Traits> >::difference_type
distance(
iterator_distance(
sprout::bytes_iterator<Iterator, Traits> first,
sprout::bytes_iterator<Iterator, Traits> last
)

4
sprout/iterator/counting_iterator.hpp
View file

@ -191,11 +191,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename Incrementable>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::counting_iterator<Incrementable> >::difference_type
distance(
iterator_distance(
sprout::counting_iterator<Incrementable> first,
sprout::counting_iterator<Incrementable> last
)

28
sprout/iterator/distance.hpp
View file

@ -6,30 +6,36 @@
#include <sprout/iterator/next.hpp>
namespace sprout {
namespace detail {
namespace iterator_detail {
// Copyright (C) 2011 RiSK (sscrisk)
template<typename InputIterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type
distance(InputIterator first, InputIterator last) {
iterator_distance(InputIterator first, InputIterator last) {
return first == last ? 0
: 1 + sprout::detail::distance(sprout::next(first), last)
: 1 + sprout::iterator_detail::iterator_distance(sprout::next(first), last)
;
}
template<typename InputIterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type
distance_impl(InputIterator first, InputIterator last) {
using sprout::detail::distance;
return distance(first, last);
}
} // namespace detail
} // namespace iterator_detail
} // namespace sprout
namespace sprout_iterator_detail {
template<typename InputIterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type
distance(InputIterator first, InputIterator last) {
using sprout::iterator_detail::iterator_distance;
return iterator_distance(first, last);
}
} // namespace sprout_iterator_detail
namespace sprout {
//
// distance
//
template<typename InputIterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type
distance(InputIterator first, InputIterator last) {
return sprout::detail::distance_impl(first, last);
return sprout_iterator_detail::distance(first, last);
}
} // namespace sprout

4
sprout/iterator/index_iterator.hpp
View file

@ -196,11 +196,11 @@ namespace sprout {
{};
//
// distance
// iterator_distance
//
template<typename Container>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::index_iterator<Container> >::difference_type
distance(
iterator_distance(
sprout::index_iterator<Container> first,
sprout::index_iterator<Container> last
)

4
sprout/iterator/reverse_iterator.hpp
View file

@ -200,11 +200,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename Iterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::reverse_iterator<Iterator> >::difference_type
distance(
iterator_distance(
sprout::reverse_iterator<Iterator> first,
sprout::reverse_iterator<Iterator> last
)

4
sprout/iterator/sawtooth_iterator.hpp
View file

@ -219,11 +219,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename Value>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::sawtooth_iterator<Value> >::difference_type
distance(
iterator_distance(
sprout::sawtooth_iterator<Value> first,
sprout::sawtooth_iterator<Value> last
)

4
sprout/iterator/sinusoid_iterator.hpp
View file

@ -228,11 +228,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename Value>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::sinusoid_iterator<Value> >::difference_type
distance(
iterator_distance(
sprout::sinusoid_iterator<Value> first,
sprout::sinusoid_iterator<Value> last
)

4
sprout/iterator/size_enum_iterator.hpp
View file

@ -393,11 +393,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename Iterator, bool Separated>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::size_enum_iterator<Iterator, Separated> >::difference_type
distance(
iterator_distance(
sprout::size_enum_iterator<Iterator, Separated> first,
sprout::size_enum_iterator<Iterator, Separated> last
)

4
sprout/iterator/square_iterator.hpp
View file

@ -229,11 +229,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename Value>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::square_iterator<Value> >::difference_type
distance(
iterator_distance(
sprout::square_iterator<Value> first,
sprout::square_iterator<Value> last
)

4
sprout/iterator/transform_iterator.hpp
View file

@ -387,11 +387,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename UnaryOrBinaryFunction, typename LIterator, typename RIterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::transform_iterator<UnaryOrBinaryFunction, LIterator, RIterator> >::difference_type
distance(
iterator_distance(
sprout::transform_iterator<UnaryOrBinaryFunction, LIterator, RIterator> first,
sprout::transform_iterator<UnaryOrBinaryFunction, LIterator, RIterator> last
)

4
sprout/iterator/triangle_iterator.hpp
View file

@ -219,11 +219,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename Value>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::triangle_iterator<Value> >::difference_type
distance(
iterator_distance(
sprout::triangle_iterator<Value> first,
sprout::triangle_iterator<Value> last
)

4
sprout/iterator/value_iterator.hpp
View file

@ -165,11 +165,11 @@ namespace sprout {
}
//
// distance
// iterator_distance
//
template<typename T>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::value_iterator<T> >::difference_type
distance(sprout::value_iterator<T> first, sprout::value_iterator<T> last) {
iterator_distance(sprout::value_iterator<T> first, sprout::value_iterator<T> last) {
return last - first;
}