- Allowing TIXMLASERT to be defined before including the main header.
- Fix for enum bitmask usage
diff --git a/tinyxml2.h b/tinyxml2.h
index 003ef43..f0cfbcc 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -79,6 +79,7 @@
#endif
+#if !defined(TIXMLASSERT)
#if defined(TINYXML2_DEBUG)
# if defined(_MSC_VER)
# // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like
@@ -93,7 +94,7 @@
#else
# define TIXMLASSERT( x ) {}
#endif
-
+#endif
/* Versioning, past 1.0.14:
http://semver.org/
@@ -135,7 +136,7 @@
class TINYXML2_LIB StrPair
{
public:
- enum {
+ enum Mode : uint32_t {
NEEDS_ENTITY_PROCESSING = 0x01,
NEEDS_NEWLINE_NORMALIZATION = 0x02,
NEEDS_WHITESPACE_COLLAPSING = 0x04,