アルゴリズムのイテレータ要件を標準に準拠

This commit is contained in:
bolero-MURAKAMI 2011-10-07 16:40:45 +09:00
parent 6ae26b7470
commit 304c656b78
36 changed files with 1554 additions and 585 deletions

View file

@ -33,13 +33,13 @@ namespace sprout {
{
return remove_copy_if_impl_3(result, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)));
}
template<typename Iterator, typename Result, typename Predicate, typename... Args>
template<typename InputIterator, typename Result, typename Predicate, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type remove_copy_if_impl_2(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
Predicate pred,
typename sprout::fixed_container_traits<Result>::difference_type offset,
@ -48,13 +48,13 @@ namespace sprout {
{
return sprout::remake_clone<Result, Result>(result, sprout::size(result), args...);
}
template<typename Iterator, typename Result, typename Predicate, typename... Args>
template<typename InputIterator, typename Result, typename Predicate, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type remove_copy_if_impl_2(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
Predicate pred,
typename sprout::fixed_container_traits<Result>::difference_type offset,
@ -68,13 +68,13 @@ namespace sprout {
: remove_copy_if_impl_3(result, args...)
;
}
template<typename Iterator, typename Result, typename Predicate, typename... Args>
template<typename InputIterator, typename Result, typename Predicate, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type remove_copy_if_impl_1(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
Predicate pred,
typename sprout::fixed_container_traits<Result>::difference_type offset,
@ -83,13 +83,13 @@ namespace sprout {
{
return sprout::remake_clone<Result, Result>(result, sprout::size(result), args...);
}
template<typename Iterator, typename Result, typename Predicate, typename... Args>
template<typename InputIterator, typename Result, typename Predicate, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type remove_copy_if_impl_1(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
Predicate pred,
typename sprout::fixed_container_traits<Result>::difference_type offset,
@ -101,10 +101,10 @@ namespace sprout {
: remove_copy_if_impl_2(first, last, result, pred, offset + sprout::size(result), args...)
;
}
template<typename Iterator, typename Result, typename Predicate>
template<typename InputIterator, typename Result, typename Predicate>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type remove_copy_if_impl(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
Predicate pred
)
@ -115,10 +115,10 @@ namespace sprout {
//
// remove_copy_if
//
template<typename Iterator, typename Result, typename Predicate>
template<typename InputIterator, typename Result, typename Predicate>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type remove_copy_if(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
Predicate pred
)