Fix building with precompiled headers

add the unimplemented modules to the emucore project

fix a bug in the rXml wrapper that didn't consider the possiblity of functions returning null pointers
This commit is contained in:
Peter Tissen 2014-06-08 13:43:13 +02:00
parent c37905e465
commit 314307b840
5 changed files with 209 additions and 22 deletions

View file

@ -44,13 +44,27 @@ rXmlNode::~rXmlNode()
std::shared_ptr<rXmlNode> rXmlNode::GetChildren()
{
wxXmlNode* result = reinterpret_cast<wxXmlNode*>(handle)->GetChildren();
return std::make_shared<rXmlNode>(reinterpret_cast<void*>(result));
if (result)
{
return std::make_shared<rXmlNode>(reinterpret_cast<void*>(result));
}
else
{
return std::shared_ptr<rXmlNode>(nullptr);
}
}
std::shared_ptr<rXmlNode> rXmlNode::GetNext()
{
wxXmlNode* result = reinterpret_cast<wxXmlNode*>(handle)->GetNext();
return std::make_shared<rXmlNode>(reinterpret_cast<void*>(result));
if (result)
{
return std::make_shared<rXmlNode>(reinterpret_cast<void*>(result));
}
else
{
return std::shared_ptr<rXmlNode>(nullptr);
}
}
std::string rXmlNode::GetName()