mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-24 10:30:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:cloudius-systems/seastar into db

Browse Source
This commit is contained in:
Avi Kivity
2015-05-07 13:39:00 +03:00
parent 3a01796eef c18e76cb10
commit 55332b379f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/rpc_impl.hh
View File

@@ -29,8 +29,8 @@
namespace rpc {
template<std::size_t N, typename Serializer, typename... T>
inline std::enable_if_t<N == sizeof...(T), future<>> marshall(Serializer&, output_stream<char>&, std::tuple<T...>&&) {
return make_ready_future<>();
inline std::enable_if_t<N == sizeof...(T), future<>> marshall(Serializer&, output_stream<char>& out, std::tuple<T...>&&) {
return out.flush();
}
template<std::size_t N = 0, typename Serializer, typename... T>
@@ -38,8 +38,6 @@ inline std::enable_if_t<N != sizeof...(T), future<>> marshall(Serializer& serial
using tuple_type = std::tuple<T...>;
return serialize(out, std::forward<typename std::tuple_element<N, tuple_type>::type>(std::get<N>(args))).then([&serialize, &out, args = std::move(args)] () mutable {
return marshall<N + 1>(serialize, out, std::move(args));
}).then([&out] {
return out.flush();
});
}