diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-16 07:05:01 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-16 07:05:01 +0200 |
| commit | bea930071f470fb9a8d61fdd5dd8cc0deec9f95b (patch) | |
| tree | 0c99e7eafdfb10463754c5645e3b5647cf7f36fa /indra/llcommon/llinitparam.h | |
| parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) | |
| parent | 5d6371f568f3dcd8eb7c88a9e5d65224522528d4 (diff) | |
Merge branch 'contribute' into DRTVWR-577-maint-S
Diffstat (limited to 'indra/llcommon/llinitparam.h')
| -rw-r--r-- | indra/llcommon/llinitparam.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h index 7f5b9b4ac2..9edc7e40f3 100644 --- a/indra/llcommon/llinitparam.h +++ b/indra/llcommon/llinitparam.h @@ -325,13 +325,11 @@ namespace LLInitParam std::string calcValueName(const value_t& value) const { value_name_map_t* map = getValueNames(); - for (typename value_name_map_t::iterator it = map->begin(), end_it = map->end(); - it != end_it; - ++it) + for (typename value_name_map_t::value_type& map_pair : *map) { - if (ParamCompare<T>::equals(it->second, value)) + if (ParamCompare<T>::equals(map_pair.second, value)) { - return it->first; + return map_pair.first; } } @@ -376,11 +374,9 @@ namespace LLInitParam static std::vector<std::string> sValues; value_name_map_t* map = getValueNames(); - for (typename value_name_map_t::iterator it = map->begin(), end_it = map->end(); - it != end_it; - ++it) + for (typename value_name_map_t::value_type& map_pair : *map) { - sValues.push_back(it->first); + sValues.push_back(map_pair.first); } return &sValues; } |