From bb9d181615d35b6074eb397a1bf4e247db943a64 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Thu, 15 Mar 2018 20:45:18 -0500 Subject: [PATCH] tinyxml core class uses a 'value' variable. method io and tempvars altered to work around the 'conflict' --- Engine/source/persistence/taml/fsTinyXml.cpp | 6 +++--- Engine/source/persistence/taml/fsTinyXml.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Engine/source/persistence/taml/fsTinyXml.cpp b/Engine/source/persistence/taml/fsTinyXml.cpp index 441169742..8afe7f16c 100644 --- a/Engine/source/persistence/taml/fsTinyXml.cpp +++ b/Engine/source/persistence/taml/fsTinyXml.cpp @@ -199,16 +199,16 @@ void fsTiXmlAttribute::Print( FileStream& stream, int depth, TIXML_STRING* str ) { TIXML_STRING n, v; - TiXmlString value = TiXmlString(Value()); + TiXmlString val = TiXmlString(Value()); EncodeString( NameTStr(), &n ); - EncodeString( value, &v ); + EncodeString( val, &v ); for ( int i=0; i< depth; i++ ) { stream.writeText( " " ); } - if (value.find ('\"') == TIXML_STRING::npos) { + if (val.find ('\"') == TIXML_STRING::npos) { const char* pValue = v.c_str(); char buffer[4096]; const S32 length = dSprintf(buffer, sizeof(buffer), "%s=\"%s\"", n.c_str(), pValue); diff --git a/Engine/source/persistence/taml/fsTinyXml.h b/Engine/source/persistence/taml/fsTinyXml.h index 864abec09..5040abf1a 100644 --- a/Engine/source/persistence/taml/fsTinyXml.h +++ b/Engine/source/persistence/taml/fsTinyXml.h @@ -129,7 +129,7 @@ public: attrib->SetValue( _value ); } } - void SetAttribute( const char * name, int value ) + void SetAttribute( const char * name, int _value) { TiXmlAttribute* attrib = attributeSet.Find( name ); if(!attrib) @@ -139,7 +139,7 @@ public: attrib->SetName( name ); } if ( attrib ) { - attrib->SetIntValue( value ); + attrib->SetIntValue(_value); } } TiXmlNode* Identify( const char* p, TiXmlEncoding encoding );