diff options
author | Lee Thomason <leethomason@gmail.com> | 2018-11-18 06:53:46 +0300 |
---|---|---|
committer | Lee Thomason <leethomason@gmail.com> | 2018-11-18 06:53:46 +0300 |
commit | de6d164822076f9b1e26a7222808a25ac03867d8 (patch) | |
tree | 27e5e86c83183ce5a207fdadad8d062c5c41e13c | |
parent | 08da3d91c943e435399914660d201816af2d65a8 (diff) |
fix export issue and cmake. version to 7.0.17.0.1
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | dox | 4 | ||||
-rwxr-xr-x | tinyxml2.h | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bd8005e..378b48a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ include(CTest) ################################
# set lib version here
-set(GENERIC_LIB_VERSION "7.0.0")
+set(GENERIC_LIB_VERSION "7.0.1")
set(GENERIC_LIB_SOVERSION "7")
################################
@@ -39,9 +39,9 @@ PROJECT_NAME = "TinyXML-2" # control system is used.
<<<<<<< HEAD
-PROJECT_NUMBER = 7.0.0
+PROJECT_NUMBER = 7.0.1
=======
-PROJECT_NUMBER = 7.0.0
+PROJECT_NUMBER = 7.0.1
>>>>>>> master
# Using the PROJECT_BRIEF tag one can provide an optional one line description
@@ -100,11 +100,11 @@ distribution. */
static const int TIXML2_MAJOR_VERSION = 7;
static const int TIXML2_MINOR_VERSION = 0;
-static const int TIXML2_PATCH_VERSION = 0;
+static const int TIXML2_PATCH_VERSION = 1;
#define TINYXML2_MAJOR_VERSION 7
#define TINYXML2_MINOR_VERSION 0
-#define TINYXML2_PATCH_VERSION 0
+#define TINYXML2_PATCH_VERSION 1
// A fixed element depth limit is problematic. There needs to be a
// limit to avoid a stack overflow. However, that limit varies per
@@ -129,8 +129,10 @@ class XMLPrinter; pointers into the XML file itself, and will apply normalization
and entity translation if actually read. Can also store (and memory
manage) a traditional char[]
+
+ Isn't clear why TINYXML2_LIB is needed; but seems to fix #719
*/
-class StrPair
+class TINYXML2_LIB StrPair
{
public:
enum {
|