From cfbb5aad37418af614a491e278083bc95bb820a2 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 4 Oct 2011 11:32:00 -0700
Subject: [PATCH] another potential gcc fix
---
indra/llxuixml/llinitparam.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 0f17fb61da1..1a131d15a3f 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))
--
GitLab