diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-07-05 08:36:10 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-07-05 08:36:10 (GMT) |
| commit | a0f96c5dd050c524223ac644ba8798bc7cc80bfd (patch) | |
| tree | 66d378d1df7cb82834e944a1f37865809abf75ae | |
| parent | 89c801bf390f928d173b2dcf1118f3437c9a08f0 (diff) | |
| parent | 3f10e11d6ad2b97fee4aee6e09bc959ba9b8e0e5 (diff) | |
| download | uscxml-a0f96c5dd050c524223ac644ba8798bc7cc80bfd.zip uscxml-a0f96c5dd050c524223ac644ba8798bc7cc80bfd.tar.gz uscxml-a0f96c5dd050c524223ac644ba8798bc7cc80bfd.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into sradomski
| -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 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) { 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; } |