Merge pull request #976 from leethomason/AlbertHungGarmin-format_error

Albert hung garmin format error
leethomason · Apr 21, 2024 · 312a809 · 312a809
2 parents 0f9c021 + c33aae0
commit 312a809
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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);