AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into whitespace

This commit is contained in:
Lee Thomason (grinliz) 2012-09-08 21:24:00 -07:00
parent bc1bfb7f27 4dbe869cd7
commit 491d587484
5 changed files with 96 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@ include(GNUInstallDirs)
################################ ################################
# set lib version here # set lib version here
set(GENERIC_LIB_VERSION "1.0.6") set(GENERIC_LIB_VERSION "1.0.7")
set(GENERIC_LIB_SOVERSION "1") set(GENERIC_LIB_SOVERSION "1")

2
dox
View File

@ -32,7 +32,7 @@ PROJECT_NAME = "TinyXML-2"
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 1.0.6 PROJECT_NUMBER = 1.0.7
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer # for a project that appears at the top of each page and should give viewer

8
tinyxml2.cpp
View File

@ -1600,7 +1600,7 @@ int XMLDocument::LoadFile( FILE* fp )
} }
int XMLDocument::SaveFile( const char* filename ) int XMLDocument::SaveFile( const char* filename, bool compact )
{ {
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning ( push ) #pragma warning ( push )
@ -1614,15 +1614,15 @@ int XMLDocument::SaveFile( const char* filename )
SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, filename, 0 ); SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, filename, 0 );
return errorID; return errorID;
} }
SaveFile(fp); SaveFile(fp, compact);
fclose( fp ); fclose( fp );
return errorID; return errorID;
} }
int XMLDocument::SaveFile( FILE* fp ) int XMLDocument::SaveFile( FILE* fp, bool compact )
{ {
XMLPrinter stream( fp ); XMLPrinter stream( fp, compact );
Print( &stream ); Print( &stream );
return errorID; return errorID;
} }

8
tinyxml2.h
View File

@ -95,7 +95,7 @@ distribution.
static const int TIXML2_MAJOR_VERSION = 1; static const int TIXML2_MAJOR_VERSION = 1;
static const int TIXML2_MINOR_VERSION = 0; static const int TIXML2_MINOR_VERSION = 0;
static const int TIXML2_PATCH_VERSION = 6; static const int TIXML2_PATCH_VERSION = 7;
namespace tinyxml2 namespace tinyxml2
{ {
@ -294,7 +294,9 @@ public:
if ( !mem ) return; if ( !mem ) return;
--currentAllocs; --currentAllocs;
Chunk* chunk = (Chunk*)mem; Chunk* chunk = (Chunk*)mem;
#ifdef DEBUG
memset( chunk, 0xfe, sizeof(Chunk) ); memset( chunk, 0xfe, sizeof(Chunk) );
#endif
chunk->next = root; chunk->next = root;
root = chunk; root = chunk;
} }
@ -1094,7 +1096,7 @@ public:
Returns XML_NO_ERROR (0) on success, or Returns XML_NO_ERROR (0) on success, or
an errorID. an errorID.
*/ */
int SaveFile( const char* filename ); int SaveFile( const char* filename, bool compact = false );
/** /**
Save the XML file to disk. You are responsible Save the XML file to disk. You are responsible
@ -1103,7 +1105,7 @@ public:
Returns XML_NO_ERROR (0) on success, or Returns XML_NO_ERROR (0) on success, or
an errorID. an errorID.
*/ */
int SaveFile( FILE* ); int SaveFile( FILE* fp, bool compact = false );
bool ProcessEntities() const { return processEntities; } bool ProcessEntities() const { return processEntities; }
Whitespace WhitespaceMode() const { return whitespace; } Whitespace WhitespaceMode() const { return whitespace; }

2
xmltest.cpp
View File

@ -296,6 +296,8 @@ int main( int /*argc*/, const char ** /*argv*/ )
doc->Print( &streamer ); doc->Print( &streamer );
XMLTest( "Compact mode", "<element><sub attrib=\"1\"/><sub/></element>", streamer.CStr(), false ); XMLTest( "Compact mode", "<element><sub attrib=\"1\"/><sub/></element>", streamer.CStr(), false );
} }
doc->SaveFile( "./resources/out/pretty.xml" );
doc->SaveFile( "./resources/out/compact.xml", true );
delete doc; delete doc;
} }
{ {