King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

add SPROUT_FORWARD - workaround for ICC

Browse source
This commit is contained in:
bolero-MURAKAMI 2014-02-22 16:32:51 +09:00
parent 7831105add
commit 274122efb2
202 changed files with 750 additions and 741 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sprout/range/adaptor/deep_copied.hpp
View file

@ -35,7 +35,7 @@ namespace sprout {
typename std::remove_reference<Range>::type
>::copied_type
operator|(Range&& lhs, sprout::adaptors::deep_copied_forwarder const&) {
return sprout::deep_copy(sprout::forward<Range>(lhs));
return sprout::deep_copy(SPROUT_FORWARD(Range, lhs));
}
} // namespace adaptors
} // namespace sprout

6
sprout/range/adaptor/detail/adapted_range_default.hpp
View file

@ -49,11 +49,11 @@ namespace sprout {
public:
template<typename Cont>
static SPROUT_CONSTEXPR copied_type deep_copy(Cont&& cont) {
return sprout::range::fixed::copy(sprout::forward<Cont>(cont), sprout::pit<copied_type>());
return sprout::range::fixed::copy(SPROUT_FORWARD(Cont, cont), sprout::pit<copied_type>());
}
template<typename... Args>
static SPROUT_CONSTEXPR copied_type make(Args&&... args) {
return sprout::make<copied_type>(sprout::forward<Args>(args)...);
return sprout::make<copied_type>(SPROUT_FORWARD(Args, args)...);
}
template<typename Cont, typename... Args>
static SPROUT_CONSTEXPR copied_type remake(
@ -62,7 +62,7 @@ namespace sprout {
Args&&... args
)
{
return sprout::remake<copied_type>(sprout::forward<Cont>(cont), size, sprout::forward<Args>(args)...);
return sprout::remake<copied_type>(SPROUT_FORWARD(Cont, cont), size, SPROUT_FORWARD(Args, args)...);
}
};
} // namespace sprout

6
sprout/range/adaptor/detail/jointed_range_default.hpp
View file

@ -189,11 +189,11 @@ namespace sprout {
public:
template<typename Cont>
static SPROUT_CONSTEXPR copied_type deep_copy(Cont&& cont) {
return sprout::range::fixed::copy(sprout::forward<Cont>(cont), sprout::pit<copied_type>());
return sprout::range::fixed::copy(SPROUT_FORWARD(Cont, cont), sprout::pit<copied_type>());
}
template<typename... Args>
static SPROUT_CONSTEXPR copied_type make(Args&&... args) {
return sprout::make<copied_type>(sprout::forward<Args>(args)...);
return sprout::make<copied_type>(SPROUT_FORWARD(Args, args)...);
}
template<typename Cont, typename... Args>
static SPROUT_CONSTEXPR copied_type remake(
@ -202,7 +202,7 @@ namespace sprout {
Args&&... args
)
{
return sprout::remake<copied_type>(sprout::forward<Cont>(cont), size, sprout::forward<Args>(args)...);
return sprout::remake<copied_type>(SPROUT_FORWARD(Cont, cont), size, SPROUT_FORWARD(Args, args)...);
}
};
} // namespace sprout

6
sprout/range/adaptor/detail/sized_range_default.hpp
View file

@ -97,11 +97,11 @@ namespace sprout {
public:
template<typename Cont>
static SPROUT_CONSTEXPR copied_type deep_copy(Cont&& cont) {
return sprout::range::fixed::copy(sprout::forward<Cont>(cont), sprout::pit<copied_type>());
return sprout::range::fixed::copy(SPROUT_FORWARD(Cont, cont), sprout::pit<copied_type>());
}
template<typename... Args>
static SPROUT_CONSTEXPR copied_type make(Args&&... args) {
return sprout::make<copied_type>(sprout::forward<Args>(args)...);
return sprout::make<copied_type>(SPROUT_FORWARD(Args, args)...);
}
template<typename Cont, typename... Args>
static SPROUT_CONSTEXPR copied_type remake(
@ -110,7 +110,7 @@ namespace sprout {
Args&&... args
)
{
return sprout::remake<copied_type>(sprout::forward<Cont>(cont), size, sprout::forward<Args>(args)...);
return sprout::remake<copied_type>(SPROUT_FORWARD(Cont, cont), size, SPROUT_FORWARD(Args, args)...);
}
};
} // namespace sprout

28
sprout/range/adaptor/piped.hpp
View file

