summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-23 14:44:46 -0700
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-08-23 14:44:46 -0700
commit19726783cddb0ac3d34a510c083976e6f9661b49 (patch)
tree5e10d7178d88936475984ce7f5f109631fb2ea3a /indra/llcommon
parent2b634d6c45d61f7132fc124e559347a736c6dfda (diff)
MAINT-3046 make LLNotifications clear out vecs of LLNotificationChannelPtr so singleton cleanup doesn't do things it really ought not do
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/llinitparam.h3
-rwxr-xr-xindra/llcommon/llinstancetracker.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h
index ae836645b9..b3b56321d3 100755
--- a/indra/llcommon/llinitparam.h
+++ b/indra/llcommon/llinitparam.h
@@ -1952,7 +1952,7 @@ namespace LLInitParam
class Mandatory : public TypedParam<T, NAME_VALUE_LOOKUP, false>
{
typedef TypedParam<T, NAME_VALUE_LOOKUP, false> super_t;
- typedef Mandatory<T, NAME_VALUE_LOOKUP> self_t;
+ typedef Mandatory<T, NAME_VALUE_LOOKUP> self_t;
typedef typename super_t::value_t value_t;
typedef typename super_t::default_value_t default_value_t;
@@ -1980,6 +1980,7 @@ namespace LLInitParam
static bool validate(const Param* p)
{
// valid only if provided
+ llassert(p);
return static_cast<const self_t*>(p)->isProvided();
}
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 361182380a..7ef7d101db 100755
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -212,6 +212,7 @@ private:
}
void remove_()
{
+ if (getMap_().find(mInstanceKey) != getMap_().end())
getMap_().erase(mInstanceKey);
}