summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/uscxml/plugins')
-rw-r--r--src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp6
-rw-r--r--src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
index ad35f80..fccc5f0 100644
--- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
@@ -24,10 +24,16 @@
#include "LuaDataModel.h"
// disable forcing to bool performance warning
+#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4800)
+#endif
+
#include "LuaBridge.h"
+
+#ifdef _MSC_VER
#pragma warning(pop)
+#endif
#include "uscxml/messages/Event.h"
#include "uscxml/util/DOM.h"
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
index 44b975e..b035993 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
@@ -184,6 +184,7 @@ void USCXMLInvoker::invoke(const std::string& source, const Event& invokeEvent)
InterpreterImpl* invoked = _invokedInterpreter.getImpl().get();
ActionLanguage al = _callbacks->getActionLanguage();
+ // create new instances
al.execContent = al.execContent.getImpl()->create(invoked);
al.delayQueue = al.delayQueue.getImplDelayed()->create(invoked);
al.internalQueue = al.internalQueue.getImplBase()->create();