mirror of
https://github.com/bolero-MURAKAMI/Sprout.git
synced 2025-07-14 15:04:09 +00:00
fix template-parameter name: Iterator, Range
This commit is contained in:
parent
ddccff51e6
commit
21cefe8a67
62 changed files with 809 additions and 784 deletions
|
@ -11,27 +11,27 @@
|
|||
namespace sprout {
|
||||
namespace range {
|
||||
namespace detail {
|
||||
template<typename Range, typename Pair>
|
||||
template<typename ForwardRange, typename Pair>
|
||||
inline SPROUT_CONSTEXPR sprout::pair<
|
||||
typename sprout::range::range_return<Range>::type,
|
||||
typename sprout::range::range_return<Range>::type
|
||||
typename sprout::range::range_return<ForwardRange>::type,
|
||||
typename sprout::range::range_return<ForwardRange>::type
|
||||
>
|
||||
pack_pair(Pair const& pair, Range&& range) {
|
||||
pack_pair(Pair const& pair, ForwardRange&& range) {
|
||||
return {
|
||||
sprout::range::range_return<Range>::pack(pair.first, sprout::forward<Range>(range)),
|
||||
sprout::range::range_return<Range>::pack(pair.second, sprout::forward<Range>(range))
|
||||
sprout::range::range_return<ForwardRange>::pack(pair.first, sprout::forward<ForwardRange>(range)),
|
||||
sprout::range::range_return<ForwardRange>::pack(pair.second, sprout::forward<ForwardRange>(range))
|
||||
};
|
||||
}
|
||||
|
||||
template<sprout::range::range_return_value RetV, typename Range, typename Pair>
|
||||
template<sprout::range::range_return_value RetV, typename ForwardRange, typename Pair>
|
||||
inline SPROUT_CONSTEXPR sprout::pair<
|
||||
typename sprout::range::range_return<Range, RetV>::type,
|
||||
typename sprout::range::range_return<Range, RetV>::type
|
||||
typename sprout::range::range_return<ForwardRange, RetV>::type,
|
||||
typename sprout::range::range_return<ForwardRange, RetV>::type
|
||||
>
|
||||
pack_pair(Pair const& pair, Range&& range) {
|
||||
pack_pair(Pair const& pair, ForwardRange&& range) {
|
||||
return {
|
||||
sprout::range::range_return<Range, RetV>::pack(pair.first, sprout::forward<Range>(range)),
|
||||
sprout::range::range_return<Range, RetV>::pack(pair.second, sprout::forward<Range>(range))
|
||||
sprout::range::range_return<ForwardRange, RetV>::pack(pair.first, sprout::forward<ForwardRange>(range)),
|
||||
sprout::range::range_return<ForwardRange, RetV>::pack(pair.second, sprout::forward<ForwardRange>(range))
|
||||
};
|
||||
}
|
||||
} // namespace detail
|
||||
|
@ -39,65 +39,65 @@ namespace sprout {
|
|||
// Copyright (C) 2011 RiSK (sscrisk)
|
||||
|
||||
// 25.4.7 Minimum and maximum
|
||||
template<typename Range>
|
||||
template<typename ForwardRange>
|
||||
inline SPROUT_CONSTEXPR sprout::pair<
|
||||
typename sprout::range::range_return<Range>::type,
|
||||
typename sprout::range::range_return<Range>::type
|
||||
typename sprout::range::range_return<ForwardRange>::type,
|
||||
typename sprout::range::range_return<ForwardRange>::type
|
||||
>
|
||||
minmax_element(Range&& range) {
|
||||
return sprout::range::detail::pack_pair<Range>(
|
||||
minmax_element(ForwardRange&& range) {
|
||||
return sprout::range::detail::pack_pair<ForwardRange>(
|
||||
sprout::minmax_element(
|
||||
sprout::begin(sprout::forward<Range>(range)),
|
||||
sprout::end(sprout::forward<Range>(range))
|
||||
sprout::begin(sprout::forward<ForwardRange>(range)),
|
||||
sprout::end(sprout::forward<ForwardRange>(range))
|
||||
),
|
||||
sprout::forward<Range>(range)
|
||||
sprout::forward<ForwardRange>(range)
|
||||
);
|
||||
}
|
||||
|
||||
template<typename Range, typename Compare>
|
||||
template<typename ForwardRange, typename Compare>
|
||||
inline SPROUT_CONSTEXPR sprout::pair<
|
||||
typename sprout::range::range_return<Range>::type,
|
||||
typename sprout::range::range_return<Range>::type
|
||||
typename sprout::range::range_return<ForwardRange>::type,
|
||||
typename sprout::range::range_return<ForwardRange>::type
|
||||
>
|
||||
minmax_element(Range&& range, Compare comp) {
|
||||
return sprout::range::detail::pack_pair<Range>(
|
||||
minmax_element(ForwardRange&& range, Compare comp) {
|
||||
return sprout::range::detail::pack_pair<ForwardRange>(
|
||||
sprout::minmax_element(
|
||||
sprout::begin(sprout::forward<Range>(range)),
|
||||
sprout::end(sprout::forward<Range>(range)),
|
||||
sprout::begin(sprout::forward<ForwardRange>(range)),
|
||||
sprout::end(sprout::forward<ForwardRange>(range)),
|
||||
comp
|
||||
),
|
||||
sprout::forward<Range>(range)
|
||||
sprout::forward<ForwardRange>(range)
|
||||
);
|
||||
}
|
||||
|
||||
template<sprout::range::range_return_value RetV, typename Range>
|
||||
template<sprout::range::range_return_value RetV, typename ForwardRange>
|
||||
inline SPROUT_CONSTEXPR sprout::pair<
|
||||
typename sprout::range::range_return<Range, RetV>::type,
|
||||
typename sprout::range::range_return<Range, RetV>::type
|
||||
typename sprout::range::range_return<ForwardRange, RetV>::type,
|
||||
typename sprout::range::range_return<ForwardRange, RetV>::type
|
||||
>
|
||||
minmax_element(Range&& range) {
|
||||
return sprout::range::detail::pack_pair<RetV, Range>(
|
||||
minmax_element(ForwardRange&& range) {
|
||||
return sprout::range::detail::pack_pair<RetV, ForwardRange>(
|
||||
sprout::minmax_element(
|
||||
sprout::begin(sprout::forward<Range>(range)),
|
||||
sprout::end(sprout::forward<Range>(range))
|
||||
sprout::begin(sprout::forward<ForwardRange>(range)),
|
||||
sprout::end(sprout::forward<ForwardRange>(range))
|
||||
),
|
||||
sprout::forward<Range>(range)
|
||||
sprout::forward<ForwardRange>(range)
|
||||
);
|
||||
}
|
||||
|
||||
template<sprout::range::range_return_value RetV, typename Range, typename Compare>
|
||||
template<sprout::range::range_return_value RetV, typename ForwardRange, typename Compare>
|
||||
inline SPROUT_CONSTEXPR sprout::pair<
|
||||
typename sprout::range::range_return<Range, RetV>::type,
|
||||
typename sprout::range::range_return<Range, RetV>::type
|
||||
typename sprout::range::range_return<ForwardRange, RetV>::type,
|
||||
typename sprout::range::range_return<ForwardRange, RetV>::type
|
||||
>
|
||||
minmax_element(Range&& range, Compare comp) {
|
||||
return sprout::range::detail::pack_pair<RetV, Range>(
|
||||
minmax_element(ForwardRange&& range, Compare comp) {
|
||||
return sprout::range::detail::pack_pair<RetV, ForwardRange>(
|
||||
sprout::minmax_element(
|
||||
sprout::begin(sprout::forward<Range>(range)),
|
||||
sprout::end(sprout::forward<Range>(range)),
|
||||
sprout::begin(sprout::forward<ForwardRange>(range)),
|
||||
sprout::end(sprout::forward<ForwardRange>(range)),
|
||||
comp
|
||||
),
|
||||
sprout::forward<Range>(range)
|
||||
sprout::forward<ForwardRange>(range)
|
||||
);
|
||||
}
|
||||
} // namespace range
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue