diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-11-14 16:17:36 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-11-14 16:17:36 -0500 |
| commit | f7e99f0db7f9fb52f8001e536f95ec898740631e (patch) | |
| tree | 4f6048435c619a14dd0108bb835068098776874d /indra/llcommon/llinitparam.h | |
| parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) | |
| parent | 4e776c522cb4ba49a5b833d4b9164ab8c48f4b9b (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llinitparam.h')
| -rw-r--r-- | indra/llcommon/llinitparam.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h index f1f4226c40..7f5b9b4ac2 100644 --- a/indra/llcommon/llinitparam.h +++ b/indra/llcommon/llinitparam.h @@ -2115,6 +2115,9 @@ namespace LLInitParam typedef typename super_t::iterator iterator; typedef typename super_t::const_iterator const_iterator; + using super_t::operator(); + using super_t::operator const container_t&; + explicit Multiple(const char* name = "") : super_t(DERIVED_BLOCK::getBlockDescriptor(), name, container_t(), &validate, RANGE::minCount, RANGE::maxCount) {} |