Merge pull request #125 from accelerated/master

Added varargs to support non-default-constructible types in the Promi…
bloomberg · Feb 15, 2020 · 7fa1f25 · 7fa1f25
2 parents 4376587 + 4575c73
commit 7fa1f25
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/quantum/impl/quantum_promise_impl.h b/quantum/impl/quantum_promise_impl.h
@@ -85,10 +85,11 @@ int ICoroPromise<PROMISE, T>::closeBuffer()
 #endif
 
 template <class T>
-Promise<T>::Promise() :
+template <class...ARGS>
+Promise<T>::Promise(ARGS&&...args) :
     IThreadPromise<Promise, T>(this),
     ICoroPromise<Promise, T>(this),
-    _sharedState(new SharedState<T>()),
+    _sharedState(new SharedState<T>(std::forward<ARGS>(args)...)),
     _terminated(false)
 {}
 

diff --git a/quantum/impl/quantum_shared_state_impl.h b/quantum/impl/quantum_shared_state_impl.h
@@ -26,9 +26,10 @@ namespace quantum {
 //                                     class SharedState
 //==============================================================================================
 template <class T>
-SharedState<T>::SharedState() :
+template <class...ARGS>
+SharedState<T>::SharedState(ARGS&&...args) :
     _state(FutureState::PromiseNotSatisfied),
-    _value(T())
+    _value(T(std::forward<ARGS>(args)...))
 {
 }
 

diff --git a/quantum/quantum_promise.h b/quantum/quantum_promise.h
@@ -38,7 +38,8 @@ class Promise : public IPromiseBase,
     using Ptr = std::shared_ptr<Promise<T>>;
 
     //Constructor
-    Promise();
+    template <class...ARGS>
+    Promise(ARGS&&...args);
 
     //Move constructor
     Promise(Promise<T>&& other) :

diff --git a/quantum/quantum_shared_state.h b/quantum/quantum_shared_state.h
@@ -73,7 +73,8 @@ class SharedState
     int setException(ICoroSync::Ptr sync,
                      std::exception_ptr ex);
 private:
-    SharedState();
+    template <class...ARGS>
+    SharedState(ARGS&&...args);
 
     void conditionWait() const;