diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-22 07:40:35 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-22 07:40:35 (GMT) |
| commit | 1e66bfd04f864a040b1e4a68f0db0f55f15b91a3 (patch) | |
| tree | c254dc899d79e0fc6962ef2d2d5dfc26de1a6766 /src/uscxml/transform/ChartToFSM.cpp | |
| parent | f9a620340ddce2a17fd775d1e210268cac13377b (diff) | |
| download | uscxml-1e66bfd04f864a040b1e4a68f0db0f55f15b91a3.zip uscxml-1e66bfd04f864a040b1e4a68f0db0f55f15b91a3.tar.gz uscxml-1e66bfd04f864a040b1e4a68f0db0f55f15b91a3.tar.bz2 | |
Builds with MSVC again
Diffstat (limited to 'src/uscxml/transform/ChartToFSM.cpp')
| -rw-r--r-- | src/uscxml/transform/ChartToFSM.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/uscxml/transform/ChartToFSM.cpp b/src/uscxml/transform/ChartToFSM.cpp index 7f38397..49519dc 100644 --- a/src/uscxml/transform/ChartToFSM.cpp +++ b/src/uscxml/transform/ChartToFSM.cpp @@ -26,6 +26,7 @@ #include <math.h> #include <string.h> #include <algorithm> +#undef max
#include <limits> namespace uscxml { @@ -499,7 +500,7 @@ void FlatteningInterpreter::explode() { int order = strTo<int>(ATTR(transitions[i], "order")); if (order < lowestOrder) lowestOrder = order; - prioPerLevel += pow(maxOrder, maxOrder - order); + prioPerLevel += pow(static_cast<double>(maxOrder), maxOrder - order); } transition->nrElemPerLevel.push_back(nrDepth); transition->firstElemPerLevel.push_back(lowestOrder); |