diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-02-03 15:30:56 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-02-03 15:30:56 (GMT) |
| commit | f7670b8d975d2d686095e98e7e7cc781b69dad0c (patch) | |
| tree | 9df4dd3e721fbd26a4db14e5d3bc94cf88b8acf5 /src/uscxml/interpreter/InterpreterImpl.cpp | |
| parent | 074e8a7db78bba7bdc184f6d18d16c2ab8045fed (diff) | |
| download | uscxml-f7670b8d975d2d686095e98e7e7cc781b69dad0c.zip uscxml-f7670b8d975d2d686095e98e7e7cc781b69dad0c.tar.gz uscxml-f7670b8d975d2d686095e98e7e7cc781b69dad0c.tar.bz2 | |
Reduced dependencies to compile test-gen-c to smaller executable
Diffstat (limited to 'src/uscxml/interpreter/InterpreterImpl.cpp')
| -rw-r--r-- | src/uscxml/interpreter/InterpreterImpl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/uscxml/interpreter/InterpreterImpl.cpp b/src/uscxml/interpreter/InterpreterImpl.cpp index 1693462..ac6aa41 100644 --- a/src/uscxml/interpreter/InterpreterImpl.cpp +++ b/src/uscxml/interpreter/InterpreterImpl.cpp @@ -87,7 +87,7 @@ InterpreterImpl::~InterpreterImpl() { // make sure we deallocate all user-data in the DOM, // this is neccesary if we were aborted early - std::list<DOMElement*> invokes = DOMUtils::filterChildElements(_xmlPrefix.str() + "invoke", _scxml, true); + std::list<DOMElement*> invokes = DOMUtils::filterChildElements(_xmlPrefix + "invoke", _scxml, true); for (auto invoke : invokes) { char* invokeId = (char*)invoke->getUserData(X("invokeid")); if (invokeId != NULL) { @@ -284,9 +284,9 @@ SCXML_STOP_SEARCH: _scxml = dynamic_cast<XERCESC_NS::DOMElement*>(scxmls->item(0)); - _xmlPrefix = _scxml->getPrefix(); - _xmlNS = _scxml->getNamespaceURI(); - if (_xmlPrefix) { + _xmlPrefix = X(_scxml->getPrefix()).str(); + _xmlNS = X(_scxml->getNamespaceURI()).str(); + if (_xmlPrefix.size() > 0) { _xmlPrefix = std::string(_xmlPrefix) + ":"; } if (HAS_ATTR(_scxml, kXMLCharName)) { @@ -467,7 +467,7 @@ Event InterpreterImpl::dequeueExternal(size_t blockMs) { if (_currEvent.invokeid.size() > 0 && _invokers.find(_currEvent.invokeid) != _invokers.end() && _invokers[_currEvent.invokeid].getFinalize() != NULL) { - _execContent.process(_invokers[_currEvent.invokeid].getFinalize(), _xmlPrefix); + _execContent.process(_invokers[_currEvent.invokeid].getFinalize()); } for (auto invIter = _invokers.begin(); invIter != _invokers.end(); invIter++) { |