diff options
Diffstat (limited to 'Rx/v2/src/rxcpp/operators/rx-window_time.hpp')
| -rw-r--r-- | Rx/v2/src/rxcpp/operators/rx-window_time.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Rx/v2/src/rxcpp/operators/rx-window_time.hpp b/Rx/v2/src/rxcpp/operators/rx-window_time.hpp index aca16de..734520e 100644 --- a/Rx/v2/src/rxcpp/operators/rx-window_time.hpp +++ b/Rx/v2/src/rxcpp/operators/rx-window_time.hpp @@ -16,10 +16,10 @@ namespace detail { template<class T, class Duration, class Coordination> struct window_with_time { - typedef typename std::decay<T>::type source_value_type; - typedef typename std::decay<Coordination>::type coordination_type; + typedef rxu::decay_t<T> source_value_type; + typedef rxu::decay_t<Coordination> coordination_type; typedef typename coordination_type::coordinator_type coordinator_type; - typedef typename std::decay<Duration>::type duration_type; + typedef rxu::decay_t<Duration> duration_type; struct window_with_time_values { @@ -46,7 +46,7 @@ struct window_with_time typedef window_with_time_observer<Subscriber> this_type; typedef observer_base<observable<T>> base_type; typedef typename base_type::value_type value_type; - typedef typename std::decay<Subscriber>::type dest_type; + typedef rxu::decay_t<Subscriber> dest_type; typedef observer<T, this_type> observer_type; struct window_with_time_subscriber_values : public window_with_time_values @@ -128,8 +128,8 @@ struct window_with_time template<class Duration, class Coordination> class window_with_time_factory { - typedef typename std::decay<Duration>::type duration_type; - typedef typename std::decay<Coordination>::type coordination_type; + typedef rxu::decay_t<Duration> duration_type; + typedef rxu::decay_t<Coordination> coordination_type; duration_type period; duration_type skip; @@ -138,8 +138,8 @@ public: window_with_time_factory(duration_type p, duration_type s, coordination_type c) : period(p), skip(s), coordination(c) {} template<class Observable> auto operator()(Observable&& source) - -> decltype(source.template lift<observable<typename std::decay<Observable>::type::value_type>>(window_with_time<typename std::decay<Observable>::type::value_type, Duration, Coordination>(period, skip, coordination))) { - return source.template lift<observable<typename std::decay<Observable>::type::value_type>>(window_with_time<typename std::decay<Observable>::type::value_type, Duration, Coordination>(period, skip, coordination)); + -> decltype(source.template lift<observable<rxu::value_type_t<rxu::decay_t<Observable>>>>(window_with_time<rxu::value_type_t<rxu::decay_t<Observable>>, Duration, Coordination>(period, skip, coordination))) { + return source.template lift<observable<rxu::value_type_t<rxu::decay_t<Observable>>>>(window_with_time<rxu::value_type_t<rxu::decay_t<Observable>>, Duration, Coordination>(period, skip, coordination)); } }; |