AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #338 from Dmitry-Me/removeAmbiguousEnumItems 

Get rid of two distinct enum items with same same
This commit is contained in:
Lee Thomason 2015-05-22 11:09:33 -07:00
parent 949ae37e0a 5420e547d3
commit c879a4d48c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tinyxml2.cpp
View File

@ -273,7 +273,7 @@ const char* StrPair::GetStr()
} }
// The loop below has plenty going on, and this // The loop below has plenty going on, and this
// is a less useful mode. Break it out. // is a less useful mode. Break it out.
if ( _flags & COLLAPSE_WHITESPACE ) { if ( _flags & NEEDS_WHITESPACE_COLLAPSING ) {
CollapseWhitespace(); CollapseWhitespace();
} }
_flags = (_flags & NEEDS_DELETE); _flags = (_flags & NEEDS_DELETE);
@ -976,7 +976,7 @@ char* XMLText::ParseDeep( char* p, StrPair* )
else { else {
int flags = _document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES; int flags = _document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES;
if ( _document->WhitespaceMode() == COLLAPSE_WHITESPACE ) { if ( _document->WhitespaceMode() == COLLAPSE_WHITESPACE ) {
flags |= StrPair::COLLAPSE_WHITESPACE; flags |= StrPair::NEEDS_WHITESPACE_COLLAPSING;
} }
p = _value.ParseText( p, "<", flags ); p = _value.ParseText( p, "<", flags );

2
tinyxml2.h
View File

@ -149,7 +149,7 @@ public:
enum { enum {
NEEDS_ENTITY_PROCESSING = 0x01, NEEDS_ENTITY_PROCESSING = 0x01,
NEEDS_NEWLINE_NORMALIZATION = 0x02, NEEDS_NEWLINE_NORMALIZATION = 0x02,
COLLAPSE_WHITESPACE = 0x04, NEEDS_WHITESPACE_COLLAPSING = 0x04,
TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION,