diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-22 06:46:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-22 06:46:26 -0400 |
| commit | 23f05269535d7c36806913244de419d7ab0b9f46 (patch) | |
| tree | 34c996678f96d1b0ad69cc64dbe39454dc516d69 /indra/llcommon | |
| parent | 2a206cff7982db662c58436f870c6383b396d7df (diff) | |
| parent | f5197b6158bf1b9350fab2dd7877f6c0a4c2f778 (diff) | |
merge changes for STORM-1661
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llinstancetracker.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h index 5a3990a8df..34d841a4e0 100644 --- a/indra/llcommon/llinstancetracker.h +++ b/indra/llcommon/llinstancetracker.h @@ -193,7 +193,12 @@ public: } protected: - LLInstanceTracker(KEY key) { add_(key); } + LLInstanceTracker(KEY key) + { + // make sure static data outlives all instances + getStatic(); + add_(key); + } virtual ~LLInstanceTracker() { // it's unsafe to delete instances of this type while all instances are being iterated over. @@ -281,7 +286,8 @@ public: protected: LLInstanceTracker() { - // it's safe but unpredictable to create instances of this type while all instances are being iterated over. I hate unpredictable. This assert will probably be turned on early in the next development cycle. + // make sure static data outlives all instances + getStatic(); getSet_().insert(static_cast<T*>(this)); } virtual ~LLInstanceTracker() |