diff options
Diffstat (limited to 'Rx/v2/src/rxcpp/rx-test.hpp')
| -rw-r--r-- | Rx/v2/src/rxcpp/rx-test.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Rx/v2/src/rxcpp/rx-test.hpp b/Rx/v2/src/rxcpp/rx-test.hpp index cf4841b..542c55b 100644 --- a/Rx/v2/src/rxcpp/rx-test.hpp +++ b/Rx/v2/src/rxcpp/rx-test.hpp @@ -42,7 +42,7 @@ struct test_source static_assert(is_subscriber<Subscriber>::value, "on_subscribe must be passed a subscriber."); - ts->on_subscribe(make_subscriber<T>(o, make_observer_dynamic<T>(o.get_observer()))); + ts->on_subscribe(o.as_dynamic()); } }; @@ -111,8 +111,8 @@ namespace rxt=test; // template<class T, class OperatorFactory> auto operator >> (const rxcpp::test::testable_observable<T>& source, OperatorFactory&& of) - -> decltype(rxcpp::detail::select_chain<T, rxcpp::test::testable_observable<T>, OperatorFactory>::type::chain(source, std::forward<OperatorFactory>(of))) { - return rxcpp::detail::select_chain<T, rxcpp::test::testable_observable<T>, OperatorFactory>::type::chain(source, std::forward<OperatorFactory>(of)); + -> decltype(source.op(std::forward<OperatorFactory>(of))) { + return source.op(std::forward<OperatorFactory>(of)); } // @@ -121,8 +121,8 @@ auto operator >> (const rxcpp::test::testable_observable<T>& source, OperatorFac // template<class T, class OperatorFactory> auto operator | (const rxcpp::test::testable_observable<T>& source, OperatorFactory&& of) - -> decltype(rxcpp::detail::select_chain<T, rxcpp::test::testable_observable<T>, OperatorFactory>::type::chain(source, std::forward<OperatorFactory>(of))) { - return rxcpp::detail::select_chain<T, rxcpp::test::testable_observable<T>, OperatorFactory>::type::chain(source, std::forward<OperatorFactory>(of)); + -> decltype(source.op(std::forward<OperatorFactory>(of))) { + return source.op(std::forward<OperatorFactory>(of)); } #include "schedulers/rx-test.hpp" |