fix export issue and cmake. version to 7.0.1
This commit is contained in:
@@ -21,7 +21,7 @@ include(CTest)
|
|||||||
################################
|
################################
|
||||||
# set lib version here
|
# set lib version here
|
||||||
|
|
||||||
set(GENERIC_LIB_VERSION "7.0.0")
|
set(GENERIC_LIB_VERSION "7.0.1")
|
||||||
set(GENERIC_LIB_SOVERSION "7")
|
set(GENERIC_LIB_SOVERSION "7")
|
||||||
|
|
||||||
################################
|
################################
|
||||||
|
|||||||
4
dox
4
dox
@@ -39,9 +39,9 @@ PROJECT_NAME = "TinyXML-2"
|
|||||||
# control system is used.
|
# control system is used.
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
PROJECT_NUMBER = 7.0.0
|
PROJECT_NUMBER = 7.0.1
|
||||||
=======
|
=======
|
||||||
PROJECT_NUMBER = 7.0.0
|
PROJECT_NUMBER = 7.0.1
|
||||||
>>>>>>> master
|
>>>>>>> master
|
||||||
|
|
||||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
# 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_MAJOR_VERSION = 7;
|
||||||
static const int TIXML2_MINOR_VERSION = 0;
|
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_MAJOR_VERSION 7
|
||||||
#define TINYXML2_MINOR_VERSION 0
|
#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
|
// A fixed element depth limit is problematic. There needs to be a
|
||||||
// limit to avoid a stack overflow. However, that limit varies per
|
// 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
|
pointers into the XML file itself, and will apply normalization
|
||||||
and entity translation if actually read. Can also store (and memory
|
and entity translation if actually read. Can also store (and memory
|
||||||
manage) a traditional char[]
|
manage) a traditional char[]
|
||||||
|
|
||||||
|
Isn't clear why TINYXML2_LIB is needed; but seems to fix #719
|
||||||
*/
|
*/
|
||||||
class StrPair
|
class TINYXML2_LIB StrPair
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
enum {
|
enum {
|
||||||
|
|||||||
Reference in New Issue
Block a user