fix merge

leethomason · leethomason · commit 063d313b7fdd · 2026-03-09T18:04:02.000-07:00
diff --git a/tinyxml2.cpp b/tinyxml2.cpp
@@ -2348,11 +2348,10 @@ static FILE* callfopen( const char* filepath, const char* mode )
 }
 
 void XMLDocument::DeleteNode( XMLNode* node )	{   
-    TIXMLASSERT( node );
-    TIXMLASSERT(node->_document == this );
     if(node == 0) {
         return; // check for null pointer
     }
+    TIXMLASSERT(node->_document == this);
     if (node->_parent) {
         node->_parent->DeleteChild( node );
     }

Original file line number	Diff line number	Diff line change
`@@ -2348,11 +2348,10 @@ static FILE* callfopen( const char* filepath, const char* mode )`
`2348`	`2348`	`}`
`2349`	`2349`
`2350`	`2350`	`void XMLDocument::DeleteNode( XMLNode* node ) {`
`2351`		`- TIXMLASSERT( node );`
`2352`		`- TIXMLASSERT(node->_document == this );`
`2353`	`2351`	`if(node == 0) {`
`2354`	`2352`	`return; // check for null pointer`
`2355`	`2353`	`}`
	`2354`	`+ TIXMLASSERT(node->_document == this);`
`2356`	`2355`	`if (node->_parent) {`
`2357`	`2356`	`node->_parent->DeleteChild( node );`
`2358`	`2357`	`}`