Imported Upstream version 4.0.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98d4c55..e1d3ca0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ include(GNUInstallDirs)
 ################################\r
 # set lib version here\r
 \r
-set(GENERIC_LIB_VERSION "4.0.0")\r
+set(GENERIC_LIB_VERSION "4.0.1")\r
 set(GENERIC_LIB_SOVERSION "4")\r
 \r
 \r

diff --git a/dox b/dox
index 5ae0b21..394b182 100644 (file)
--- a/dox
+++ b/dox
@@ -38,7 +38,7 @@ PROJECT_NAME           = "TinyXML-2"
 # could be handy for archiving the generated documentation or if some version\r
 # control system is used.\r
 \r
-PROJECT_NUMBER = 4.0.0\r
+PROJECT_NUMBER = 4.0.1\r
 \r
 # Using the PROJECT_BRIEF tag one can provide an optional one line description\r
 # for a project that appears at the top of each page and should give viewer a\r

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index d5d8ebb..9d6be5c 100755 (executable)
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -558,7 +558,8 @@ void XMLUtil::ToStr( double v, char* buffer, int bufferSize )
 \r
 void XMLUtil::ToStr(int64_t v, char* buffer, int bufferSize)\r
 {\r
-       TIXML_SNPRINTF(buffer, bufferSize, "%lld", v);\r
+       // horrible syntax trick to make the compiler happy about %lld\r
+       TIXML_SNPRINTF(buffer, bufferSize, "%lld", (long long)v);\r
 }\r
 \r
 \r
@@ -617,7 +618,9 @@ bool XMLUtil::ToDouble( const char* str, double* value )
 \r
 bool XMLUtil::ToInt64(const char* str, int64_t* value)\r
 {\r
-       if (TIXML_SSCANF(str, "%lld", value) == 1) {\r
+       long long v = 0;        // horrible syntax trick to make the compiler happy about %lld\r
+       if (TIXML_SSCANF(str, "%lld", &v) == 1) {\r
+               *value = (int64_t)v;\r
                return true;\r
        }\r
        return false;\r

diff --git a/tinyxml2.h b/tinyxml2.h
index 9dcc345..fb4376d 100755 (executable)
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -98,7 +98,7 @@ distribution.
 */\r
 static const int TIXML2_MAJOR_VERSION = 4;\r
 static const int TIXML2_MINOR_VERSION = 0;\r
-static const int TIXML2_PATCH_VERSION = 0;\r
+static const int TIXML2_PATCH_VERSION = 1;\r
 \r
 namespace tinyxml2\r
 {\r

diff --git a/xmltest.cpp b/xmltest.cpp
index 3fdc0bd..7451fbe 100644 (file)
--- a/xmltest.cpp
+++ b/xmltest.cpp
@@ -426,7 +426,7 @@ int main( int argc, const char ** argv )
                XMLTest( "Programmatic DOM", 2, doc->FirstChildElement()->LastChildElement( "sub" )->IntAttribute( "attrib" ) );\r
                XMLTest( "Programmatic DOM", "& Text!",\r
                                 doc->FirstChildElement()->LastChildElement( "sub" )->FirstChild()->ToText()->Value() );\r
-               XMLTest("User data", 2, (int)comment->GetUserData());\r
+               XMLTest("User data", (void*)2 == comment->GetUserData(), true, false);\r
 \r
                // And now deletion:\r
                element->DeleteChild( sub[2] );\r