summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/uscxml/Interpreter.h8
-rw-r--r--src/uscxml/interpreter/FastMicroStep.h1
-rw-r--r--src/uscxml/transform/ChartToC.cpp2
3 files changed, 8 insertions, 3 deletions
diff --git a/src/uscxml/Interpreter.h b/src/uscxml/Interpreter.h
index 365289f..4dbefd8 100644
--- a/src/uscxml/Interpreter.h
+++ b/src/uscxml/Interpreter.h
@@ -32,6 +32,10 @@
#include "uscxml/interpreter/ContentExecutor.h"
#include "uscxml/interpreter/InterpreterState.h"
+#ifdef max
+#error define NOMINMAX or undefine the max macro please (https://support.microsoft.com/en-us/kb/143208)
+#endif
+
namespace uscxml {
class InterpreterMonitor;
@@ -153,7 +157,7 @@ public:
*/
PIMPL_OPERATORS(Interpreter);
- /**
+ /**
* Advance the state-machine by a single microstep and return.
*
* This is the central function to drive the state machine. Calling step()
@@ -166,7 +170,7 @@ public:
* @param blockMs The maximum duration in milli-seconds to wait for an event to become available.
* @return The new state of the interpreter object.
*/
- InterpreterState step(size_t blockMs = (std::numeric_limits<size_t>::max)());
+ InterpreterState step(size_t blockMs = std::numeric_limits<size_t>::max());
/**
* Unblock and mark for finalize.
diff --git a/src/uscxml/interpreter/FastMicroStep.h b/src/uscxml/interpreter/FastMicroStep.h
index b2477ee..a3cdf9c 100644
--- a/src/uscxml/interpreter/FastMicroStep.h
+++ b/src/uscxml/interpreter/FastMicroStep.h
@@ -23,6 +23,7 @@
//#define USCXML_VERBOSE 1
#include "uscxml/config.h"
+#include "uscxml/Common.h"
#include "uscxml/util/DOM.h" // X
#include <vector>
diff --git a/src/uscxml/transform/ChartToC.cpp b/src/uscxml/transform/ChartToC.cpp
index d7537ea..b76d4da 100644
--- a/src/uscxml/transform/ChartToC.cpp
+++ b/src/uscxml/transform/ChartToC.cpp
@@ -73,7 +73,7 @@ void ChartToC::setHistoryCompletion() {
std::list<DOMElement*> covered;
std::list<DOMElement*> perParentcovered;
- DOMNode* parent;
+ DOMNode* parent = NULL;
for (auto histIter = histories.begin(); histIter != histories.end(); histIter++) {
DOMElement* history = *histIter;