diff options
| author | Kirk Shoop <kirk.shoop@microsoft.com> | 2017-06-15 07:06:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 07:06:24 -0700 |
| commit | 1d75538fa780e530bcd724433257c65b3fe36b29 (patch) | |
| tree | 30f95fdad2594860f94dc26cb6ed33e09c30258d /Rx | |
| parent | a1730f951348b602d5dee0643daafad6a913f7c7 (diff) | |
| download | RxCpp-1d75538fa780e530bcd724433257c65b3fe36b29.tar.gz | |
disambiguate onerror from onnext (#383)
Diffstat (limited to 'Rx')
| -rw-r--r-- | Rx/v2/src/rxcpp/rx-observer.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Rx/v2/src/rxcpp/rx-observer.hpp b/Rx/v2/src/rxcpp/rx-observer.hpp index 39f427e..62aed3c 100644 --- a/Rx/v2/src/rxcpp/rx-observer.hpp +++ b/Rx/v2/src/rxcpp/rx-observer.hpp @@ -495,6 +495,7 @@ auto make_observer(OnNext on) template<class T, class DefaultOnError = detail::OnErrorEmpty, class OnError> auto make_observer(OnError oe) -> typename std::enable_if< + !detail::is_on_next_of<T, OnError>::value && detail::is_on_error<OnError>::value, observer<T, detail::stateless_observer_tag, detail::OnNextEmpty<T>, OnError>>::type { return observer<T, detail::stateless_observer_tag, detail::OnNextEmpty<T>, OnError>( |