summaryrefslogtreecommitdiffstats
path: root/src/uscxml/interpreter
diff options
context:
space:
mode:
authorStefan Radomski <github@mintwerk.de>2017-07-05 08:36:10 (GMT)
committerStefan Radomski <github@mintwerk.de>2017-07-05 08:36:10 (GMT)
commita0f96c5dd050c524223ac644ba8798bc7cc80bfd (patch)
tree66d378d1df7cb82834e944a1f37865809abf75ae /src/uscxml/interpreter
parent89c801bf390f928d173b2dcf1118f3437c9a08f0 (diff)
parent3f10e11d6ad2b97fee4aee6e09bc959ba9b8e0e5 (diff)
downloaduscxml-a0f96c5dd050c524223ac644ba8798bc7cc80bfd.zip
uscxml-a0f96c5dd050c524223ac644ba8798bc7cc80bfd.tar.gz
uscxml-a0f96c5dd050c524223ac644ba8798bc7cc80bfd.tar.bz2
Merge remote-tracking branch 'origin/master' into sradomski
Diffstat (limited to 'src/uscxml/interpreter')
-rw-r--r--src/uscxml/interpreter/BasicContentExecutor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp
index 004eea9..5344957 100644
--- a/src/uscxml/interpreter/BasicContentExecutor.cpp
+++ b/src/uscxml/interpreter/BasicContentExecutor.cpp
@@ -501,9 +501,9 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) {
finalize = finalizes.front();
}
- USCXML_MONITOR_CALLBACK2(_callbacks->getMonitors(), beforeUninvoking, element, invokeEvent.invokeid);
+ USCXML_MONITOR_CALLBACK2(_callbacks->getMonitors(), beforeInvoking, element, invokeEvent.invokeid);
_callbacks->invoke(type, source, autoForward, finalize, invokeEvent);
- USCXML_MONITOR_CALLBACK2(_callbacks->getMonitors(), afterUninvoking, element, invokeEvent.invokeid);
+ USCXML_MONITOR_CALLBACK2(_callbacks->getMonitors(), afterInvoking, element, invokeEvent.invokeid);
}
void BasicContentExecutor::uninvoke(XERCESC_NS::DOMElement* invoke) {