diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-12-09 12:25:11 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-12-09 12:25:11 (GMT) |
| commit | 9b8e09c3fde755ec26e5c21b9640f53ed9329d05 (patch) | |
| tree | c7001e5bfc551a24e3cee0b3fb014791e0685b44 /src/uscxml/transform | |
| parent | 9fae96bbf295fcd867d60bf45d9c3b825ae692c2 (diff) | |
| download | uscxml-9b8e09c3fde755ec26e5c21b9640f53ed9329d05.zip uscxml-9b8e09c3fde755ec26e5c21b9640f53ed9329d05.tar.gz uscxml-9b8e09c3fde755ec26e5c21b9640f53ed9329d05.tar.bz2 | |
Removed easylogging due to JNI segfaults
Diffstat (limited to 'src/uscxml/transform')
| -rw-r--r-- | src/uscxml/transform/ChartToC.cpp | 2 | ||||
| -rw-r--r-- | src/uscxml/transform/ChartToJava.cpp | 2 | ||||
| -rw-r--r-- | src/uscxml/transform/ChartToPromela.cpp | 9 | ||||
| -rw-r--r-- | src/uscxml/transform/ChartToVHDL.cpp | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/uscxml/transform/ChartToC.cpp b/src/uscxml/transform/ChartToC.cpp index 10eee0c..932ac73 100644 --- a/src/uscxml/transform/ChartToC.cpp +++ b/src/uscxml/transform/ChartToC.cpp @@ -26,7 +26,7 @@ #include "uscxml/util/String.h" #include <math.h> #include <boost/algorithm/string.hpp> -#include <easylogging++.h> +#include "uscxml/interpreter/Logging.h" #include <algorithm> #include <iomanip> diff --git a/src/uscxml/transform/ChartToJava.cpp b/src/uscxml/transform/ChartToJava.cpp index f31db71..8d4d61e 100644 --- a/src/uscxml/transform/ChartToJava.cpp +++ b/src/uscxml/transform/ChartToJava.cpp @@ -22,7 +22,7 @@ #include "uscxml/util/String.h" #include <boost/algorithm/string.hpp> -#include <easylogging++.h> +#include "uscxml/interpreter/Logging.h" #include <algorithm> namespace uscxml { diff --git a/src/uscxml/transform/ChartToPromela.cpp b/src/uscxml/transform/ChartToPromela.cpp index 5dcf9f0..a140386 100644 --- a/src/uscxml/transform/ChartToPromela.cpp +++ b/src/uscxml/transform/ChartToPromela.cpp @@ -24,19 +24,20 @@ #include "uscxml/plugins/datamodel/promela/parser/promela.tab.hpp" #include <boost/algorithm/string.hpp> -#include <easylogging++.h> +#include "uscxml/interpreter/Logging.h" #include <algorithm> +#include <cmath> #define ADAPT_SRC(code) _analyzer->adaptCode(code, _prefix) -#define BIT_WIDTH(number) (number > 1 ? (int)ceil(log((double)number) / log((double)2.0)) : 1) +#define BIT_WIDTH(number) (number > 1 ? (int)ceil(log2((double)number)) : 1) #define EVENT_NAME (_analyzer->usesComplexEventStruct() ? "_event.name" : "_event") #define TMP_EVENT_NAME (_analyzer->usesComplexEventStruct() ? "_tmpE.name" : "_tmpE") #define MAX(X,Y) ((X) > (Y) ? (X) : (Y)) -#define TRACE +#define TRACE_PML -#ifdef TRACE +#ifdef TRACE_PML #define TRACE_EXECUTION_V(fmt, ...) \ stream << std::endl; \ stream << "#if TRACE_EXECUTION" << std::endl; \ diff --git a/src/uscxml/transform/ChartToVHDL.cpp b/src/uscxml/transform/ChartToVHDL.cpp index a55a4ca..4922f22 100644 --- a/src/uscxml/transform/ChartToVHDL.cpp +++ b/src/uscxml/transform/ChartToVHDL.cpp @@ -24,7 +24,7 @@ #include <math.h> #include <boost/algorithm/string.hpp> -#include <easylogging++.h> +#include "uscxml/interpreter/Logging.h" #include <iostream> #include <algorithm> |