From b703a612d7ca96e9c79f40a33208757bba6e9d7e Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 23 Apr 2014 05:41:55 -0700
Subject: [PATCH] Put back assert so tests checking for fail will find fail
where expected
---
indra/llcommon/llinstancetracker.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index b0392900371..fc51fbd2f99 100755
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -38,6 +38,8 @@
#include <boost/iterator/transform_iterator.hpp>
#include <boost/iterator/indirect_iterator.hpp>
+#include "llerror.h"
+
/**
* Base class manages "class-static" data that must actually have singleton
* semantics: one instance per process, rather than one instance per module as
@@ -305,6 +307,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_always(getStatic().sIterationNestDepth == 0);
getSet_().erase(static_cast<T*>(this));
}
--
GitLab