diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-06-28 19:26:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 19:26:36 (GMT) |
| commit | 7838934e81e66953eb39bb349853e1f379ab118a (patch) | |
| tree | d9c71a8c609363343b22b7a0cecf90b2400358ec | |
| parent | e24393f41834f116038faf6c6d5012575a67136a (diff) | |
| parent | 04a05dfd23ff9ab42270b7690cf0cd472068bbf1 (diff) | |
| download | uscxml-7838934e81e66953eb39bb349853e1f379ab118a.zip uscxml-7838934e81e66953eb39bb349853e1f379ab118a.tar.gz uscxml-7838934e81e66953eb39bb349853e1f379ab118a.tar.bz2 | |
Merge pull request #151 from alexzhornyak/master
Fixes issue #147 and bug with invoke callback message
| -rw-r--r-- | src/uscxml/interpreter/BasicContentExecutor.cpp | 4 | ||||
| -rw-r--r-- | src/uscxml/util/Convenience.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp index 8d278ec..fb6f52e 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) { diff --git a/src/uscxml/util/Convenience.h b/src/uscxml/util/Convenience.h index 35abf12..e3bdb9e 100644 --- a/src/uscxml/util/Convenience.h +++ b/src/uscxml/util/Convenience.h @@ -32,6 +32,7 @@ inline bool isnan(double x); template <typename T> std::string toStr(T tmp) { std::ostringstream outSS; outSS.precision(std::numeric_limits<double>::digits10 + 1); + outSS.imbue(std::locale("C")); outSS << tmp; return outSS.str(); } @@ -39,6 +40,7 @@ template <typename T> std::string toStr(T tmp) { template <typename T> T strTo(std::string tmp) { T output; std::istringstream in(tmp); + in.imbue(std::locale("C")); in >> output; return output; } |