diff options
| -rw-r--r-- | indra/llcommon/llinstancetracker.h | 16 | ||||
| -rw-r--r-- | indra/llcommon/lua_function.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h index 22e5d9c7a7..921f743ada 100644 --- a/indra/llcommon/llinstancetracker.h +++ b/indra/llcommon/llinstancetracker.h @@ -276,19 +276,19 @@ public: virtual const KEY& getKey() const { return mInstanceKey; } /// for use ONLY for an object we're sure resides on the heap! - static bool destroy(const KEY& key) + static bool destruct(const KEY& key) { - return destroy(getInstance(key)); + return destruct(getInstance(key)); } /// for use ONLY for an object we're sure resides on the heap! - static bool destroy(const weak_t& ptr) + static bool destruct(const weak_t& ptr) { - return destroy(ptr.lock()); + return destruct(ptr.lock()); } /// for use ONLY for an object we're sure resides on the heap! - static bool destroy(const ptr_t& ptr) + static bool destruct(const ptr_t& ptr) { if (! ptr) { @@ -509,13 +509,13 @@ public: using key_snapshot_of = instance_snapshot_of<SUBCLASS>; /// for use ONLY for an object we're sure resides on the heap! - static bool destroy(const weak_t& ptr) + static bool destruct(const weak_t& ptr) { - return destroy(ptr.lock()); + return destruct(ptr.lock()); } /// for use ONLY for an object we're sure resides on the heap! - static bool destroy(const ptr_t& ptr) + static bool destruct(const ptr_t& ptr) { if (! ptr) { diff --git a/indra/llcommon/lua_function.cpp b/indra/llcommon/lua_function.cpp index c86faf1ae2..332a08a444 100644 --- a/indra/llcommon/lua_function.cpp +++ b/indra/llcommon/lua_function.cpp @@ -459,7 +459,7 @@ LuaState::~LuaState() { // Did somebody call obtainListener() on this LuaState? // That is, is there a LuaListener key in its registry? - LuaListener::destroy(getListener()); + LuaListener::destruct(getListener()); lua_close(mState); |