From de6d164822076f9b1e26a7222808a25ac03867d8 Mon Sep 17 00:00:00 2001 From: Lee Thomason Date: Sat, 17 Nov 2018 19:53:46 -0800 Subject: [PATCH] fix export issue and cmake. version to 7.0.1 --- CMakeLists.txt | 2 +- dox | 4 ++-- 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") ################################ diff --git a/dox b/dox index 9756283..fd50e79 100644 --- a/dox +++ b/dox @@ -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 diff --git a/tinyxml2.h b/tinyxml2.h index a79e0db..ee83d2c 100755 --- a/tinyxml2.h +++ b/tinyxml2.h @@ -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 {