diff options
| author | Igor Murashkin <iam@google.com> | 2018-08-10 18:01:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-10 18:01:33 -0700 |
| commit | 5073ba27ba0e6d2dfc36d7e9f3a3682af2f1795e (patch) | |
| tree | 10110cbe185cfb37743a75e941fe149e26171134 /Rx/v2/src/rxcpp/operators/rx-timeout.hpp | |
| parent | 2df0672a0546a6d0ab1b85e35910d5203f5133ad (diff) | |
| parent | 6131e83b0edc972298baec6083c15b9a0675ae2b (diff) | |
| download | RxCpp-5073ba27ba0e6d2dfc36d7e9f3a3682af2f1795e.tar.gz | |
Rx: Add support for compiling code without exceptions (-fno-exceptions) am: da5396314d am: 58001e8487
am: 6131e83b0e
Change-Id: Ied131619313f3bb7d57ce48d5d415a30864b3ba6
Diffstat (limited to 'Rx/v2/src/rxcpp/operators/rx-timeout.hpp')
| -rw-r--r-- | Rx/v2/src/rxcpp/operators/rx-timeout.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Rx/v2/src/rxcpp/operators/rx-timeout.hpp b/Rx/v2/src/rxcpp/operators/rx-timeout.hpp index 841df12..d100fa4 100644 --- a/Rx/v2/src/rxcpp/operators/rx-timeout.hpp +++ b/Rx/v2/src/rxcpp/operators/rx-timeout.hpp @@ -147,7 +147,7 @@ struct timeout if(id != state->index) return; - state->dest.on_error(std::make_exception_ptr(rxcpp::timeout_error("timeout has occurred"))); + state->dest.on_error(rxu::make_error_ptr(rxcpp::timeout_error("timeout has occurred"))); }; auto selectedProduce = on_exception( @@ -178,7 +178,7 @@ struct timeout localState->worker.schedule(selectedWork.get()); } - void on_error(std::exception_ptr e) const { + void on_error(rxu::error_ptr e) const { auto localState = state; auto work = [e, localState](const rxsc::schedulable&) { localState->dest.on_error(e); |