diff options
| author | Martin Kodovský <martin.kodovsky@gmail.com> | 2017-12-09 22:39:51 +0100 |
|---|---|---|
| committer | Kirk Shoop <kirk.shoop@microsoft.com> | 2017-12-09 13:39:51 -0800 |
| commit | 815e92158e3e0647b96d1331de1ecc5badcde3f8 (patch) | |
| tree | a25f7e575d1d00c6433ab67388b5a0a3ed0b200c /Rx/v2/src/rxcpp/rx-observable.hpp | |
| parent | 1b2e0589f19cb34d8cd58803677701dcf2161876 (diff) | |
| download | RxCpp-815e92158e3e0647b96d1331de1ecc5badcde3f8.tar.gz | |
Add rx-merge-delay-error operator (#417)
* Add rx-merge-delay-error operator
* fix of msvc2013 compilation
* fix #417 comments
Added RXCPP_NOEXCEPT macro; Added doxygen scenarios for composite_exception and merge_delay_error; Fixed composing exception in merge_delay_error operator; Modified test for merge_delay_operator
* #417 fix composite_exception example
* #417 fix merge_delay_error doxygen example
* fix: samples add among others in project doxygen CMakeLists.txt
* fix: composite_exception.cpp example
Diffstat (limited to 'Rx/v2/src/rxcpp/rx-observable.hpp')
| -rw-r--r-- | Rx/v2/src/rxcpp/rx-observable.hpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Rx/v2/src/rxcpp/rx-observable.hpp b/Rx/v2/src/rxcpp/rx-observable.hpp index ef96d36..3a31240 100644 --- a/Rx/v2/src/rxcpp/rx-observable.hpp +++ b/Rx/v2/src/rxcpp/rx-observable.hpp @@ -1023,6 +1023,17 @@ public: return observable_member(merge_tag{}, *this, std::forward<AN>(an)...); } + /*! @copydoc rx-merge_delay_error.hpp + */ + template<class... AN> + auto merge_delay_error(AN... an) const + /// \cond SHOW_SERVICE_MEMBERS + -> decltype(observable_member(merge_delay_error_tag{}, *(this_type*)nullptr, std::forward<AN>(an)...)) + /// \endcond + { + return observable_member(merge_delay_error_tag{}, *this, std::forward<AN>(an)...); + } + /*! @copydoc rx-amb.hpp */ template<class... AN> |