Merge pull request #976 from leethomason/AlbertHungGarmin-format_errorupstream-master

Albert hung garmin format error

1 files changed, 3 insertions, 2 deletions

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index a96caf0..903d690 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -2504,7 +2504,7 @@ void XMLDocument::ClearError() {
 

 void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ... )

 {

-    TIXMLASSERT( error >= 0 && error < XML_ERROR_COUNT );

+    TIXMLASSERT(error >= 0 && error < XML_ERROR_COUNT);

     _errorID = error;

     _errorLineNum = lineNum;

 	_errorStr.Reset();

@@ -2513,7 +2513,8 @@ void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ...
     char* buffer = new char[BUFFER_SIZE];

 

     TIXMLASSERT(sizeof(error) <= sizeof(int));

-    TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d", ErrorIDToName(error), int(error), int(error), lineNum);

+    TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d",

+        ErrorIDToName(error), static_cast<int>(error), static_cast<unsigned int>(error), lineNum);

 

 	if (format) {

 		size_t len = strlen(buffer);