diff options
| author | Kirk Shoop <kirk.shoop@microsoft.com> | 2014-09-01 22:38:02 -0700 |
|---|---|---|
| committer | Kirk Shoop <kirk.shoop@microsoft.com> | 2014-09-01 22:38:02 -0700 |
| commit | ff573fcd26752d14b5e00b7a4e42f147ae7bc92e (patch) | |
| tree | c26204dc5014c0323c215055a94fc78e2a230d75 /Rx/v2/src/rxcpp/operators/rx-group_by.hpp | |
| parent | 30a87eb8980b16b8212832866a1ec3d447cefc4c (diff) | |
| download | RxCpp-ff573fcd26752d14b5e00b7a4e42f147ae7bc92e.tar.gz | |
allow conversions to dynamic
Diffstat (limited to 'Rx/v2/src/rxcpp/operators/rx-group_by.hpp')
| -rw-r--r-- | Rx/v2/src/rxcpp/operators/rx-group_by.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Rx/v2/src/rxcpp/operators/rx-group_by.hpp b/Rx/v2/src/rxcpp/operators/rx-group_by.hpp index dcba7ed..5ef609b 100644 --- a/Rx/v2/src/rxcpp/operators/rx-group_by.hpp +++ b/Rx/v2/src/rxcpp/operators/rx-group_by.hpp @@ -59,6 +59,7 @@ struct group_by typedef group_by_traits<T, Observable, KeySelector, MarbleSelector, BinaryPredicate> traits_type; typedef typename traits_type::key_selector_type key_selector_type; typedef typename traits_type::marble_selector_type marble_selector_type; + typedef typename traits_type::marble_type marble_type; typedef typename traits_type::predicate_type predicate_type; typedef typename traits_type::subject_type subject_type; typedef typename traits_type::key_type key_type; @@ -83,7 +84,7 @@ struct group_by { } - struct group_by_observable + struct group_by_observable : public rxs::source_base<marble_type> { subject_type subject; key_type key; @@ -109,7 +110,6 @@ struct group_by { typedef group_by_observer<Subscriber> this_type; typedef typename traits_type::grouped_observable_type value_type; - typedef typename traits_type::marble_type marble_type; typedef typename std::decay<Subscriber>::type dest_type; typedef observer<T, this_type> observer_type; dest_type dest; |