From 286342f705fa246c4c417a874be6b03cd6fe38d3 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 7 Sep 2011 18:03:25 -0400
Subject: [PATCH] STORM-1541: Change llassert() to llassert_always(): unit
tests expect. Now that we have unit tests that require assertion failure if
you try to delete an LLInstanceTracker subclass instance with an iterator
loose, having llassert() "sometimes" compile away (whimsically, depending on
platform as well as build type!) makes those tests fail. Use
llassert_always() instead.
---
indra/llcommon/llinstancetracker.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 936bef850a3..5a3990a8df5 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -197,7 +197,7 @@ class LLInstanceTracker : public LLInstanceTrackerBase
virtual ~LLInstanceTracker()
{
// it's unsafe to delete instances of this type while all instances are being iterated over.
- llassert(getStatic().sIterationNestDepth == 0);
+ llassert_always(getStatic().sIterationNestDepth == 0);
remove_();
}
virtual void setKey(KEY key) { remove_(); add_(key); }
@@ -287,7 +287,7 @@ class LLInstanceTracker<T, T*> : public LLInstanceTrackerBase
virtual ~LLInstanceTracker()
{
// it's unsafe to delete instances of this type while all instances are being iterated over.
- llassert(getStatic().sIterationNestDepth == 0);
+ llassert_always(getStatic().sIterationNestDepth == 0);
getSet_().erase(static_cast<T*>(this));
}
--
GitLab