diff options
| author | Richard Linden <none@none> | 2011-10-04 11:32:00 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-04 11:32:00 -0700 |
| commit | cfbb5aad37418af614a491e278083bc95bb820a2 (patch) | |
| tree | 8f3bbb76232533dac2e882b06167e81a211e2b83 /indra | |
| parent | 9f6307277bf02753b55c7819626318f717224cc6 (diff) | |
another potential gcc fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 0f17fb61da..1a131d15a3 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -128,7 +128,7 @@ namespace LLInitParam std::string calcValueName(const T& value) const { value_name_map_t* map = getValueNames(); - for (value_name_map_t::iterator it = map->begin(), end_it = map->end(); + for (typename value_name_map_t::iterator it = map->begin(), end_it = map->end(); it != end_it; ++it) { @@ -1020,16 +1020,16 @@ namespace LLInitParam if(key.empty()) // not parsed via name values, write out value directly { - bool value_written == parser.writeValue(*it, name_stack); + bool value_written = parser.writeValue(*it, name_stack); if (!value_written) { std::string calculated_key = typed_param.calcValueName(typed_param.getValue()); if (!parser.writeValue(calculated_key, name_stack)) - { - break; + { + break; + } } } - } else { if(!parser.writeValue(key, name_stack)) |