RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/osd: drop arg packs from blocking_future.

Browse Source 
This feature is not necessary as the `seastar::feature` lost
the support for `T...`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
Radoslaw Zarzynski 2020-12-16 19:35:48 +01:00
parent 355c855bc6
commit 4d46497fd4
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/crimson/osd/osd_operation.h
View File

@ -73,10 +73,10 @@ class blocking_future_detail {
blocking_future_detail(Blocker *b, Fut &&f)
: blocker(b), fut(std::move(f)) {}
template <typename... V, typename... U>
friend blocking_future_detail<seastar::future<V...>> make_ready_blocking_future(U&&... args);
template <typename... V, typename Exception>
friend blocking_future_detail<seastar::future<V...>>
template <typename V, typename U>
friend blocking_future_detail<seastar::future<V>> make_ready_blocking_future(U&& args);
template <typename V, typename Exception>
friend blocking_future_detail<seastar::future<V>>
make_exception_blocking_future(Exception&& e);
template <typename U>
@ -95,22 +95,22 @@ public:
}
};
template <typename... T>
using blocking_future = blocking_future_detail<seastar::future<T...>>;
template <typename T=void>
using blocking_future = blocking_future_detail<seastar::future<T>>;
template <typename... V, typename... U>
blocking_future_detail<seastar::future<V...>> make_ready_blocking_future(U&&... args) {
return blocking_future<V...>(
template <typename V, typename U>
blocking_future_detail<seastar::future<V>> make_ready_blocking_future(U&& args) {
return blocking_future<V>(
nullptr,
seastar::make_ready_future<V...>(std::forward<U>(args)...));
seastar::make_ready_future<V>(std::forward<U>(args)));
}
template <typename... V, typename Exception>
blocking_future_detail<seastar::future<V...>>
template <typename V, typename Exception>
blocking_future_detail<seastar::future<V>>
make_exception_blocking_future(Exception&& e) {
return blocking_future<V...>(
return blocking_future<V>(
nullptr,
seastar::make_exception_future<V...>(e));
seastar::make_exception_future<V>(e));
}
/**
@ -119,9 +119,9 @@ make_exception_blocking_future(Exception&& e) {
*/
class Blocker {
public:
template <typename... T>
blocking_future<T...> make_blocking_future(seastar::future<T...> &&f) {
return blocking_future<T...>(this, std::move(f));
template <typename T>
blocking_future<T> make_blocking_future(seastar::future<T> &&f) {
return blocking_future<T>(this, std::move(f));
}
void dump(ceph::Formatter *f) const;
virtual ~Blocker() = default;
@ -187,8 +187,8 @@ class Operation : public boost::intrusive_ref_counter<
virtual const char *get_type_name() const = 0;
virtual void print(std::ostream &) const = 0;
template <typename... T>
seastar::future<T...> with_blocking_future(blocking_future<T...> &&f) {
template <typename T>
seastar::future<T> with_blocking_future(blocking_future<T> &&f) {
if (f.fut.available()) {
return std::move(f.fut);
}