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

Merge pull request #499 from Dmitry-Me/unifyNullComparisons 

Unify null pointer checks
This commit is contained in:
Lee Thomason 2016-11-17 14:43:55 -08:00 committed by GitHub
parent 7de0b6dd8c ebb1660c2f
commit f80d78d938
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tinyxml2.h
View File

@ -1912,19 +1912,19 @@ public:
} }
/// Safe cast to XMLElement. This can return null. /// Safe cast to XMLElement. This can return null.
XMLElement* ToElement() { XMLElement* ToElement() {
return ( ( _node == 0 ) ? 0 : _node->ToElement() ); return ( _node ? _node->ToElement() : 0 );
} }
/// Safe cast to XMLText. This can return null. /// Safe cast to XMLText. This can return null.
XMLText* ToText() { XMLText* ToText() {
return ( ( _node == 0 ) ? 0 : _node->ToText() ); return ( _node ? _node->ToText() : 0 );
} }
/// Safe cast to XMLUnknown. This can return null. /// Safe cast to XMLUnknown. This can return null.
XMLUnknown* ToUnknown() { XMLUnknown* ToUnknown() {
return ( ( _node == 0 ) ? 0 : _node->ToUnknown() ); return ( _node ? _node->ToUnknown() : 0 );
} }
/// Safe cast to XMLDeclaration. This can return null. /// Safe cast to XMLDeclaration. This can return null.
XMLDeclaration* ToDeclaration() { XMLDeclaration* ToDeclaration() {
return ( ( _node == 0 ) ? 0 : _node->ToDeclaration() ); return ( _node ? _node->ToDeclaration() : 0 );
} }
private: private:
@ -1984,16 +1984,16 @@ public:
return _node; return _node;
} }
const XMLElement* ToElement() const { const XMLElement* ToElement() const {
return ( ( _node == 0 ) ? 0 : _node->ToElement() ); return ( _node ? _node->ToElement() : 0 );
} }
const XMLText* ToText() const { const XMLText* ToText() const {
return ( ( _node == 0 ) ? 0 : _node->ToText() ); return ( _node ? _node->ToText() : 0 );
} }
const XMLUnknown* ToUnknown() const { const XMLUnknown* ToUnknown() const {
return ( ( _node == 0 ) ? 0 : _node->ToUnknown() ); return ( _node ? _node->ToUnknown() : 0 );
} }
const XMLDeclaration* ToDeclaration() const { const XMLDeclaration* ToDeclaration() const {
return ( ( _node == 0 ) ? 0 : _node->ToDeclaration() ); return ( _node ? _node->ToDeclaration() : 0 );
} }
private: private: