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

Merge pull request #545 from Dmitry-Me/fullyUseEnum 

Fully use enum
This commit is contained in:
Lee Thomason 2017-04-06 13:27:29 -07:00 committed by GitHub
parent fc05f63575 e503563f47
commit 2b0453f43e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tinyxml2.cpp
View File

@ -1449,7 +1449,7 @@ void XMLAttribute::SetAttribute( float v )
// --------- XMLElement ---------- //
XMLElement::XMLElement( XMLDocument* doc ) : XMLNode( doc ),
_closingType( 0 ),
_closingType( OPEN ),
_rootAttribute( 0 )
{
}
@ -1868,7 +1868,7 @@ char* XMLElement::ParseDeep( char* p, StrPair* strPair, int* curLineNumPtr )
}
p = ParseAttributes( p, curLineNumPtr );
if ( !p || !*p || _closingType ) {
if ( !p || !*p || _closingType != OPEN ) {
return p;
}

6
tinyxml2.h
View File

@ -1559,12 +1559,12 @@ public:
float FloatText(float defaultValue = 0) const;
// internal:
enum {
enum ElementClosingType {
OPEN, // <foo>
CLOSED, // <foo/>
CLOSING // </foo>
};
int ClosingType() const {
ElementClosingType ClosingType() const {
return _closingType;
}
virtual XMLNode* ShallowClone( XMLDocument* document ) const;
@ -1589,7 +1589,7 @@ private:
XMLAttribute* CreateAttribute();
enum { BUF_SIZE = 200 };
int _closingType;
ElementClosingType _closingType;
// The attribute list is ordered; there is no 'lastAttribute'
// because the list needs to be scanned for dupes before adding
// a new attribute.