External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make xml_node::value() structure consistent with set_*

Browse Source
This commit is contained in:
Arseny Kapoulkine 2015-04-22 08:30:53 -07:00
parent e4e2259646
commit 4223b4a3f0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pugixml.cpp
View File

@ -5378,14 +5378,13 @@ namespace pugi
PUGI__FN const char_t* xml_node::value() const PUGI__FN const char_t* xml_node::value() const
{ {
if (_root) if (!_root) return PUGIXML_TEXT("");
{
if (impl::has_value(_root) && _root->contents)
return _root->contents;
if (PUGI__NODETYPE(_root) == node_pi && static_cast<xml_node_pi_struct*>(_root)->pi_value) if (impl::has_value(_root) && _root->contents)
return static_cast<xml_node_pi_struct*>(_root)->pi_value; return _root->contents;
}
if (PUGI__NODETYPE(_root) == node_pi && static_cast<xml_node_pi_struct*>(_root)->pi_value)
return static_cast<xml_node_pi_struct*>(_root)->pi_value;
return PUGIXML_TEXT(""); return PUGIXML_TEXT("");
} }