mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-11-14 10:39:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix non-modifying algorithm: for InputIterator Requirements

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-08-14 10:37:52 +09:00
parent 3800b22a22
commit 4e4c1b1786
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sprout/algorithm/count.hpp
View file

@ -59,7 +59,9 @@ namespace sprout {
{
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.first == last ? current
: n == 1 ? type(sprout::next(current.first), current.second + (*current.first == value ? 1 : 0))
: n == 1 ? *current.first == value
? type(sprout::next(current.first), current.second + 1)
: type(sprout::next(current.first), current.second)
: sprout::detail::count_impl_1(
sprout::detail::count_impl_1(
current,

4
sprout/algorithm/count_if.hpp
View file

@ -59,7 +59,9 @@ namespace sprout {
{
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.first == last ? current
: n == 1 ? type(sprout::next(current.first), current.second + (pred(*current.first) ? 1 : 0))
: n == 1 ? pred(*current.first)
? type(sprout::next(current.first), current.second + 1)
: type(sprout::next(current.first), current.second)
: sprout::detail::count_if_impl_1(
sprout::detail::count_if_impl_1(
current,

2
sprout/algorithm/is_partitioned.hpp
View file

@ -52,7 +52,7 @@ namespace sprout {
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.second > 1 || current.first == last ? current
: n == 1 ? current.second == 0
? type(sprout::next(current.first), pred(*current.first) ? 0 : 1)
? pred(*current.first) ? type(sprout::next(current.first), 0) : type(sprout::next(current.first), 1)
: !pred(*current.first) ? type(sprout::next(current.first), 1) : type(current.first, 2)
: sprout::detail::is_partitioned_impl_1(
sprout::detail::is_partitioned_impl_1(

2
sprout/algorithm/one_of.hpp
View file

@ -82,7 +82,7 @@ namespace sprout {
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.second > 1 || current.first == last ? current
: n == 1 ? current.second == 0
? type(sprout::next(current.first), pred(*current.first) ? 1 : 0)
? !pred(*current.first) ? type(sprout::next(current.first), 0) : type(sprout::next(current.first), 1)
: !pred(*current.first) ? type(sprout::next(current.first), 1) : type(current.first, 2)
: sprout::detail::one_of_impl_1(
sprout::detail::one_of_impl_1(

2
sprout/algorithm/one_of_equal.hpp
View file

@ -82,7 +82,7 @@ namespace sprout {
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.second > 1 || current.first == last ? current
: n == 1 ? current.second == 0
? type(sprout::next(current.first), *current.first == value ? 1 : 0)
? !(*current.first == value) ? type(sprout::next(current.first), 0) : type(sprout::next(current.first), 1)
: !(*current.first == value) ? type(sprout::next(current.first), 1) : type(current.first, 2)
: sprout::detail::one_of_equal_impl_1(
sprout::detail::one_of_equal_impl_1(