v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return null-type in case of an empty document

pull/3908/head
Kim Kulling 2021-05-20 13:40:44 +02:00 committed by GitHub
parent dd0011b4a9
commit 20ade095ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/assimp/XmlParser.h
View File

@ -174,6 +174,11 @@ public:
return false; return false;
} }
/// @brief Will return truem if a root node is there.
/// @return true in case of an existing root.
bool hasRoot() const {
return nullptr != mDoc;
}
/// @brief Will return the document pointer, is nullptr if no xml-file was parsed. /// @brief Will return the document pointer, is nullptr if no xml-file was parsed.
/// @return The pointer showing to the document. /// @return The pointer showing to the document.
pugi::xml_document *getDocument() const { pugi::xml_document *getDocument() const {
@ -183,8 +188,9 @@ public:
/// @brief Will return the root node, const version. /// @brief Will return the root node, const version.
/// @return The root node. /// @return The root node.
const TNodeType getRootNode() const { const TNodeType getRootNode() const {
static pugi::xml_node none;
if (nullptr == mDoc) { if (nullptr == mDoc) {
return nullptr; return none;
} }
return mDoc->root(); return mDoc->root();
} }
@ -192,8 +198,9 @@ public:
/// @brief Will return the root node, non-const version. /// @brief Will return the root node, non-const version.
/// @return The root node. /// @return The root node.
TNodeType getRootNode() { TNodeType getRootNode() {
static pugi::xml_node none;
if (nullptr == mDoc) { if (nullptr == mDoc) {
return nullptr; return none;
} }
return mDoc->root(); return mDoc->root();
} }