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

Fix istringtream construction.

Browse Source
This commit is contained in:
Aymeric PELLÉ 2017-03-09 12:03:36 -05:00
parent 6d0768d1b0
commit 90eeacf606
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pugixml.cpp
View File

@ -5168,10 +5168,12 @@ namespace pugi
} }
#endif #endif
#ifndef PUGIXML_NO_STL
PUGI__FN std::istringstream xml_attribute::as_stringstream() const PUGI__FN std::istringstream xml_attribute::as_stringstream() const
{ {
return (_attr && _attr->value) ? std::istringstream(_attr->value) : std::istringstream(); return (_attr && _attr->value) ? std::istringstream(std::string(static_cast<char_t*>(_attr->value))) : std::istringstream();
} }
#endif
PUGI__FN bool xml_attribute::empty() const PUGI__FN bool xml_attribute::empty() const
{ {
@ -6423,12 +6425,14 @@ namespace pugi
} }
#endif #endif
#ifndef PUGIXML_NO_STL
PUGI__FN std::istringstream xml_text::as_stringstream() const PUGI__FN std::istringstream xml_text::as_stringstream() const
{ {
xml_node_struct* d = _data(); xml_node_struct* d = _data();
return (d && d->value) ? std::istringstream(d->value) : std::istringstream(); return (d && d->value) ? std::istringstream(std::string(static_cast<char_t*>(d->value))) : std::istringstream();
} }
#endif
PUGI__FN bool xml_text::set(const char_t* rhs) PUGI__FN bool xml_text::set(const char_t* rhs)
{ {