diff options
Diffstat (limited to 'Rx/v2/src/rxcpp/operators/rx-retry.hpp')
| -rw-r--r-- | Rx/v2/src/rxcpp/operators/rx-retry.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Rx/v2/src/rxcpp/operators/rx-retry.hpp b/Rx/v2/src/rxcpp/operators/rx-retry.hpp index 112edef..acfa20b 100644 --- a/Rx/v2/src/rxcpp/operators/rx-retry.hpp +++ b/Rx/v2/src/rxcpp/operators/rx-retry.hpp @@ -15,8 +15,8 @@ namespace rxcpp { template<class T, class Observable, class Count> struct retry : public operator_base<T> { - typedef typename std::decay<Observable>::type source_type; - typedef typename std::decay<Count>::type count_type; + typedef rxu::decay_t<Observable> source_type; + typedef rxu::decay_t<Count> count_type; struct values { values(source_type s, count_type t) : source(std::move(s)) @@ -90,16 +90,16 @@ namespace rxcpp { template<class T> class retry_factory { - typedef typename std::decay<T>::type count_type; + typedef rxu::decay_t<T> count_type; count_type count; public: retry_factory(count_type t) : count(std::move(t)) {} template<class Observable> auto operator()(Observable&& source) - -> observable<typename std::decay<Observable>::type::value_type, retry<typename std::decay<Observable>::type::value_type, Observable, count_type>> { - return observable<typename std::decay<Observable>::type::value_type, retry<typename std::decay<Observable>::type::value_type, Observable, count_type>>( - retry<typename std::decay<Observable>::type::value_type, Observable, count_type>(std::forward<Observable>(source), count)); + -> observable<rxu::value_type_t<rxu::decay_t<Observable>>, retry<rxu::value_type_t<rxu::decay_t<Observable>>, Observable, count_type>> { + return observable<rxu::value_type_t<rxu::decay_t<Observable>>, retry<rxu::value_type_t<rxu::decay_t<Observable>>, Observable, count_type>>( + retry<rxu::value_type_t<rxu::decay_t<Observable>>, Observable, count_type>(std::forward<Observable>(source), count)); } }; |