Merge pull request #338 from Dmitry-Me/removeAmbiguousEnumItems
Get rid of two distinct enum items with same same
diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 462a3b7..2c07897 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -273,7 +273,7 @@
}
// The loop below has plenty going on, and this
// is a less useful mode. Break it out.
- if ( _flags & COLLAPSE_WHITESPACE ) {
+ if ( _flags & NEEDS_WHITESPACE_COLLAPSING ) {
CollapseWhitespace();
}
_flags = (_flags & NEEDS_DELETE);
@@ -976,7 +976,7 @@
else {
int flags = _document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES;
if ( _document->WhitespaceMode() == COLLAPSE_WHITESPACE ) {
- flags |= StrPair::COLLAPSE_WHITESPACE;
+ flags |= StrPair::NEEDS_WHITESPACE_COLLAPSING;
}
p = _value.ParseText( p, "<", flags );
diff --git a/tinyxml2.h b/tinyxml2.h
index 70a9851..af14205 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -149,7 +149,7 @@
enum {
NEEDS_ENTITY_PROCESSING = 0x01,
NEEDS_NEWLINE_NORMALIZATION = 0x02,
- COLLAPSE_WHITESPACE = 0x04,
+ NEEDS_WHITESPACE_COLLAPSING = 0x04,
TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION,