JDBtracker
/
libostd
forked from OctaForge/libostd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

forward the tuple to ensure correct get semantics

master
Daniel Kolesa 2016-05-01 00:53:48 +01:00
parent f46ffa53fd
commit 34cb1f1fbd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ostd/range.hh
View File

@ -608,12 +608,12 @@ inline auto chunks(T n) {
namespace detail {
template<typename T, typename ...R, Size ...I>
inline auto join_proxy(T &&obj, Tuple<R &&...> &tup, TupleIndices<I...>) {
inline auto join_proxy(T &&obj, Tuple<R &&...> &&tup, TupleIndices<I...>) {
return obj.join(forward<R>(get<I>(tup))...);
}
template<typename T, typename ...R, Size ...I>
inline auto zip_proxy(T &&obj, Tuple<R &&...> &tup, TupleIndices<I...>) {
inline auto zip_proxy(T &&obj, Tuple<R &&...> &&tup, TupleIndices<I...>) {
return obj.zip(forward<R>(get<I>(tup))...);
}
}
@ -630,7 +630,8 @@ inline auto join(R1 &&r1, R &&...rr) {
return [ranges = forward_as_tuple(forward<R1>(r1), forward<R>(rr)...)]
(auto &&obj) mutable {
using Index = detail::MakeTupleIndices<sizeof...(R) + 1>;
return detail::join_proxy(forward<decltype(obj)>(obj), ranges, Index());
return detail::join_proxy(forward<decltype(obj )>(obj),
forward<decltype(ranges)>(ranges), Index());
};
}
@ -646,7 +647,8 @@ inline auto zip(R1 &&r1, R &&...rr) {
return [ranges = forward_as_tuple(forward<R1>(r1), forward<R>(rr)...)]
(auto &&obj) mutable {
using Index = detail::MakeTupleIndices<sizeof...(R) + 1>;
return detail::zip_proxy(forward<decltype(obj)>(obj), ranges, Index());
return detail::zip_proxy(forward<decltype(obj )>(obj),
forward<decltype(ranges)>(ranges), Index());
};
}