From 6c0e9432d027dfb363baf4eaff79a835e3e75b37 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 8 Oct 2010 12:18:16 -0700
Subject: [PATCH] potential fix for linux build
---
indra/llui/llsdparam.cpp | 2 +-
indra/llxuixml/llinitparam.cpp | 4 ++--
indra/llxuixml/llinitparam.h | 2 +-
indra/llxuixml/llxuiparser.cpp | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/llui/llsdparam.cpp b/indra/llui/llsdparam.cpp
index fae20a473e1..9ad13054cb5 100644
--- a/indra/llui/llsdparam.cpp
+++ b/indra/llui/llsdparam.cpp
@@ -45,7 +45,7 @@ LLParamSDParser::LLParamSDParser()
if (sReadFuncs.empty())
{
- registerParserFuncs<LLInitParam::NoValue>(readNoValue, &LLParamSDParser::writeNoValue);
+ registerParserFuncs<LLInitParam::NoParamValue>(readNoValue, &LLParamSDParser::writeNoValue);
registerParserFuncs<S32>(readS32, &LLParamSDParser::writeTypedValue<S32>);
registerParserFuncs<U32>(readU32, &LLParamSDParser::writeU32Param);
registerParserFuncs<F32>(readF32, &LLParamSDParser::writeTypedValue<F32>);
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp
index bf2de9360a5..fcdbaa43097 100644
--- a/indra/llxuixml/llinitparam.cpp
+++ b/indra/llxuixml/llinitparam.cpp
@@ -313,10 +313,10 @@ namespace LLInitParam
}
// if no match, and no names left on stack, this is just an existence assertion of this block
- // verify by calling readValue with NoValue type, an inherently unparseable type
+ // verify by calling readValue with NoParamValue type, an inherently unparseable type
if (!names_left)
{
- NoValue no_value;
+ NoParamValue no_value;
return p.readValue(no_value);
}
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 66ef8e65cd5..1f9045754a9 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -279,7 +279,7 @@ namespace LLInitParam
};
// used to indicate no matching value to a given name when parsing
- struct NoValue{};
+ struct NoParamValue{};
class BaseBlock;
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp
index 723a20f3825..b321eaf7a68 100644
--- a/indra/llxuixml/llxuiparser.cpp
+++ b/indra/llxuixml/llxuiparser.cpp
@@ -382,7 +382,7 @@ LLXUIParser::LLXUIParser()
{
if (sXUIReadFuncs.empty())
{
- registerParserFuncs<LLInitParam::NoValue>(readNoValue, writeNoValue);
+ registerParserFuncs<LLInitParam::NoParamValue>(readNoValue, writeNoValue);
registerParserFuncs<bool>(readBoolValue, writeBoolValue);
registerParserFuncs<std::string>(readStringValue, writeStringValue);
registerParserFuncs<U8>(readU8Value, writeU8Value);
@@ -1078,7 +1078,7 @@ LLSimpleXUIParser::LLSimpleXUIParser(LLSimpleXUIParser::element_start_callback_t
{
if (sSimpleXUIReadFuncs.empty())
{
- registerParserFuncs<LLInitParam::NoValue>(readNoValue);
+ registerParserFuncs<LLInitParam::NoParamValue>(readNoValue);
registerParserFuncs<bool>(readBoolValue);
registerParserFuncs<std::string>(readStringValue);
registerParserFuncs<U8>(readU8Value);
--
GitLab