From abaf9881831d3adf52625443611aa1c3ea5e5dbf Mon Sep 17 00:00:00 2001 From: Andrei Lebedev Date: Fri, 11 May 2018 02:08:37 +0300 Subject: Fix exit_recursed_scope_type dtor cleaning requestor early --- Rx/v2/src/rxcpp/rx-scheduler.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rx/v2/src/rxcpp') 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 reset(const recurse& r) const { requestor = std::addressof(r.get_recursed()); - return exit_recursed_scope_type(this); + return std::make_shared(this); } bool is_recursed() const { return !!requestor; -- cgit v1.2.3