Index: athena/activity/activity.cc |
diff --git a/athena/activity/activity.cc b/athena/activity/activity.cc |
index 6a33f02cb33be1877bb43b4e20875f909ae38c8c..a6cb6169a39a9d2987f5964f2224f54283a0deef 100644 |
--- a/athena/activity/activity.cc |
+++ b/athena/activity/activity.cc |
@@ -8,8 +8,10 @@ |
namespace athena { |
-Activity::~Activity() { |
- ActivityManager::Get()->RemoveActivity(this); |
+// static |
+void Activity::CloseActivity(Activity* activity) { |
+ ActivityManager::Get()->RemoveActivity(activity); |
+ delete activity; |
oshima
2014/09/04 16:39:23
Maybe we should just have
ActivityManager::Delete
Mr4D (OOO till 08-26)
2014/09/04 19:10:57
During destruction a pure virtual call occured ins
|
} |
} // namespace athena |