summaryrefslogtreecommitdiff
path: root/Rx/v2/src/rxcpp/rx-trace.hpp
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2018-08-10 18:01:33 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-10 18:01:33 -0700
commit5073ba27ba0e6d2dfc36d7e9f3a3682af2f1795e (patch)
tree10110cbe185cfb37743a75e941fe149e26171134 /Rx/v2/src/rxcpp/rx-trace.hpp
parent2df0672a0546a6d0ab1b85e35910d5203f5133ad (diff)
parent6131e83b0edc972298baec6083c15b9a0675ae2b (diff)
downloadRxCpp-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/rx-trace.hpp')
-rw-r--r--Rx/v2/src/rxcpp/rx-trace.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Rx/v2/src/rxcpp/rx-trace.hpp b/Rx/v2/src/rxcpp/rx-trace.hpp
index a148953..bf0abaf 100644
--- a/Rx/v2/src/rxcpp/rx-trace.hpp
+++ b/Rx/v2/src/rxcpp/rx-trace.hpp
@@ -93,8 +93,8 @@ struct trace_noop
template<class Subscriber>
inline void on_next_return(const Subscriber&) {}
- template<class Subscriber>
- inline void on_error_enter(const Subscriber&, const std::exception_ptr&) {}
+ template<class Subscriber, class ErrorPtr>
+ inline void on_error_enter(const Subscriber&, const ErrorPtr&) {}
template<class Subscriber>
inline void on_error_return(const Subscriber&) {}