diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-09-07 18:03:25 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-09-07 18:03:25 -0400 |
| commit | 286342f705fa246c4c417a874be6b03cd6fe38d3 (patch) | |
| tree | 2d0c030de9761fd0cba997b858e1bf62fcce0720 | |
| parent | b4a1d339fc9bc69c1045a622bf59df815fdc77ad (diff) | |
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.
| -rw-r--r-- | indra/llcommon/llinstancetracker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h index 936bef850a..5a3990a8df 100644 --- a/indra/llcommon/llinstancetracker.h +++ b/indra/llcommon/llinstancetracker.h @@ -197,7 +197,7 @@ protected: 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 @@ protected: 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)); } |