summaryrefslogtreecommitdiff
path: root/src/common/timer.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-05-25 13:49:50 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-05-25 13:49:50 -0700
commit1d0e18a186f67844ccd873eabb56ebdaa3f47f11 (patch)
tree94199c6dbcb6b4a86584c303f6e1e72073873f01 /src/common/timer.cpp
parent87218e07b2bc89593eae1cb4abe859cd1a7eaa0f (diff)
downloadtmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.tar.gz
tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.tar.bz2
tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.tar.xz
tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.zip
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 ...
Diffstat (limited to 'src/common/timer.cpp')
-rw-r--r--src/common/timer.cpp6
1 files changed, 3 insertions, 3 deletions
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);