Changeset 11071 for code/trunk/src/libraries/core/object/Destroyable.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/core/object/Destroyable.cc
r11019 r11071 54 54 Destroyable::~Destroyable() 55 55 { 56 if (!this->requestedDestruction_ && !IdentifierManager::getInstance().isCreatingHierarchy())56 if (!this->requestedDestruction_ && IdentifierManager::exists() && !IdentifierManager::getInstance().isCreatingHierarchy()) 57 57 orxout(internal_warning) << "Deleted destroyable object without destroy()" << endl; 58 58 … … 70 70 void Destroyable::destroy() 71 71 { 72 assert(this); // Just in case someone tries to delete a NULL pointer72 assert(this); // Just in case someone tries to delete a nullptr 73 73 this->requestedDestruction_ = true; 74 74 if (this->referenceCount_ == 0)
Note: See TracChangeset
for help on using the changeset viewer.