summaryrefslogtreecommitdiffstats
path: root/src/uscxml/Interpreter.h
diff options
context:
space:
mode:
authorStefan Radomski <github@mintwerk.de>2016-06-13 14:06:17 (GMT)
committerStefan Radomski <github@mintwerk.de>2016-06-13 14:06:17 (GMT)
commita17466eefe7576a2c56b8a46ff03e359c04ad5ae (patch)
tree6d4a86ad73c1cbe6fed90b83d868692f65a5548c /src/uscxml/Interpreter.h
parentd6602a2aab1dc00663bd64759f12935283b58076 (diff)
downloaduscxml-a17466eefe7576a2c56b8a46ff03e359c04ad5ae.zip
uscxml-a17466eefe7576a2c56b8a46ff03e359c04ad5ae.tar.gz
uscxml-a17466eefe7576a2c56b8a46ff03e359c04ad5ae.tar.bz2
addendum to issue84 fix for swig
Diffstat (limited to 'src/uscxml/Interpreter.h')
-rw-r--r--src/uscxml/Interpreter.h8
1 files changed, 6 insertions, 2 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.