summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Markov <amarkovnsk@gmail.com>2015-12-09 12:17:53 +0100
committerKirk Shoop <kirk.shoop@microsoft.com>2015-12-22 21:41:27 -0800
commit063bec08bc305dbf97c3cabfbbb1ce846d2968ce (patch)
tree92cb0c78062df5597f9ed2cca646d17ec137035f
parent0825de4de8c34daaa4d7b4d7a2c4c883e59312b0 (diff)
downloadRxCpp-063bec08bc305dbf97c3cabfbbb1ce846d2968ce.tar.gz
* fixed select_many crash
-rw-r--r--Ix/CPP/src/cpplinq/linq_selectmany.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Ix/CPP/src/cpplinq/linq_selectmany.hpp b/Ix/CPP/src/cpplinq/linq_selectmany.hpp
index fea9614..85f0d42 100644
--- a/Ix/CPP/src/cpplinq/linq_selectmany.hpp
+++ b/Ix/CPP/src/cpplinq/linq_selectmany.hpp
@@ -112,7 +112,7 @@ namespace cpplinq
{
if (!cur1.empty())
{
- store = collection_store_ptr(new collection_store(fn(cur1.get())));
+ store = std::make_shared<collection_store>(fn(cur1.get()));
cur2 = from(store->get()).get_cursor();
}
}
@@ -142,8 +142,8 @@ namespace cpplinq
if (cur1.empty())
break;
- auto container2 = fn(cur1.get());
- cur2 = from(container2).get_cursor();
+ store = std::make_shared<collection_store>(fn(cur1.get()));
+ cur2 = from(store->get()).get_cursor();
}
}
};