Merge pull request #234 from Dmitry-Me/errorCheckingNeverWorked

Error checking never actually checked anything
This commit is contained in:
Lee Thomason 2014-11-28 13:54:55 -08:00
commit 7254cf7e57

View File

@ -1654,6 +1654,9 @@ void XMLDocument::Clear()
{ {
DeleteChildren(); DeleteChildren();
#ifdef DEBUG
const bool hadError = Error();
#endif
_errorID = XML_NO_ERROR; _errorID = XML_NO_ERROR;
_errorStr1 = 0; _errorStr1 = 0;
_errorStr2 = 0; _errorStr2 = 0;
@ -1669,7 +1672,7 @@ void XMLDocument::Clear()
#endif #endif
#ifdef DEBUG #ifdef DEBUG
if ( Error() == false ) { if ( !hadError ) {
TIXMLASSERT( _elementPool.CurrentAllocs() == _elementPool.Untracked() ); TIXMLASSERT( _elementPool.CurrentAllocs() == _elementPool.Untracked() );
TIXMLASSERT( _attributePool.CurrentAllocs() == _attributePool.Untracked() ); TIXMLASSERT( _attributePool.CurrentAllocs() == _attributePool.Untracked() );
TIXMLASSERT( _textPool.CurrentAllocs() == _textPool.Untracked() ); TIXMLASSERT( _textPool.CurrentAllocs() == _textPool.Untracked() );