Merge remote-tracking branch 'origin/master' into Dmitry-Me-properStrPairAssignment
This commit is contained in:
@@ -1869,6 +1869,7 @@ void XMLDocument::Print( XMLPrinter* streamer ) const
|
||||
|
||||
void XMLDocument::SetError( XMLError error, const char* str1, const char* str2 )
|
||||
{
|
||||
TIXMLASSERT( error >= 0 && error < XML_ERROR_COUNT );
|
||||
_errorID = error;
|
||||
_errorStr1 = str1;
|
||||
_errorStr2 = str2;
|
||||
@@ -1876,7 +1877,7 @@ void XMLDocument::SetError( XMLError error, const char* str1, const char* str2 )
|
||||
|
||||
const char* XMLDocument::ErrorName() const
|
||||
{
|
||||
TIXMLASSERT(_errorID >= 0 && _errorID < XML_ERROR_COUNT );
|
||||
TIXMLASSERT( _errorID >= 0 && _errorID < XML_ERROR_COUNT );
|
||||
return _errorNames[_errorID];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user