diff options
| author | Determinant <[email protected]> | 2018-02-03 20:31:00 -0500 |
|---|---|---|
| committer | Determinant <[email protected]> | 2018-02-03 20:51:57 -0500 |
| commit | 767fa96c078de01438194fa8e46aa936cd037836 (patch) | |
| tree | 63fd231d60793665f6d1877d8779b1bb7df27b12 | |
| parent | 7fd1e7b5298d1c7a115019d6d6b61d3d7224f04a (diff) | |
...
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | README.rst | 12 | ||||
| -rw-r--r-- | promise.hpp | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index d7971ee..cd8cff8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_install: - eval "${MATRIX_EVAL}" install: - - sudo apt-get install libboost-all-dev + - sudo apt-get install libboost-all-dev script: - make @@ -11,7 +11,7 @@ types do not match the types expected in the subsequent computation. See API === -:: +.. code-block:: cpp typename<typename Func> promise_t(Func callback); @@ -20,7 +20,7 @@ immediately after the object is constructed, so usually the user registers ``pm`` to some external logic which triggers ``pm.resolve()`` or ``pm.reject()`` when the time comes. -:: +.. code-block:: cpp template<typename T> resolve(T result) const; @@ -28,7 +28,7 @@ Resolve the promise with value ``result``. This may trigger the other promises waiting for the current promise recursively. When a promise is triggered, the registered ``on_fulfilled()`` function will be invoked using ``result`` as the argument. -:: +.. code-block:: cpp tempalte<typename T> reject(T reason) const; @@ -36,7 +36,7 @@ Reject the promise with value ``result``. This may reject the other promises waiting for the current promise recursively. When a promise is rejected, the registered ``on_rejected()`` function will be invoked using ``reason`` as the argument. -:: +.. code-block:: cpp template<typename FuncFulfilled> promise_t then(FuncFulfilled on_fulfilled) const; @@ -46,7 +46,7 @@ Create a new promise that waits for the resolution of the current promise. resolved. The rejection will skip the callback and pass on to the promises that follow the created promise. -:: +.. code-block:: cpp template<typename FuncRejected> promise_t fail(FuncRejected on_rejected) const; @@ -56,7 +56,7 @@ Create a new promise that waits for the rejection of the current promise. rejected. The resolution will skip the callback and pass on to the promises that follow the created promise. -:: +.. code-block:: cpp template<typename FuncFulfilled, typename FuncRejected> inline promise_t then(FuncFulfilled on_fulfilled, diff --git a/promise.hpp b/promise.hpp index 1173e87..ae77c43 100644 --- a/promise.hpp +++ b/promise.hpp @@ -29,6 +29,7 @@ #include <functional> #include <type_traits> +#if __cplusplus >= 201703L #ifdef __has_include # if __has_include(<any>) # include <any> @@ -37,6 +38,7 @@ # endif # endif #endif +#endif #ifndef _CPPROMISE_STD_ANY #include <boost/any.hpp> |