diff options
author | Andrei Lebedev <lebdron@gmail.com> | 2018-05-11 02:08:37 +0300 |
---|---|---|
committer | Kirk Shoop <kirk.shoop@gmail.com> | 2018-05-11 08:59:21 -0700 |
commit | abaf9881831d3adf52625443611aa1c3ea5e5dbf (patch) | |
tree | aabeafc52e8bec353e69900b5b471ddc76b33f2c | |
parent | 28db2ee9fdac1aed6fa8e360ea5ddf12856d0f6b (diff) | |
download | RxCpp-abaf9881831d3adf52625443611aa1c3ea5e5dbf.tar.gz |
Fix exit_recursed_scope_type dtor cleaning requestor early
-rw-r--r-- | Rx/v2/src/rxcpp/rx-scheduler.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Rx/v2/src/rxcpp/rx-scheduler.hpp b/Rx/v2/src/rxcpp/rx-scheduler.hpp index 0f239be..8bdb4dd 100644 --- a/Rx/v2/src/rxcpp/rx-scheduler.hpp +++ b/Rx/v2/src/rxcpp/rx-scheduler.hpp @@ -480,9 +480,9 @@ class schedulable : public schedulable_base // no change in recursion scope return *this; } - exit_recursed_scope_type reset(const recurse& r) const { + std::shared_ptr<exit_recursed_scope_type> reset(const recurse& r) const { requestor = std::addressof(r.get_recursed()); - return exit_recursed_scope_type(this); + return std::make_shared<exit_recursed_scope_type>(this); } bool is_recursed() const { return !!requestor; |