- Timestamp:
- Aug 29, 2015, 5:35:59 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core7/src/libraries/core/object/Destroyable.cc
r10419 r10555 61 61 62 62 /** 63 @brief Deletes the object if no @ref orxonox::S martPtr "smartpointers" point to this object. Otherwise schedules the object to be deleted as soon as possible.64 Always call destroy() instead of using 'delete' directly, otherwise s martpointers won't work.63 @brief Deletes the object if no @ref orxonox::StrongPtr "strong pointers" point to this object. Otherwise schedules the object to be deleted as soon as possible. 64 Always call destroy() instead of using 'delete' directly, otherwise strong pointers won't work. 65 65 */ 66 66 void Destroyable::destroy() … … 81 81 void Destroyable::destroyLater() 82 82 { 83 // register in DestroyLaterManager - this ensures that a s martPtr points to this object and keeps it alive for a while83 // register in DestroyLaterManager - this ensures that a strongPtr points to this object and keeps it alive for a while 84 84 DestroyLaterManager::getInstance().retain(this); 85 85 86 // request destruction -> object will be deleted after all s martPtrs (including the one in DestroyLaterManager) were destroyed.86 // request destruction -> object will be deleted after all strongPtrs (including the one in DestroyLaterManager) were destroyed. 87 87 this->destroy(); 88 88 }
Note: See TracChangeset
for help on using the changeset viewer.