From ef66cbbaf07bd1ac661f9a9622dcdaf6851ca6ba Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Mon, 23 Jan 2017 12:04:28 +0100 Subject: Fixed a case-typo and the WITH_CACHE_FILES macro --- CMakeLists.txt | 2 +- src/uscxml/interpreter/FastMicroStep.cpp | 9 +++++++-- src/uscxml/interpreter/FastMicroStep.h | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f383edc..83626b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,7 +227,7 @@ if (CURL_FOUND) " CURL_HAS_SMTP) else() message(STATUS "--> will download and compile") - include("${CMAKE_MODULE_PATH}/BuildLibCURL.cmake") + include("${CMAKE_MODULE_PATH}/BuildLibCurl.cmake") if (LIBCURL_BUILT) include_directories(${LIBCURL_INCLUDE_DIR}) list (APPEND USCXML_CORE_LIBS ${LIBCURL_LIBRARY}) diff --git a/src/uscxml/interpreter/FastMicroStep.cpp b/src/uscxml/interpreter/FastMicroStep.cpp index bf9749d..a5dcb58 100644 --- a/src/uscxml/interpreter/FastMicroStep.cpp +++ b/src/uscxml/interpreter/FastMicroStep.cpp @@ -18,6 +18,7 @@ */ #undef USCXML_VERBOSE +//#undef WITH_CACHE_FILES #include "FastMicroStep.h" #include "uscxml/util/DOM.h" @@ -288,9 +289,11 @@ void FastMicroStep::init(XERCESC_NS::DOMElement* scxml) { _states[0]->data = DOMUtils::filterChildElements(_xmlPrefix.str() + "data", dataModels, false); } +#ifdef WITH_CACHE_FILES auto currState = cache.compound["states"].array.begin(); auto endState = cache.compound["states"].array.end(); - +#endif + for (i = 0; i < _states.size(); i++) { #ifdef WITH_CACHE_FILES Data* cachedState = NULL; @@ -430,9 +433,11 @@ COMPLETION_STABLISHED: } assert(tmp.size() == 0); +#ifdef WITH_CACHE_FILES auto currTrans = cache.compound["transitions"].array.begin(); auto endTrans = cache.compound["transitions"].array.end(); - +#endif + for (i = 0; i < _transitions.size(); i++) { #ifdef WITH_CACHE_FILES diff --git a/src/uscxml/interpreter/FastMicroStep.h b/src/uscxml/interpreter/FastMicroStep.h index 97b7eeb..6c5518d 100644 --- a/src/uscxml/interpreter/FastMicroStep.h +++ b/src/uscxml/interpreter/FastMicroStep.h @@ -33,6 +33,8 @@ #include +//#undef WITH_CACHE_FILES + #ifdef _WIN32 #define BITSET_BLOCKTYPE size_t #else -- cgit v0.12