summaryrefslogtreecommitdiff
path: root/Rx/v2/src/rxcpp/operators/rx-group_by.hpp
diff options
context:
space:
mode:
authorKirk Shoop <kirk.shoop@microsoft.com>2014-08-27 23:56:39 -0700
committerKirk Shoop <kirk.shoop@microsoft.com>2014-08-28 00:10:07 -0700
commit4d90d99aba0d60a60b576433f1a99e1bd68d1236 (patch)
tree8e5a63aa42f9d05a10b7b48349414d3f179f27ae /Rx/v2/src/rxcpp/operators/rx-group_by.hpp
parent2f45ae51b13ae3031e504448f09a42a22665b661 (diff)
downloadRxCpp-4d90d99aba0d60a60b576433f1a99e1bd68d1236.tar.gz
wrong type specified in group_by
Diffstat (limited to 'Rx/v2/src/rxcpp/operators/rx-group_by.hpp')
-rw-r--r--Rx/v2/src/rxcpp/operators/rx-group_by.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Rx/v2/src/rxcpp/operators/rx-group_by.hpp b/Rx/v2/src/rxcpp/operators/rx-group_by.hpp
index 726d2da..dcba7ed 100644
--- a/Rx/v2/src/rxcpp/operators/rx-group_by.hpp
+++ b/Rx/v2/src/rxcpp/operators/rx-group_by.hpp
@@ -109,6 +109,7 @@ 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;
@@ -133,7 +134,7 @@ struct group_by
if (g == groups.end()) {
auto sub = subject_type();
g = groups.insert(std::make_pair(selectedKey.get(), sub.get_subscriber())).first;
- dest.on_next(make_dynamic_grouped_observable<key_type, T>(group_by_observable(sub, selectedKey.get())));
+ dest.on_next(make_dynamic_grouped_observable<key_type, marble_type>(group_by_observable(sub, selectedKey.get())));
}
auto selectedMarble = on_exception(
[&](){