potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #831 from plekakis/master

Browse Source 
Fix for enum in StrPair and TIXMLASSERT define behaviour
This commit is contained in:
Lee Thomason
2020-12-30 10:20:54 -08:00
committed by GitHub
parent a9ed6746dd c87bf8187d
commit ee6684483c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tinyxml2.h
View File

@@ -79,6 +79,7 @@ distribution.
#endif #endif
#if !defined(TIXMLASSERT)
#if defined(TINYXML2_DEBUG) #if defined(TINYXML2_DEBUG)
# if defined(_MSC_VER) # if defined(_MSC_VER)
# // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like # // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like
@@ -93,7 +94,7 @@ distribution.
#else #else
# define TIXMLASSERT( x ) {} # define TIXMLASSERT( x ) {}
#endif #endif
#endif
/* Versioning, past 1.0.14: /* Versioning, past 1.0.14:
http://semver.org/ http://semver.org/
@@ -135,7 +136,7 @@ class XMLPrinter;
class TINYXML2_LIB StrPair class TINYXML2_LIB StrPair
{ {
public: public:
enum { enum Mode {
NEEDS_ENTITY_PROCESSING = 0x01, NEEDS_ENTITY_PROCESSING = 0x01,
NEEDS_NEWLINE_NORMALIZATION = 0x02, NEEDS_NEWLINE_NORMALIZATION = 0x02,
NEEDS_WHITESPACE_COLLAPSING = 0x04, NEEDS_WHITESPACE_COLLAPSING = 0x04,