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

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 unique_copy_impl_3(result, args..., *(sprout::fixed_begin(result) + sizeof...(Args)));
}
template<typename Iterator, typename Result, typename Head, typename... Args>
template<typename InputIterator, typename Result, typename Head, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args) + 1,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type unique_copy_impl_2(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Head const& head,
@ -48,13 +48,13 @@ namespace sprout {
{
return sprout::remake_clone<Result, Result>(result, sprout::size(result), args...);
}
template<typename Iterator, typename Result, typename Head, typename... Args>
template<typename InputIterator, typename Result, typename Head, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args) + 1,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type unique_copy_impl_2(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Head const& head,
@ -63,18 +63,18 @@ namespace sprout {
{
return first != last && sizeof...(Args) + 1 < offset
? !(head == *first)
? unique_copy_impl_2(first + 1, last, result, offset, *first, args..., head)
: unique_copy_impl_2(first + 1, last, result, offset, head, args...)
? unique_copy_impl_2(sprout::next(first), last, result, offset, *first, args..., head)
: unique_copy_impl_2(sprout::next(first), last, result, offset, head, args...)
: unique_copy_impl_3(result, args..., head)
;
}
template<typename Iterator, typename Result, typename... Args>
template<typename InputIterator, typename Result, 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 unique_copy_impl_1(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
@ -82,13 +82,13 @@ namespace sprout {
{
return sprout::remake_clone<Result, Result>(result, sprout::size(result), args...);
}
template<typename Iterator, typename Result, typename... Args>
template<typename InputIterator, typename Result, 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 unique_copy_impl_1(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
@ -96,13 +96,13 @@ namespace sprout {
{
return sizeof...(Args) < offset
? unique_copy_impl_1(first, last, result, offset, args..., *(sprout::fixed_begin(result) + sizeof...(Args)))
: unique_copy_impl_2(first + 1, last, result, offset + sprout::size(result), *first, args...)
: unique_copy_impl_2(sprout::next(first), last, result, offset + sprout::size(result), *first, args...)
;
}
template<typename Iterator, typename Result>
template<typename InputIterator, typename Result>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type unique_copy_impl(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result
)
{
@ -112,10 +112,10 @@ namespace sprout {
//
// unique_copy
//
template<typename Iterator, typename Result>
template<typename InputIterator, typename Result>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type unique_copy(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result
)
{
@ -123,13 +123,13 @@ namespace sprout {
}
namespace detail {
template<typename Iterator, typename Result, typename BinaryPredicate, typename Head, typename... Args>
template<typename InputIterator, typename Result, typename BinaryPredicate, typename Head, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args) + 1,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type unique_copy_impl_2(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
BinaryPredicate pred,
typename sprout::fixed_container_traits<Result>::difference_type offset,
@ -139,13 +139,13 @@ namespace sprout {
{
return sprout::remake_clone<Result, Result>(result, sprout::size(result), args...);
}
template<typename Iterator, typename Result, typename BinaryPredicate, typename Head, typename... Args>
template<typename InputIterator, typename Result, typename BinaryPredicate, typename Head, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args) + 1,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type unique_copy_impl_2(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
BinaryPredicate pred,
typename sprout::fixed_container_traits<Result>::difference_type offset,
@ -155,18 +155,18 @@ namespace sprout {
{
return first != last && sizeof...(Args) + 1 < offset
? !pred(head, *first)
? unique_copy_impl_2(first + 1, last, result, pred, offset, *first, args..., head)
: unique_copy_impl_2(first + 1, last, result, pred, offset, head, args...)
? unique_copy_impl_2(sprout::next(first), last, result, pred, offset, *first, args..., head)
: unique_copy_impl_2(sprout::next(first), last, result, pred, offset, head, args...)
: unique_copy_impl_3(result, args..., head)
;
}
template<typename Iterator, typename Result, typename BinaryPredicate, typename... Args>
template<typename InputIterator, typename Result, typename BinaryPredicate, 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 unique_copy_impl_1(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
BinaryPredicate pred,
typename sprout::fixed_container_traits<Result>::difference_type offset,
@ -175,13 +175,13 @@ namespace sprout {
{
return sprout::remake_clone<Result, Result>(result, sprout::size(result), args...);
}
template<typename Iterator, typename Result, typename BinaryPredicate, typename... Args>
template<typename InputIterator, typename Result, typename BinaryPredicate, 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 unique_copy_impl_1(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
BinaryPredicate pred,
typename sprout::fixed_container_traits<Result>::difference_type offset,
@ -190,13 +190,13 @@ namespace sprout {
{
return sizeof...(Args) < offset
? unique_copy_impl_1(first, last, result, pred, offset, args..., *(sprout::fixed_begin(result) + sizeof...(Args)))
: unique_copy_impl_2(first + 1, last, result, pred, offset + sprout::size(result), *first, args...)
: unique_copy_impl_2(sprout::next(first), last, result, pred, offset + sprout::size(result), *first, args...)
;
}
template<typename Iterator, typename Result, typename BinaryPredicate>
template<typename InputIterator, typename Result, typename BinaryPredicate>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type unique_copy_impl(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
BinaryPredicate pred
)
@ -207,10 +207,10 @@ namespace sprout {
//
// unique_copy
//
template<typename Iterator, typename Result, typename BinaryPredicate>
template<typename InputIterator, typename Result, typename BinaryPredicate>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type unique_copy(
Iterator first,
Iterator last,
InputIterator first,
InputIterator last,
Result const& result,
BinaryPredicate pred
)