mirror of
https://github.com/leethomason/tinyxml2.git
synced 2026-07-21 19:23:00 +04:00
fix bad merge
This commit is contained in:
+1
-2
@@ -2348,11 +2348,10 @@ static FILE* callfopen( const char* filepath, const char* mode )
|
|||||||
}
|
}
|
||||||
|
|
||||||
void XMLDocument::DeleteNode( XMLNode* node ) {
|
void XMLDocument::DeleteNode( XMLNode* node ) {
|
||||||
TIXMLASSERT( node );
|
|
||||||
TIXMLASSERT(node->_document == this );
|
|
||||||
if(node == 0) {
|
if(node == 0) {
|
||||||
return; // check for null pointer
|
return; // check for null pointer
|
||||||
}
|
}
|
||||||
|
TIXMLASSERT(node->_document == this);
|
||||||
if (node->_parent) {
|
if (node->_parent) {
|
||||||
node->_parent->DeleteChild( node );
|
node->_parent->DeleteChild( node );
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user