diff options
author | Stefan Radomski <github@mintwerk.de> | 2017-01-23 22:31:54 (GMT) |
---|---|---|
committer | Stefan Radomski <github@mintwerk.de> | 2017-01-23 22:31:54 (GMT) |
commit | 24ac6c39a89f5b94ede80b745f68ea5f0b762640 (patch) | |
tree | 2a32c53a43caab1358cf9b66ff3bb0819c3d1b60 /src/uscxml/plugins/invoker/scxml | |
parent | b8a20c656537e4be748c3485d2c9541bd51e2b3d (diff) | |
download | uscxml-24ac6c39a89f5b94ede80b745f68ea5f0b762640.zip uscxml-24ac6c39a89f5b94ede80b745f68ea5f0b762640.tar.gz uscxml-24ac6c39a89f5b94ede80b745f68ea5f0b762640.tar.bz2 |
Made GCC/CLang pedantic and fixed warnings
Diffstat (limited to 'src/uscxml/plugins/invoker/scxml')
-rw-r--r-- | src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp index e776022..44b975e 100644 --- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp @@ -176,30 +176,30 @@ void USCXMLInvoker::invoke(const std::string& source, const Event& invokeEvent) if (_invokedInterpreter) { _invokedInterpreter.getImpl()->_parentQueue = _parentQueue; _invokedInterpreter.getImpl()->_invokeId = invokeEvent.invokeid; - - // test240 assumes that invoke request params will carry over to the datamodel + + // test240 assumes that invoke request params will carry over to the datamodel _invokedInterpreter.getImpl()->_invokeReq = invokeEvent; // create new instances from the parent's ActionLanguage InterpreterImpl* invoked = _invokedInterpreter.getImpl().get(); - ActionLanguage al = _callbacks->getActionLanguage(); - - al.execContent = al.execContent.getImpl()->create(invoked); - al.delayQueue = al.delayQueue.getImplDelayed()->create(invoked); - al.internalQueue = al.internalQueue.getImplBase()->create(); - al.externalQueue = al.externalQueue.getImplBase()->create(); - al.microStepper = al.microStepper.getImpl()->create(invoked); - - _invokedInterpreter.setActionLanguage(al); - // TODO: setup invokers dom, check datamodel attribute and create new instance from parent if matching? - - // copy monitors - std::set<InterpreterMonitor*> monitors = _callbacks->getMonitors(); - for (auto monitor : monitors) { - if (monitor->copyToInvokers()) { - _invokedInterpreter.getImpl()->_monitors.insert(monitor); - } - } + ActionLanguage al = _callbacks->getActionLanguage(); + + al.execContent = al.execContent.getImpl()->create(invoked); + al.delayQueue = al.delayQueue.getImplDelayed()->create(invoked); + al.internalQueue = al.internalQueue.getImplBase()->create(); + al.externalQueue = al.externalQueue.getImplBase()->create(); + al.microStepper = al.microStepper.getImpl()->create(invoked); + + _invokedInterpreter.setActionLanguage(al); + // TODO: setup invokers dom, check datamodel attribute and create new instance from parent if matching? + + // copy monitors + std::set<InterpreterMonitor*> monitors = _callbacks->getMonitors(); + for (auto monitor : monitors) { + if (monitor->copyToInvokers()) { + _invokedInterpreter.getImpl()->_monitors.insert(monitor); + } + } _isActive = true; |