SERVER-35234 makePromiseFuture<T>()

1 files changed, 3 insertions, 4 deletions

diff --git a/src/mongo/transport/baton.h b/src/mongo/transport/baton.h
index 59c2d7c06ab..65a9efbb7d8 100644
--- a/src/mongo/transport/baton.h
+++ b/src/mongo/transport/baton.h
@@ -70,14 +70,13 @@ public:
      */
     template <typename Callback>
     Future<FutureContinuationResult<Callback>> execute(Callback&& cb) {
-        Promise<FutureContinuationResult<Callback>> promise;
-        auto future = promise.getFuture();
+        auto pf = makePromiseFuture<FutureContinuationResult<Callback>>();
 
-        schedule([ cb = std::forward<Callback>(cb), sp = promise.share() ]() mutable {
+        schedule([ cb = std::forward<Callback>(cb), sp = pf.promise.share() ]() mutable {
             sp.setWith(std::move(cb));
         });
 
-        return future;
+        return std::move(pf.future);
     }
 
     /**