commit 93a8fb18ea548e879d8963c834c0690ada532297
author Lee Thomason <leethomason@gmail.com> Fri Jun 29 15:53:32 2018 -0700
committer Lee Thomason <leethomason@gmail.com> Fri Jun 29 15:53:32 2018 -0700
tree 903e135ac35bc5796d03696f2fc9efaed4b216bd
parent 9f14aca07f4e3ac04f2e32929a169f39441d6f68
parent 92fc089e174bdcad8f0e67865d8365e96551487f

Merge branch 'issue647'

tinyxml2.cpp

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 33cf19f..de3d2fb 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1977,10 +1977,8 @@
     "XML_ERROR_FILE_NOT_FOUND",

     "XML_ERROR_FILE_COULD_NOT_BE_OPENED",

     "XML_ERROR_FILE_READ_ERROR",

-    "UNUSED_XML_ERROR_ELEMENT_MISMATCH",

     "XML_ERROR_PARSING_ELEMENT",

     "XML_ERROR_PARSING_ATTRIBUTE",

-    "UNUSED_XML_ERROR_IDENTIFYING_TAG",

     "XML_ERROR_PARSING_TEXT",

     "XML_ERROR_PARSING_CDATA",

     "XML_ERROR_PARSING_COMMENT",

@@ -2327,6 +2325,7 @@
     size_t BUFFER_SIZE = 1000;

     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);

 

 	if (format) {

tinyxml2.h

diff --git a/tinyxml2.h b/tinyxml2.h
index 9e9c1d0..950c2da 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -525,10 +525,8 @@
     XML_ERROR_FILE_NOT_FOUND,

     XML_ERROR_FILE_COULD_NOT_BE_OPENED,

     XML_ERROR_FILE_READ_ERROR,

-    UNUSED_XML_ERROR_ELEMENT_MISMATCH,	// remove at next major version

     XML_ERROR_PARSING_ELEMENT,

     XML_ERROR_PARSING_ATTRIBUTE,

-    UNUSED_XML_ERROR_IDENTIFYING_TAG,	// remove at next major version

     XML_ERROR_PARSING_TEXT,

     XML_ERROR_PARSING_CDATA,

     XML_ERROR_PARSING_COMMENT,