livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

potential fix for linux build

meow-7.2.2
Richard Linden 2010-10-08 12:18:16 -07:00
parent 1ae67f66d1
commit 6c0e9432d0
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llsdparam.cpp
View File

@ -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>);

4
indra/llxuixml/llinitparam.cpp
View File

@ -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);
}

2
indra/llxuixml/llinitparam.h
View File

@ -279,7 +279,7 @@ namespace LLInitParam
};
// used to indicate no matching value to a given name when parsing
struct NoValue{};
struct NoParamValue{};
class BaseBlock;

4
indra/llxuixml/llxuiparser.cpp
View File

@ -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);