mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-14 15:04:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

40
sprout/algorithm/fit/merge.hpp
View file

@ -13,12 +13,12 @@
namespace sprout {
namespace fit {
namespace detail {
template<typename Iterator1, typename Iterator2, typename Result, typename Compare>
template<typename InputIterator1, typename InputIterator2, typename Result, typename Compare>
SPROUT_CONSTEXPR inline typename sprout::fit::result_of::algorithm<Result>::type merge_impl(
Iterator1 first1,
Iterator1 last1,
Iterator2 first2,
Iterator2 last2,
InputIterator1 first1,
InputIterator1 last1,
InputIterator2 first2,
InputIterator2 last2,
Result const& result,
Compare comp,
typename sprout::fixed_container_traits<Result>::difference_type offset
@ -37,12 +37,12 @@ namespace sprout {
//
// merge
//
template<typename Iterator1, typename Iterator2, typename Result, typename Compare>
template<typename InputIterator1, typename InputIterator2, typename Result, typename Compare>
SPROUT_CONSTEXPR inline typename sprout::fit::result_of::algorithm<Result>::type merge(
Iterator1 first1,
Iterator1 last1,
Iterator2 first2,
Iterator2 last2,
InputIterator1 first1,
InputIterator1 last1,
InputIterator2 first2,
InputIterator2 last2,
Result const& result,
Compare comp
)
@ -51,12 +51,12 @@ namespace sprout {
}
namespace detail {
template<typename Iterator1, typename Iterator2, typename Result>
template<typename InputIterator1, typename InputIterator2, typename Result>
SPROUT_CONSTEXPR inline typename sprout::fit::result_of::algorithm<Result>::type merge_impl(
Iterator1 first1,
Iterator1 last1,
Iterator2 first2,
Iterator2 last2,
InputIterator1 first1,
InputIterator1 last1,
InputIterator2 first2,
InputIterator2 last2,
Result const& result,
typename sprout::fixed_container_traits<Result>::difference_type offset
)
@ -74,12 +74,12 @@ namespace sprout {
//
// merge
//
template<typename Iterator1, typename Iterator2, typename Result>
template<typename InputIterator1, typename InputIterator2, typename Result>
SPROUT_CONSTEXPR inline typename sprout::fit::result_of::algorithm<Result>::type merge(
Iterator1 first1,
Iterator1 last1,
Iterator2 first2,
Iterator2 last2,
InputIterator1 first1,
InputIterator1 last1,
InputIterator2 first2,
InputIterator2 last2,
Result const& result
)
{