diff options
Diffstat (limited to 'Rx/v2/src/rxcpp/operators')
| -rw-r--r-- | Rx/v2/src/rxcpp/operators/rx-connect_forever.hpp (renamed from Rx/v2/src/rxcpp/operators/rx-connect_now.hpp) | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Rx/v2/src/rxcpp/operators/rx-connect_now.hpp b/Rx/v2/src/rxcpp/operators/rx-connect_forever.hpp index ff998f0..35e000f 100644 --- a/Rx/v2/src/rxcpp/operators/rx-connect_now.hpp +++ b/Rx/v2/src/rxcpp/operators/rx-connect_forever.hpp @@ -2,8 +2,8 @@ #pragma once -#if !defined(RXCPP_OPERATORS_RX_CONNECT_NOW_HPP) -#define RXCPP_OPERATORS_RX_CONNECT_NOW_HPP +#if !defined(RXCPP_OPERATORS_RX_CONNECT_FOREVER_HPP) +#define RXCPP_OPERATORS_RX_CONNECT_FOREVER_HPP #include "../rx-includes.hpp" @@ -14,13 +14,13 @@ namespace operators { namespace detail { template<class T, class ConnectableObservable> -struct connect_now : public operator_base<T> +struct connect_forever : public operator_base<T> { typedef typename std::decay<ConnectableObservable>::type source_type; source_type source; - explicit connect_now(source_type o) + explicit connect_forever(source_type o) : source(std::move(o)) { source.connect(); @@ -32,23 +32,23 @@ struct connect_now : public operator_base<T> } }; -class connect_now_factory +class connect_forever_factory { public: - connect_now_factory() {} + connect_forever_factory() {} template<class Observable> auto operator()(Observable&& source) - -> observable<typename std::decay<Observable>::type::value_type, connect_now<typename std::decay<Observable>::type::value_type, Observable>> { - return observable<typename std::decay<Observable>::type::value_type, connect_now<typename std::decay<Observable>::type::value_type, Observable>>( - connect_now<typename std::decay<Observable>::type::value_type, Observable>(std::forward<Observable>(source))); + -> observable<typename std::decay<Observable>::type::value_type, connect_forever<typename std::decay<Observable>::type::value_type, Observable>> { + return observable<typename std::decay<Observable>::type::value_type, connect_forever<typename std::decay<Observable>::type::value_type, Observable>>( + connect_forever<typename std::decay<Observable>::type::value_type, Observable>(std::forward<Observable>(source))); } }; } -inline auto connect_now() - -> detail::connect_now_factory { - return detail::connect_now_factory(); +inline auto connect_forever() + -> detail::connect_forever_factory { + return detail::connect_forever_factory(); } } |