From 1d0e18a186f67844ccd873eabb56ebdaa3f47f11 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 25 May 2013 13:49:50 -0700 Subject: Switch block_list and subclasses to dumb_ptr Now we're well-defined, since we're actually calling ctors and dtors. Most of this code will not survive long ... --- src/common/timer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common/timer.cpp') diff --git a/src/common/timer.cpp b/src/common/timer.cpp index d2d355b..ec1f6b2 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -75,14 +75,14 @@ void Timer::cancel() td->owner = nullptr; td->func = do_nothing; td->interval = interval_t::zero(); - td.forget(); + td = nullptr; } void Timer::detach() { assert (this == td->owner); td->owner = nullptr; - td.forget(); + td = nullptr; } static @@ -116,7 +116,7 @@ Timer::Timer(tick_t tick, timer_func func, interval_t interval) Timer::Timer(Timer&& t) : td(t.td) { - t.td.forget(); + t.td = nullptr; if (td) { assert (td->owner == &t); -- cgit v1.2.3-70-g09d2