mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-16 03:19:55 +00:00
Code Issues Releases Wiki Activity

Fix compile with VS2008, disable XMLDocument::LoadFile()

Browse source
This commit is contained in:
fgenesis 2017-02-08 21:53:59 +01:00
parent 3742a5f2f5
commit 5ba014640c
4 changed files with 104 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ExternalLibs/tinyxml2.cpp
View file

@ -21,6 +21,8 @@ must not be misrepresented as being the original software.
distribution.
*/
// MODIFICATION: Disabled LoadFile() functions to catch misuse - Aquaria uses its own VFS, not FILE* -- fg
#include "tinyxml2.h"
#include <new> // yes, this one new style header, is in the Android SDK.
@ -1961,7 +1963,7 @@ void XMLDocument::DeleteNode( XMLNode* node ) {
}
}
/*
XMLError XMLDocument::LoadFile( const char* filename )
{
Clear();
@ -1974,7 +1976,7 @@ XMLError XMLDocument::LoadFile( const char* filename )
fclose( fp );
return _errorID;
}
*/
// This is likely overengineered template art to have a check that unsigned long value incremented
// by one still fits into size_t. If size_t type is larger than unsigned long type
// (x86_64-w64-mingw32 target) then the check is redundant and gcc and clang emit
@ -1997,7 +1999,7 @@ struct LongFitsIntoSizeTMinusOne<false> {
return true;
}
};
/*
XMLError XMLDocument::LoadFile( FILE* fp )
{
Clear();
@ -2042,7 +2044,7 @@ XMLError XMLDocument::LoadFile( FILE* fp )
Parse();
return _errorID;
}
*/
XMLError XMLDocument::SaveFile( const char* filename, bool compact )
{