fix template-parameter name: Iterator, Range

This commit is contained in:
bolero-MURAKAMI 2013-08-07 22:13:03 +09:00
parent ddccff51e6
commit 21cefe8a67
62 changed files with 809 additions and 784 deletions

View file

@ -13,32 +13,32 @@ namespace sprout {
//
// next_intersection
//
template<typename Range1, typename Range2, typename Compare>
template<typename InputRange1, typename InputRange2, typename Compare>
inline SPROUT_CONSTEXPR sprout::pair<
typename sprout::range::lvalue_iterator<Range1>::type,
typename sprout::range::lvalue_iterator<Range2>::type
typename sprout::range::lvalue_iterator<InputRange1>::type,
typename sprout::range::lvalue_iterator<InputRange2>::type
>
next_intersection(Range1&& range1, Range2&& range2, Compare comp) {
next_intersection(InputRange1&& range1, InputRange2&& range2, Compare comp) {
return sprout::next_intersection(
sprout::begin(sprout::forward<Range1>(range1)),
sprout::end(sprout::forward<Range1>(range1)),
sprout::begin(sprout::forward<Range2>(range2)),
sprout::end(sprout::forward<Range2>(range2)),
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(range2)),
comp
);
}
template<typename Range1, typename Range2>
template<typename InputRange1, typename InputRange2>
inline SPROUT_CONSTEXPR sprout::pair<
typename sprout::range::lvalue_iterator<Range1>::type,
typename sprout::range::lvalue_iterator<Range2>::type
typename sprout::range::lvalue_iterator<InputRange1>::type,
typename sprout::range::lvalue_iterator<InputRange2>::type
>
next_intersection(Range1&& range1, Range2&& range2) {
next_intersection(InputRange1&& range1, InputRange2&& range2) {
return sprout::next_intersection(
sprout::begin(sprout::forward<Range1>(range1)),
sprout::end(sprout::forward<Range1>(range1)),
sprout::begin(sprout::forward<Range2>(range2)),
sprout::end(sprout::forward<Range2>(range2))
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(range2))
);
}
} // namespace range