diff options
author | Alexey Borzenkov <snaury@yandex-team.ru> | 2022-02-10 16:47:43 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:43 +0300 |
commit | 330c83f8c116bd45316397b179275e9d87007e7d (patch) | |
tree | c0748b5dcbade83af788c0abfa89c0383d6b779c /library/cpp/threading/future | |
parent | 22d92781ba2a10b7fb5b977b7d1a5c40ff53885f (diff) | |
download | ydb-330c83f8c116bd45316397b179275e9d87007e7d.tar.gz |
Restoring authorship annotation for Alexey Borzenkov <snaury@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/threading/future')
-rw-r--r-- | library/cpp/threading/future/core/future-inl.h | 8 | ||||
-rw-r--r-- | library/cpp/threading/future/core/future.h | 22 | ||||
-rw-r--r-- | library/cpp/threading/future/future_ut.cpp | 8 |
3 files changed, 19 insertions, 19 deletions
diff --git a/library/cpp/threading/future/core/future-inl.h b/library/cpp/threading/future/core/future-inl.h index 506c77d4c84..5fd4296a93c 100644 --- a/library/cpp/threading/future/core/future-inl.h +++ b/library/cpp/threading/future/core/future-inl.h @@ -619,8 +619,8 @@ namespace NThreading { template <typename T> template <typename F> - inline TFuture<TFutureType<TFutureCallResult<F, T>>> TFuture<T>::Apply(F&& func) const { - auto promise = NewPromise<TFutureType<TFutureCallResult<F, T>>>(); + inline TFuture<TFutureType<TFutureCallResult<F, T>>> TFuture<T>::Apply(F&& func) const { + auto promise = NewPromise<TFutureType<TFutureCallResult<F, T>>>(); Subscribe([promise, func = std::forward<F>(func)](const TFuture<T>& future) mutable { NImpl::SetValue(promise, [&]() { return func(future); }); }); @@ -718,8 +718,8 @@ namespace NThreading { template <typename F> - inline TFuture<TFutureType<TFutureCallResult<F, void>>> TFuture<void>::Apply(F&& func) const { - auto promise = NewPromise<TFutureType<TFutureCallResult<F, void>>>(); + inline TFuture<TFutureType<TFutureCallResult<F, void>>> TFuture<void>::Apply(F&& func) const { + auto promise = NewPromise<TFutureType<TFutureCallResult<F, void>>>(); Subscribe([promise, func = std::forward<F>(func)](const TFuture<void>& future) mutable { NImpl::SetValue(promise, [&]() { return func(future); }); }); diff --git a/library/cpp/threading/future/core/future.h b/library/cpp/threading/future/core/future.h index 00dc245d9aa..2e82bb953eb 100644 --- a/library/cpp/threading/future/core/future.h +++ b/library/cpp/threading/future/core/future.h @@ -47,20 +47,20 @@ namespace NThreading { struct TFutureType<TFuture<T>> { using TType = typename TFutureType<T>::TType; }; - - template <typename F, typename T> - struct TFutureCallResult { - // NOTE: separate class for msvc compatibility - using TType = decltype(std::declval<F&>()(std::declval<const TFuture<T>&>())); - }; + + template <typename F, typename T> + struct TFutureCallResult { + // NOTE: separate class for msvc compatibility + using TType = decltype(std::declval<F&>()(std::declval<const TFuture<T>&>())); + }; } template <typename F> using TFutureType = typename NImpl::TFutureType<F>::TType; - template <typename F, typename T> - using TFutureCallResult = typename NImpl::TFutureCallResult<F, T>::TType; - + template <typename F, typename T> + using TFutureCallResult = typename NImpl::TFutureCallResult<F, T>::TType; + //! Type of the future/promise state identifier class TFutureStateId; @@ -109,7 +109,7 @@ namespace NThreading { const TFuture<T>& NoexceptSubscribe(F&& callback) const noexcept; template <typename F> - TFuture<TFutureType<TFutureCallResult<F, T>>> Apply(F&& func) const; + TFuture<TFutureType<TFutureCallResult<F, T>>> Apply(F&& func) const; TFuture<void> IgnoreResult() const; @@ -164,7 +164,7 @@ namespace NThreading { const TFuture<void>& NoexceptSubscribe(F&& callback) const noexcept; template <typename F> - TFuture<TFutureType<TFutureCallResult<F, void>>> Apply(F&& func) const; + TFuture<TFutureType<TFutureCallResult<F, void>>> Apply(F&& func) const; template <typename R> TFuture<R> Return(const R& value) const; diff --git a/library/cpp/threading/future/future_ut.cpp b/library/cpp/threading/future/future_ut.cpp index 377154e8670..05950a568d4 100644 --- a/library/cpp/threading/future/future_ut.cpp +++ b/library/cpp/threading/future/future_ut.cpp @@ -168,7 +168,7 @@ namespace { TTestCallback callback(123); TFuture<int> future = promise.GetFuture() - .Apply([&](const auto& theFuture) { return callback.Func(theFuture); }); + .Apply([&](const auto& theFuture) { return callback.Func(theFuture); }); promise.SetValue(456); UNIT_ASSERT_EQUAL(future.GetValue(), 123 + 456); @@ -180,7 +180,7 @@ namespace { TTestCallback callback(123); TFuture<void> future = promise.GetFuture() - .Apply([&](const auto& theFuture) { return callback.VoidFunc(theFuture); }); + .Apply([&](const auto& theFuture) { return callback.VoidFunc(theFuture); }); promise.SetValue(456); UNIT_ASSERT(future.HasValue()); @@ -191,7 +191,7 @@ namespace { TTestCallback callback(123); TFuture<int> future = promise.GetFuture() - .Apply([&](const auto& theFuture) { return callback.FutureFunc(theFuture); }); + .Apply([&](const auto& theFuture) { return callback.FutureFunc(theFuture); }); promise.SetValue(456); UNIT_ASSERT_EQUAL(future.GetValue(), 123 + 456); @@ -203,7 +203,7 @@ namespace { TTestCallback callback(123); TFuture<void> future = promise.GetFuture() - .Apply([&](const auto& theFuture) { return callback.FutureVoidFunc(theFuture); }); + .Apply([&](const auto& theFuture) { return callback.FutureVoidFunc(theFuture); }); promise.SetValue(456); UNIT_ASSERT(!future.HasValue()); |