diff --git a/folly/futures/Future.h b/folly/futures/Future.h index 79b3c79161aff91859b6cf1aeaf914692233b94e..1e9bde29dd216eb35a565a84a6e8c68b61d64914 100644 --- a/folly/futures/Future.h +++ b/folly/futures/Future.h @@ -550,6 +550,7 @@ class SemiFuture : private futures::detail::FutureBase<T> { /* implicit */ SemiFuture(Future<T>&&) noexcept; using Base::cancel; + using Base::getPriority; using Base::hasException; using Base::hasValue; using Base::isReady; @@ -839,11 +840,6 @@ class SemiFuture : private futures::detail::FutureBase<T> { /// - `RESULT.valid() == true` Future<T> toUnsafeFuture() &&; - /// Return this future's executor priority. - int8_t getPriority() const { - return Base::getPriority(); - } - #if FOLLY_HAS_COROUTINES class promise_type { public: @@ -1039,15 +1035,16 @@ class Future : private futures::detail::FutureBase<T> { Future& operator=(Future<T2>&&); using Base::cancel; + using Base::getPriority; using Base::hasException; using Base::hasValue; using Base::isReady; using Base::poll; using Base::raise; + using Base::result; using Base::setCallback_; using Base::valid; using Base::value; - using Base::result; /// Creates/returns an invalid Future, that is, one with no shared state. /// @@ -1822,11 +1819,6 @@ class Future : private futures::detail::FutureBase<T> { return SemiFuture<T>{std::move(*this)}; } - // Returns this future's executor priority. - int8_t getPriority() const { - return Base::getPriority(); - } - protected: friend class Promise<T>; template <class> diff --git a/folly/futures/test/FutureSplitterTest.cpp b/folly/futures/test/FutureSplitterTest.cpp index c3018394c349135f8c8fe4ea2f9c357a0a30d368..bf1189aaa3296649f9de2813841df8fabfbf7110 100644 --- a/folly/futures/test/FutureSplitterTest.cpp +++ b/folly/futures/test/FutureSplitterTest.cpp @@ -176,9 +176,11 @@ TEST(FutureSplitter, splitFutureFailure) { } TEST(FutureSplitter, splitFuturePriority) { - std::vector<int8_t> priorities = {folly::Executor::LO_PRI, - folly::Executor::MID_PRI, - folly::Executor::HI_PRI}; + std::vector<int8_t> priorities = { + folly::Executor::LO_PRI, + folly::Executor::MID_PRI, + folly::Executor::HI_PRI, + }; for (const auto priority : priorities) { Promise<int> p;