diff options
Diffstat (limited to 'Rx/v2/src/rxcpp/operators/rx-pairwise.hpp')
| -rw-r--r-- | Rx/v2/src/rxcpp/operators/rx-pairwise.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Rx/v2/src/rxcpp/operators/rx-pairwise.hpp b/Rx/v2/src/rxcpp/operators/rx-pairwise.hpp index 582aba5..8531e8c 100644 --- a/Rx/v2/src/rxcpp/operators/rx-pairwise.hpp +++ b/Rx/v2/src/rxcpp/operators/rx-pairwise.hpp @@ -16,7 +16,7 @@ namespace detail { template<class T> struct pairwise { - typedef typename std::decay<T>::type source_value_type; + typedef rxu::decay_t<T> source_value_type; typedef std::tuple<source_value_type, source_value_type> value_type; template<class Subscriber> @@ -24,7 +24,7 @@ struct pairwise { typedef pairwise_observer<Subscriber> this_type; typedef std::tuple<source_value_type, source_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; dest_type dest; mutable rxu::detail::maybe<source_value_type> remembered; @@ -67,8 +67,8 @@ class pairwise_factory public: template<class Observable> auto operator()(Observable&& source) - -> decltype(source.template lift<typename pairwise<typename std::decay<Observable>::type::value_type>::value_type>(pairwise<typename std::decay<Observable>::type::value_type>())) { - return source.template lift<typename pairwise<typename std::decay<Observable>::type::value_type>::value_type>(pairwise<typename std::decay<Observable>::type::value_type>()); + -> decltype(source.template lift<rxu::value_type_t<pairwise<rxu::value_type_t<rxu::decay_t<Observable>>>>>(pairwise<rxu::value_type_t<rxu::decay_t<Observable>>>())) { + return source.template lift<rxu::value_type_t<pairwise<rxu::value_type_t<rxu::decay_t<Observable>>>>>(pairwise<rxu::value_type_t<rxu::decay_t<Observable>>>()); } }; |