@ -23,23 +23,23 @@ namespace sprout {
template<typename Range>
inline SPROUT_CONSTEXPR auto
apply_adaptors_impl(Range&& range)
-> decltype(sprout::forward<Range>(range))
-> decltype(SPROUT_FORWARD(Range, range))
{
return sprout::forward<Range>(range);
return SPROUT_FORWARD(Range, range);
}
template<typename Range, typename Adaptor>
inline SPROUT_CONSTEXPR auto
apply_adaptors_impl(Range&& range, Adaptor const& adaptor)
-> decltype(sprout::forward<Range>(range) | adaptor)
-> decltype(SPROUT_FORWARD(Range, range) | adaptor)
{
return sprout::forward<Range>(range) | adaptor;
return SPROUT_FORWARD(Range, range) | adaptor;
}
template<typename Range, typename Adaptor, typename... Tail>
inline SPROUT_CONSTEXPR auto
apply_adaptors_impl(Range&& range, Adaptor const& adaptor, Tail const&... tail)
-> decltype(sprout::adaptors::detail::apply_adaptors_impl(sprout::forward<Range>(range) | adaptor, tail...))
-> decltype(sprout::adaptors::detail::apply_adaptors_impl(SPROUT_FORWARD(Range, range) | adaptor, tail...))
{
return sprout::adaptors::detail::apply_adaptors_impl(sprout::forward<Range>(range) | adaptor, tail...);
return sprout::adaptors::detail::apply_adaptors_impl(SPROUT_FORWARD(Range, range) | adaptor, tail...);
}
} // namespace detail
//
@ -48,31 +48,31 @@ namespace sprout {
template<typename Range, typename... Adaptors>
SPROUT_CONSTEXPR auto
apply_adaptors(Range&& range, Adaptors const&... adaptors)
-> decltype(sprout::adaptors::detail::apply_adaptors_impl(sprout::forward<Range>(range), adaptors...))
-> decltype(sprout::adaptors::detail::apply_adaptors_impl(SPROUT_FORWARD(Range, range), adaptors...))
{
return sprout::adaptors::detail::apply_adaptors_impl(sprout::forward<Range>(range), adaptors...);
return sprout::adaptors::detail::apply_adaptors_impl(SPROUT_FORWARD(Range, range), adaptors...);
}
namespace detail {
template<typename Range, typename AdaptorsTuple, sprout::index_t... Indexes>
SPROUT_CONSTEXPR auto
apply_adaptors_tuple_impl(Range&& range, AdaptorsTuple const& adaptors, sprout::index_tuple<Indexes...>)
-> decltype(sprout::adaptors::apply_adaptors(sprout::forward<Range>(range), sprout::tuples::get<Indexes>(adaptors)...))
-> decltype(sprout::adaptors::apply_adaptors(SPROUT_FORWARD(Range, range), sprout::tuples::get<Indexes>(adaptors)...))
{
return sprout::adaptors::apply_adaptors(sprout::forward<Range>(range), sprout::tuples::get<Indexes>(adaptors)...);
return sprout::adaptors::apply_adaptors(SPROUT_FORWARD(Range, range), sprout::tuples::get<Indexes>(adaptors)...);
}
template<typename Range, typename AdaptorsTuple>
SPROUT_CONSTEXPR auto
apply_adaptors_tuple(Range&& range, AdaptorsTuple const& adaptors)
-> decltype(
sprout::adaptors::detail::apply_adaptors_tuple_impl(
sprout::forward<Range>(range), adaptors,
SPROUT_FORWARD(Range, range), adaptors,
sprout::make_index_tuple<sprout::tuples::tuple_size<AdaptorsTuple>::value>::make()
)
)
{
return sprout::adaptors::detail::apply_adaptors_tuple_impl(
sprout::forward<Range>(range), adaptors,
SPROUT_FORWARD(Range, range), adaptors,
sprout::make_index_tuple<sprout::tuples::tuple_size<AdaptorsTuple>::value>::make()
);
}
@ -97,9 +97,9 @@ namespace sprout {
template<typename Range>
SPROUT_CONSTEXPR auto
apply(Range&& range) const
-> decltype(sprout::adaptors::detail::apply_adaptors_tuple(sprout::forward<Range>(range), std::declval<pipe_holder const&>().adaptors()))
-> decltype(sprout::adaptors::detail::apply_adaptors_tuple(SPROUT_FORWARD(Range, range), std::declval<pipe_holder const&>().adaptors()))
{
return sprout::adaptors::detail::apply_adaptors_tuple(sprout::forward<Range>(range), adaptors());
return sprout::adaptors::detail::apply_adaptors_tuple(SPROUT_FORWARD(Range, range), adaptors());
}
};

24
sprout/range/algorithm/adjacent_find.hpp
View file

@ -24,10 +24,10 @@ namespace sprout {
adjacent_find(ForwardRange&& range) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::adjacent_find(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -36,11 +36,11 @@ namespace sprout {
adjacent_find(ForwardRange&& range, BinaryPredicate pred) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::adjacent_find(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
pred
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -49,10 +49,10 @@ namespace sprout {
adjacent_find(ForwardRange&& range) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::adjacent_find(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -61,11 +61,11 @@ namespace sprout {
adjacent_find(ForwardRange&& range, BinaryPredicate pred) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::adjacent_find(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
pred
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
} // namespace range

8
sprout/range/algorithm/equal_range.hpp
View file

@ -32,8 +32,8 @@ namespace sprout {
equal_range(ForwardRange&& range, T const& value) {
return sprout::range::detail::pair_to_range<ForwardRange>(
sprout::equal_range(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value
)
);
@ -44,8 +44,8 @@ namespace sprout {
equal_range(ForwardRange&& range, T const& value, Compare comp) {
return sprout::range::detail::pair_to_range<ForwardRange>(
sprout::equal_range(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value,
comp
)

12
sprout/range/algorithm/find.hpp
View file

@ -24,11 +24,11 @@ namespace sprout {
find(InputRange&& range, T const& value) {
return sprout::range::range_return<InputRange>::pack(
sprout::find(
sprout::begin(sprout::forward<InputRange>(range)),
sprout::end(sprout::forward<InputRange>(range)),
sprout::begin(SPROUT_FORWARD(InputRange, range)),
sprout::end(SPROUT_FORWARD(InputRange, range)),
value
),
sprout::forward<InputRange>(range)
SPROUT_FORWARD(InputRange, range)
);
}
@ -37,11 +37,11 @@ namespace sprout {
find(InputRange&& range, T const& value) {
return sprout::range::range_return<InputRange, RetV>::pack(
sprout::find(
sprout::begin(sprout::forward<InputRange>(range)),
sprout::end(sprout::forward<InputRange>(range)),
sprout::begin(SPROUT_FORWARD(InputRange, range)),
sprout::end(SPROUT_FORWARD(InputRange, range)),
value
),
sprout::forward<InputRange>(range)
SPROUT_FORWARD(InputRange, range)
);
}
} // namespace range

16
sprout/range/algorithm/find_difference.hpp
View file

@ -27,10 +27,10 @@ namespace sprout {
>
find_difference(InputRange1&& range1, InputRange2&& range2, Compare comp) {
return sprout::find_difference(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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
);
}
@ -42,10 +42,10 @@ namespace sprout {
>
find_difference(InputRange1&& range1, InputRange2&& range2) {
return sprout::find_difference(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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

40
sprout/range/algorithm/find_end.hpp
View file

@ -24,12 +24,12 @@ namespace sprout {
find_end(ForwardRange1&& range1, ForwardRange2&& range2) {
return sprout::range::range_return<ForwardRange1>::pack(
sprout::find_end(
sprout::begin(sprout::forward<ForwardRange1>(range1)),
sprout::end(sprout::forward<ForwardRange1>(range1)),
sprout::begin(sprout::forward<ForwardRange2>(range2)),
sprout::end(sprout::forward<ForwardRange2>(range2))
sprout::begin(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::end(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::begin(SPROUT_FORWARD(ForwardRange2, range2)),
sprout::end(SPROUT_FORWARD(ForwardRange2, range2))
),
sprout::forward<ForwardRange1>(range1)
SPROUT_FORWARD(ForwardRange1, range1)
);
}
@ -38,13 +38,13 @@ namespace sprout {
find_end(ForwardRange1&& range1, ForwardRange2&& range2, BinaryPredicate pred) {
return sprout::range::range_return<ForwardRange1>::pack(
sprout::find_end(
sprout::begin(sprout::forward<ForwardRange1>(range1)),
sprout::end(sprout::forward<ForwardRange1>(range1)),
sprout::begin(sprout::forward<ForwardRange2>(range2)),
sprout::end(sprout::forward<ForwardRange2>(range2)),
sprout::begin(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::end(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::begin(SPROUT_FORWARD(ForwardRange2, range2)),
sprout::end(SPROUT_FORWARD(ForwardRange2, range2)),
pred
),
sprout::forward<ForwardRange1>(range1)
SPROUT_FORWARD(ForwardRange1, range1)
);
}
@ -53,12 +53,12 @@ namespace sprout {
find_end(ForwardRange1&& range1, ForwardRange2&& range2) {
return sprout::range::range_return<ForwardRange1, RetV>::pack(
sprout::find_end(
sprout::begin(sprout::forward<ForwardRange1>(range1)),
sprout::end(sprout::forward<ForwardRange1>(range1)),
sprout::begin(sprout::forward<ForwardRange2>(range2)),
sprout::end(sprout::forward<ForwardRange2>(range2))
sprout::begin(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::end(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::begin(SPROUT_FORWARD(ForwardRange2, range2)),
sprout::end(SPROUT_FORWARD(ForwardRange2, range2))
),
sprout::forward<ForwardRange1>(range1)
SPROUT_FORWARD(ForwardRange1, range1)
);
}
@ -67,13 +67,13 @@ namespace sprout {
find_end(ForwardRange1&& range1, ForwardRange2&& range2, BinaryPredicate pred) {
return sprout::range::range_return<ForwardRange1, RetV>::pack(
sprout::find_end(
sprout::begin(sprout::forward<ForwardRange1>(range1)),
sprout::end(sprout::forward<ForwardRange1>(range1)),
sprout::begin(sprout::forward<ForwardRange2>(range2)),
sprout::end(sprout::forward<ForwardRange2>(range2)),
sprout::begin(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::end(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::begin(SPROUT_FORWARD(ForwardRange2, range2)),
sprout::end(SPROUT_FORWARD(ForwardRange2, range2)),
pred
),
sprout::forward<ForwardRange1>(range1)
SPROUT_FORWARD(ForwardRange1, range1)
);
}
} // namespace range

40
sprout/range/algorithm/find_first_of.hpp
View file

@ -24,12 +24,12 @@ namespace sprout {
find_first_of(InputRange1&& range1, InputRange2&& range2) {
return sprout::range::range_return<InputRange1>::pack(
sprout::find_first_of(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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))
),
sprout::forward<InputRange1>(range1)
SPROUT_FORWARD(InputRange1, range1)
);
}
@ -38,13 +38,13 @@ namespace sprout {
find_first_of(InputRange1&& range1, InputRange2&& range2, BinaryPredicate pred) {
return sprout::range::range_return<InputRange1>::pack(
sprout::find_first_of(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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)),
pred
),
sprout::forward<InputRange1>(range1)
SPROUT_FORWARD(InputRange1, range1)
);
}
@ -53,12 +53,12 @@ namespace sprout {
find_first_of(InputRange1&& range1, InputRange2&& range2) {
return sprout::range::range_return<InputRange1, RetV>::pack(
sprout::find_first_of(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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))
),
sprout::forward<InputRange1>(range1)
SPROUT_FORWARD(InputRange1, range1)
);
}
@ -67,13 +67,13 @@ namespace sprout {
find_first_of(InputRange1&& range1, InputRange2&& range2, BinaryPredicate pred) {
return sprout::range::range_return<InputRange1, RetV>::pack(
sprout::find_first_of(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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)),
pred
),
sprout::forward<InputRange1>(range1)
SPROUT_FORWARD(InputRange1, range1)
);
}
} // namespace range

12
sprout/range/algorithm/find_if.hpp
View file

@ -24,11 +24,11 @@ namespace sprout {
find_if(InputRange&& range, Predicate pred) {
return sprout::range::range_return<InputRange>::pack(
sprout::find_if(
sprout::begin(sprout::forward<InputRange>(range)),
sprout::end(sprout::forward<InputRange>(range)),
sprout::begin(SPROUT_FORWARD(InputRange, range)),
sprout::end(SPROUT_FORWARD(InputRange, range)),
pred
),
sprout::forward<InputRange>(range)
SPROUT_FORWARD(InputRange, range)
);
}
@ -37,11 +37,11 @@ namespace sprout {
find_if(InputRange&& range, Predicate pred) {
return sprout::range::range_return<InputRange, RetV>::pack(
sprout::find_if(
sprout::begin(sprout::forward<InputRange>(range)),
sprout::end(sprout::forward<InputRange>(range)),
sprout::begin(SPROUT_FORWARD(InputRange, range)),
sprout::end(SPROUT_FORWARD(InputRange, range)),
pred
),
sprout::forward<InputRange>(range)
SPROUT_FORWARD(InputRange, range)
);
}
} // namespace range

12
sprout/range/algorithm/find_if_not.hpp
View file

@ -24,11 +24,11 @@ namespace sprout {
find_if_not(InputRange&& range, Predicate pred) {
return sprout::range::range_return<InputRange>::pack(
sprout::find_if_not(
sprout::begin(sprout::forward<InputRange>(range)),
sprout::end(sprout::forward<InputRange>(range)),
sprout::begin(SPROUT_FORWARD(InputRange, range)),
sprout::end(SPROUT_FORWARD(InputRange, range)),
pred
),
sprout::forward<InputRange>(range)
SPROUT_FORWARD(InputRange, range)
);
}
@ -37,11 +37,11 @@ namespace sprout {
find_if_not(InputRange&& range, Predicate pred) {
return sprout::range::range_return<InputRange, RetV>::pack(
sprout::find_if_not(
sprout::begin(sprout::forward<InputRange>(range)),
sprout::end(sprout::forward<InputRange>(range)),
sprout::begin(SPROUT_FORWARD(InputRange, range)),
sprout::end(SPROUT_FORWARD(InputRange, range)),
pred
),
sprout::forward<InputRange>(range)
SPROUT_FORWARD(InputRange, range)
);
}
} // namespace range

16
sprout/range/algorithm/find_intersection.hpp
View file

@ -27,10 +27,10 @@ namespace sprout {
>
find_intersection(InputRange1&& range1, InputRange2&& range2, Compare comp) {
return sprout::find_intersection(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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
);
}
@ -42,10 +42,10 @@ namespace sprout {
>
find_intersection(InputRange1&& range1, InputRange2&& range2) {
return sprout::find_intersection(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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

16
sprout/range/algorithm/find_symmetric_difference.hpp
View file

@ -27,10 +27,10 @@ namespace sprout {
>
find_symmetric_difference(InputRange1&& range1, InputRange2&& range2, Compare comp) {
return sprout::find_symmetric_difference(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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
);
}
@ -42,10 +42,10 @@ namespace sprout {
>
find_symmetric_difference(InputRange1&& range1, InputRange2&& range2) {
return sprout::find_symmetric_difference(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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

24
sprout/range/algorithm/is_heap_until.hpp
View file

@ -24,10 +24,10 @@ namespace sprout {
is_heap_until(RandomAccessRange&& range) {
return sprout::range::range_return<RandomAccessRange>::pack(
sprout::is_heap_until(
sprout::begin(sprout::forward<RandomAccessRange>(range)),
sprout::end(sprout::forward<RandomAccessRange>(range))
sprout::begin(SPROUT_FORWARD(RandomAccessRange, range)),
sprout::end(SPROUT_FORWARD(RandomAccessRange, range))
),
sprout::forward<RandomAccessRange>(range)
SPROUT_FORWARD(RandomAccessRange, range)
);
}
@ -36,11 +36,11 @@ namespace sprout {
is_heap_until(RandomAccessRange&& range, Compare comp) {
return sprout::range::range_return<RandomAccessRange>::pack(
sprout::is_heap_until(
sprout::begin(sprout::forward<RandomAccessRange>(range)),
sprout::end(sprout::forward<RandomAccessRange>(range)),
sprout::begin(SPROUT_FORWARD(RandomAccessRange, range)),
sprout::end(SPROUT_FORWARD(RandomAccessRange, range)),
comp
),
sprout::forward<RandomAccessRange>(range)
SPROUT_FORWARD(RandomAccessRange, range)
);
}
@ -49,10 +49,10 @@ namespace sprout {
is_heap_until(RandomAccessRange&& range) {
return sprout::range::range_return<RandomAccessRange, RetV>::pack(
sprout::is_heap_until(
sprout::begin(sprout::forward<RandomAccessRange>(range)),
sprout::end(sprout::forward<RandomAccessRange>(range))
sprout::begin(SPROUT_FORWARD(RandomAccessRange, range)),
sprout::end(SPROUT_FORWARD(RandomAccessRange, range))
),
sprout::forward<RandomAccessRange>(range)
SPROUT_FORWARD(RandomAccessRange, range)
);
}
@ -61,11 +61,11 @@ namespace sprout {
is_heap_until(RandomAccessRange&& range, Compare comp) {
return sprout::range::range_return<RandomAccessRange, RetV>::pack(
sprout::is_heap_until(
sprout::begin(sprout::forward<RandomAccessRange>(range)),
sprout::end(sprout::forward<RandomAccessRange>(range)),
sprout::begin(SPROUT_FORWARD(RandomAccessRange, range)),
sprout::end(SPROUT_FORWARD(RandomAccessRange, range)),
comp
),
sprout::forward<RandomAccessRange>(range)
SPROUT_FORWARD(RandomAccessRange, range)
);
}
} // namespace range

24
sprout/range/algorithm/is_sorted_until.hpp
View file

@ -24,10 +24,10 @@ namespace sprout {
is_sorted_until(ForwardRange&& range) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::is_sorted_until(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -36,11 +36,11 @@ namespace sprout {
is_sorted_until(ForwardRange&& range, Compare comp) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::is_sorted_until(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -49,10 +49,10 @@ namespace sprout {
is_sorted_until(ForwardRange&& range) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::is_sorted_until(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -61,11 +61,11 @@ namespace sprout {
is_sorted_until(ForwardRange&& range, Compare comp) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::is_sorted_until(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
} // namespace range

24
sprout/range/algorithm/lower_bound.hpp
View file

@ -24,11 +24,11 @@ namespace sprout {
lower_bound(ForwardRange&& range, T const& value) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::lower_bound(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -37,12 +37,12 @@ namespace sprout {
lower_bound(ForwardRange&& range, T const& value, Compare comp) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::lower_bound(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value,
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -51,11 +51,11 @@ namespace sprout {
lower_bound(ForwardRange&& range, T const& value) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::lower_bound(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -64,12 +64,12 @@ namespace sprout {
lower_bound(ForwardRange&& range, T const& value, Compare comp) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::lower_bound(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value,
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
} // namespace range

24
sprout/range/algorithm/max_element.hpp
View file

@ -24,10 +24,10 @@ namespace sprout {
max_element(ForwardRange&& range) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::max_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -36,11 +36,11 @@ namespace sprout {
max_element(ForwardRange&& range, Compare comp) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::max_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -49,10 +49,10 @@ namespace sprout {
max_element(ForwardRange&& range) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::max_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -61,11 +61,11 @@ namespace sprout {
max_element(ForwardRange&& range, Compare comp) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::max_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
} // namespace range

24
sprout/range/algorithm/min_element.hpp
View file

@ -24,10 +24,10 @@ namespace sprout {
min_element(ForwardRange&& range) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::min_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -36,11 +36,11 @@ namespace sprout {
min_element(ForwardRange&& range, Compare comp) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::min_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -49,10 +49,10 @@ namespace sprout {
min_element(ForwardRange&& range) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::min_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -61,11 +61,11 @@ namespace sprout {
min_element(ForwardRange&& range, Compare comp) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::min_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
} // namespace range

32
sprout/range/algorithm/minmax_element.hpp
View file

@ -26,8 +26,8 @@ namespace sprout {
>
pack_pair(Pair const& pair, ForwardRange&& range) {
return {
sprout::range::range_return<ForwardRange>::pack(pair.first, sprout::forward<ForwardRange>(range)),
sprout::range::range_return<ForwardRange>::pack(pair.second, sprout::forward<ForwardRange>(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))
};
}
@ -38,8 +38,8 @@ namespace sprout {
>
pack_pair(Pair const& pair, ForwardRange&& range) {
return {
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))
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
@ -54,10 +54,10 @@ namespace sprout {
minmax_element(ForwardRange&& range) {
return sprout::range::detail::pack_pair<ForwardRange>(
sprout::minmax_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -69,11 +69,11 @@ namespace sprout {
minmax_element(ForwardRange&& range, Compare comp) {
return sprout::range::detail::pack_pair<ForwardRange>(
sprout::minmax_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -85,10 +85,10 @@ namespace sprout {
minmax_element(ForwardRange&& range) {
return sprout::range::detail::pack_pair<RetV, ForwardRange>(
sprout::minmax_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range))
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range))
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -100,11 +100,11 @@ namespace sprout {
minmax_element(ForwardRange&& range, Compare comp) {
return sprout::range::detail::pack_pair<RetV, ForwardRange>(
sprout::minmax_element(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
} // namespace range

12
sprout/range/algorithm/mismatch.hpp
View file

@ -27,9 +27,9 @@ namespace sprout {
>
mismatch(InputRange1&& range1, InputRange2&& range2) {
return sprout::mismatch(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2))
sprout::begin(SPROUT_FORWARD(InputRange1, range1)),
sprout::end(SPROUT_FORWARD(InputRange1, range1)),
sprout::begin(SPROUT_FORWARD(InputRange2, range2))
);
}
@ -40,9 +40,9 @@ namespace sprout {
>
mismatch(InputRange1&& range1, InputRange2&& range2, BinaryPredicate pred) {
return sprout::mismatch(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::begin(SPROUT_FORWARD(InputRange1, range1)),
sprout::end(SPROUT_FORWARD(InputRange1, range1)),
sprout::begin(SPROUT_FORWARD(InputRange2, range2)),
pred
);
}

16
sprout/range/algorithm/next_difference.hpp
View file

@ -27,10 +27,10 @@ namespace sprout {
>
next_difference(InputRange1&& range1, InputRange2&& range2, Compare comp) {
return sprout::next_difference(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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
);
}
@ -42,10 +42,10 @@ namespace sprout {
>
next_difference(InputRange1&& range1, InputRange2&& range2) {
return sprout::next_difference(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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

16
sprout/range/algorithm/next_intersection.hpp
View file

@ -27,10 +27,10 @@ namespace sprout {
>
next_intersection(InputRange1&& range1, InputRange2&& range2, Compare comp) {
return sprout::next_intersection(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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
);
}
@ -42,10 +42,10 @@ namespace sprout {
>
next_intersection(InputRange1&& range1, InputRange2&& range2) {
return sprout::next_intersection(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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

16
sprout/range/algorithm/next_symmetric_difference.hpp
View file

@ -27,10 +27,10 @@ namespace sprout {
>
next_symmetric_difference(Range1&& range1, Range2&& range2, Compare comp) {
return sprout::next_symmetric_difference(
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(Range1, range1)),
sprout::end(SPROUT_FORWARD(Range1, range1)),
sprout::begin(SPROUT_FORWARD(Range2, range2)),
sprout::end(SPROUT_FORWARD(Range2, range2)),
comp
);
}
@ -42,10 +42,10 @@ namespace sprout {
>
next_symmetric_difference(Range1&& range1, Range2&& range2) {
return sprout::next_symmetric_difference(
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(Range1, range1)),
sprout::end(SPROUT_FORWARD(Range1, range1)),
sprout::begin(SPROUT_FORWARD(Range2, range2)),
sprout::end(SPROUT_FORWARD(Range2, range2))
);
}
} // namespace range

16
sprout/range/algorithm/next_union.hpp
View file

@ -27,10 +27,10 @@ namespace sprout {
>
next_union(InputRange1&& range1, InputRange2&& range2, Compare comp) {
return sprout::next_union(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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
);
}
@ -42,10 +42,10 @@ namespace sprout {
>
next_union(InputRange1&& range1, InputRange2&& range2) {
return sprout::next_union(
sprout::begin(sprout::forward<InputRange1>(range1)),
sprout::end(sprout::forward<InputRange1>(range1)),
sprout::begin(sprout::forward<InputRange2>(range2)),
sprout::end(sprout::forward<InputRange2>(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

6
sprout/range/algorithm/partition_point.hpp
View file

@ -24,11 +24,11 @@ namespace sprout {
partition_point(ForwardRange&& range, Predicate pred) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::partition_point(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
pred
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
} // namespace range

40
sprout/range/algorithm/search.hpp
View file

@ -24,12 +24,12 @@ namespace sprout {
search(ForwardRange1&& range1, ForwardRange2&& range2) {
return sprout::range::range_return<ForwardRange1>::pack(
sprout::search(
sprout::begin(sprout::forward<ForwardRange1>(range1)),
sprout::end(sprout::forward<ForwardRange1>(range1)),
sprout::begin(sprout::forward<ForwardRange2>(range2)),
sprout::end(sprout::forward<ForwardRange2>(range2))
sprout::begin(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::end(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::begin(SPROUT_FORWARD(ForwardRange2, range2)),
sprout::end(SPROUT_FORWARD(ForwardRange2, range2))
),
sprout::forward<ForwardRange1>(range1)
SPROUT_FORWARD(ForwardRange1, range1)
);
}
@ -38,13 +38,13 @@ namespace sprout {
search(ForwardRange1&& range1, ForwardRange2&& range2, BinaryPredicate pred) {
return sprout::range::range_return<ForwardRange1>::pack(
sprout::search(
sprout::begin(sprout::forward<ForwardRange1>(range1)),
sprout::end(sprout::forward<ForwardRange1>(range1)),
sprout::begin(sprout::forward<ForwardRange2>(range2)),
sprout::end(sprout::forward<ForwardRange2>(range2)),
sprout::begin(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::end(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::begin(SPROUT_FORWARD(ForwardRange2, range2)),
sprout::end(SPROUT_FORWARD(ForwardRange2, range2)),
pred
),
sprout::forward<ForwardRange1>(range1)
SPROUT_FORWARD(ForwardRange1, range1)
);
}
@ -53,12 +53,12 @@ namespace sprout {
search(ForwardRange1&& range1, ForwardRange2&& range2) {
return sprout::range::range_return<ForwardRange1, RetV>::pack(
sprout::search(
sprout::begin(sprout::forward<ForwardRange1>(range1)),
sprout::end(sprout::forward<ForwardRange1>(range1)),
sprout::begin(sprout::forward<ForwardRange2>(range2)),
sprout::end(sprout::forward<ForwardRange2>(range2))
sprout::begin(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::end(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::begin(SPROUT_FORWARD(ForwardRange2, range2)),
sprout::end(SPROUT_FORWARD(ForwardRange2, range2))
),
sprout::forward<ForwardRange1>(range1)
SPROUT_FORWARD(ForwardRange1, range1)
);
}
@ -67,13 +67,13 @@ namespace sprout {
search(ForwardRange1&& range1, ForwardRange2&& range2, BinaryPredicate pred) {
return sprout::range::range_return<ForwardRange1, RetV>::pack(
sprout::search(
sprout::begin(sprout::forward<ForwardRange1>(range1)),
sprout::end(sprout::forward<ForwardRange1>(range1)),
sprout::begin(sprout::forward<ForwardRange2>(range2)),
sprout::end(sprout::forward<ForwardRange2>(range2)),
sprout::begin(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::end(SPROUT_FORWARD(ForwardRange1, range1)),
sprout::begin(SPROUT_FORWARD(ForwardRange2, range2)),
sprout::end(SPROUT_FORWARD(ForwardRange2, range2)),
pred
),
sprout::forward<ForwardRange1>(range1)
SPROUT_FORWARD(ForwardRange1, range1)
);
}
} // namespace range

24
sprout/range/algorithm/search_n.hpp
View file

@ -24,12 +24,12 @@ namespace sprout {
search_n(ForwardRange&& range, Size count, T const& value) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::search_n(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
count,
value
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -38,13 +38,13 @@ namespace sprout {
search_n(ForwardRange&& range, Size count, T const& value, BinaryPredicate pred) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::search_n(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
count,
value,
pred
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -53,12 +53,12 @@ namespace sprout {
search_n(ForwardRange&& range, Size count, T const& value) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::search_n(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
count,
value
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -67,13 +67,13 @@ namespace sprout {
search_n(ForwardRange&& range, Size count, T const& value, BinaryPredicate pred) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::search_n(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
count,
value,
pred
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
} // namespace range

24
sprout/range/algorithm/upper_bound.hpp
View file

@ -24,11 +24,11 @@ namespace sprout {
upper_bound(ForwardRange&& range, T const& value) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::upper_bound(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -37,12 +37,12 @@ namespace sprout {
upper_bound(ForwardRange&& range, T const& value, Compare comp) {
return sprout::range::range_return<ForwardRange>::pack(
sprout::upper_bound(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value,
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -51,11 +51,11 @@ namespace sprout {
upper_bound(ForwardRange&& range, T const& value) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::upper_bound(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
@ -64,12 +64,12 @@ namespace sprout {
upper_bound(ForwardRange&& range, T const& value, Compare comp) {
return sprout::range::range_return<ForwardRange, RetV>::pack(
sprout::upper_bound(
sprout::begin(sprout::forward<ForwardRange>(range)),
sprout::end(sprout::forward<ForwardRange>(range)),
sprout::begin(SPROUT_FORWARD(ForwardRange, range)),
sprout::end(SPROUT_FORWARD(ForwardRange, range)),
value,
comp
),
sprout::forward<ForwardRange>(range)
SPROUT_FORWARD(ForwardRange, range)
);
}
} // namespace range

4
sprout/range/range_container.hpp
View file

@ -144,8 +144,8 @@ namespace sprout {
inline SPROUT_CONSTEXPR sprout::range::range_container<typename sprout::range::lvalue_iterator<Range>::type>
make_range_container(Range&& range) {
return sprout::range::range_container<typename sprout::range::lvalue_iterator<Range>::type>(
sprout::begin(sprout::forward<Range>(range)),
sprout::end(sprout::forward<Range>(range))
sprout::begin(SPROUT_FORWARD(Range, range)),
sprout::end(SPROUT_FORWARD(Range, range))
);
}
} // namespace range

4
sprout/range/range_return.hpp
View file

@ -55,7 +55,7 @@ namespace sprout {
Range&& range
)
{
return type(found, sprout::end(sprout::forward<Range>(range)));
return type(found, sprout::end(SPROUT_FORWARD(Range, range)));
}
};
template<typename Range>
@ -68,7 +68,7 @@ namespace sprout {
Range&& range
)
{
return type(sprout::begin(sprout::forward<Range>(range)), found);
return type(sprout::begin(SPROUT_FORWARD(Range, range)), found);
}
};
} // namespace range