Merge pull request #145 from accelerated/promise-constructor

Added support for Promise in the GenericFuture constructor

Author: Alex Damian

quantum/util/impl/quantum_generic_future_impl.h

@@ -62,6 +62,11 @@ template <typename T>
 GenericFuture<T>::GenericFuture()
 {}
 
+template <typename T>
+GenericFuture<T>::GenericFuture(const Promise<T>& p) :
+    _context(local::context() ? p.getICoroFuture() : p.getIThreadFuture())
+{}
+
 template <typename T>
 GenericFuture<T>::GenericFuture(ThreadContextPtr<T> f) :
     _context(f)
@@ -376,6 +381,20 @@ GenericFuture<T>::GenericFuture() :
     _threadContext()
 {}
 
+template <typename T>
+GenericFuture<T>::GenericFuture(const Promise<T>& p) :
+    _type(local::context() ? Type::CoroFuture : Type::ThreadFuture)
+{
+    if (_type == Type::ThreadFuture)
+    {
+        _threadFuture = p.getIThreadFuture();
+    }
+    else
+    {
+        _coroFuture = p.getICoroFuture();
+    }
+}
+
 template <typename T>
 GenericFuture<T>::GenericFuture(ThreadContextPtr<T> f) :
     _type(Type::ThreadContext),

quantum/util/quantum_generic_future.h

@@ -16,8 +16,7 @@
 #ifndef BLOOMBERGLP_QUANTUM_GENERIC_FUTURE_H
 #define BLOOMBERGLP_QUANTUM_GENERIC_FUTURE_H
 
-#include <quantum/interface/quantum_ifuture.h>
-#include <quantum/interface/quantum_icontext.h>
+#include <quantum/quantum_promise.h>
 #if (__cplusplus >= 201703L)
 #include <variant>
 #endif
@@ -39,6 +38,7 @@ class GenericFuture : public IThreadFutureBase
 public:
     /// @brief Constructors/Destructor
     GenericFuture();
+    GenericFuture(const Promise<T>& p);
     GenericFuture(ThreadContextPtr<T> f);
     GenericFuture(ThreadFuturePtr<T> f);
     GenericFuture(CoroContextPtr<T> f); //uses local context