TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-01 02:20:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tinyxml core class uses a 'value' variable. method io and tempvars altered to work around the 'conflict'

Browse source
This commit is contained in:
Azaezel 2018-03-15 20:45:18 -05:00
parent 2580e3329c
commit bb9d181615
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/persistence/taml/fsTinyXml.cpp
View file

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

4
Engine/source/persistence/taml/fsTinyXml.h
View file

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