diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 15:18:08 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 15:18:08 -0800 |
commit | 9e0920df2c8ada63397ea6e439b02ee5b40d1bf6 (patch) | |
tree | 26f6af13d1dcd9d02c48bd7897b3604481f3734c /indra/llcommon/lldictionary.h | |
parent | b96e52b72ab598a57d981c850b5f14b1ac406325 (diff) | |
parent | 4cf79224d099c4fc8bdfd9617e95a776d5a028d4 (diff) |
Merge from v2 trunk.
Diffstat (limited to 'indra/llcommon/lldictionary.h')
-rw-r--r-- | indra/llcommon/lldictionary.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h index 95178b41e7..4a2bfb9f3f 100644 --- a/indra/llcommon/lldictionary.h +++ b/indra/llcommon/lldictionary.h @@ -76,11 +76,16 @@ public: return dictionary_iter->first; } } - llassert(false); - return Index(-1); + return notFound(); } protected: + virtual Index notFound() const + { + // default is to assert + llassert(false); + return Index(-1); + } void addEntry(Index index, Entry *entry) { if (lookup(index)) |