Merge branch 'master' into errorstr
This commit is contained in:
14
tinyxml2.cpp
14
tinyxml2.cpp
@@ -742,6 +742,7 @@ bool XMLDocument::Accept( XMLVisitor* visitor ) const
|
||||
XMLNode::XMLNode( XMLDocument* doc ) :
|
||||
_document( doc ),
|
||||
_parent( 0 ),
|
||||
_value(),
|
||||
_parseLineNum( 0 ),
|
||||
_firstChild( 0 ), _lastChild( 0 ),
|
||||
_prev( 0 ), _next( 0 ),
|
||||
@@ -2001,9 +2002,16 @@ XMLDocument::XMLDocument( bool processEntities, Whitespace whitespaceMode ) :
|
||||
_processEntities( processEntities ),
|
||||
_errorID(XML_SUCCESS),
|
||||
_whitespaceMode( whitespaceMode ),
|
||||
_errorStr1(),
|
||||
_errorStr2(),
|
||||
_errorLineNum( 0 ),
|
||||
_charBuffer( 0 ),
|
||||
_parseCurLineNum( 0 )
|
||||
_parseCurLineNum( 0 ),
|
||||
_unlinked(),
|
||||
_elementPool(),
|
||||
_attributePool(),
|
||||
_textPool(),
|
||||
_commentPool()
|
||||
{
|
||||
// avoid VC++ C4355 warning about 'this' in initializer list (C4355 is off by default in VS2012+)
|
||||
_document = this;
|
||||
@@ -2363,12 +2371,14 @@ void XMLDocument::Parse()
|
||||
|
||||
XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
|
||||
_elementJustOpened( false ),
|
||||
_stack(),
|
||||
_firstElement( true ),
|
||||
_fp( file ),
|
||||
_depth( depth ),
|
||||
_textDepth( -1 ),
|
||||
_processEntities( true ),
|
||||
_compactMode( compact )
|
||||
_compactMode( compact ),
|
||||
_buffer()
|
||||
{
|
||||
for( int i=0; i<ENTITY_RANGE; ++i ) {
|
||||
_entityFlag[i] = false;
|
||||
|
||||
Reference in New Issue
Block a user