diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | contrib/local/compress_and_upload_deps.sh | 2 | ||||
| -rw-r--r-- | src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 26ed9dc..0682f47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.4) # specify USCXML version SET(USCXML_VERSION_MAJOR "0") SET(USCXML_VERSION_MINOR "1") -SET(USCXML_VERSION_PATCH "0") +SET(USCXML_VERSION_PATCH "1") SET(USCXML_VERSION ${USCXML_VERSION_MAJOR}.${USCXML_VERSION_MINOR}.${USCXML_VERSION_PATCH}) # build type has to be set before the project definition4 diff --git a/contrib/local/compress_and_upload_deps.sh b/contrib/local/compress_and_upload_deps.sh index 49b3949..a9d3936 100755 --- a/contrib/local/compress_and_upload_deps.sh +++ b/contrib/local/compress_and_upload_deps.sh @@ -31,7 +31,7 @@ cd ../prebuilt ssh ${USCXML_PREBUILT_HOST} mkdir -p ${USCXML_PREBUILT_PATH}/${VERSION} PLATFORMS=`find . -maxdepth 1 -type d -regex ./[^\.].*` -PLATFORMS="windows-x86_64" +#PLATFORMS="windows-x86_64" for FILE in ${PLATFORMS}; do PLATFORM=`basename $FILE` if [ "$PLATFORM" != "include" ]; then diff --git a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp index b29c9ca..46c12e4 100644 --- a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp +++ b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp @@ -50,12 +50,11 @@ void DelayedEventQueue::run(void* instance) { DelayedEventQueue* INSTANCE = (DelayedEventQueue*)instance; int result; while(INSTANCE->_isStarted) { -#ifndef EVLOOP_NO_EXIT_ON_EMPTY - result = event_base_dispatch(INSTANCE->_eventLoop); -#else - //result = event_base_dispatch(THIS->_eventLoop); +// #ifndef EVLOOP_NO_EXIT_ON_EMPTY +// result = event_base_dispatch(INSTANCE->_eventLoop); +// #else result = event_base_loop(INSTANCE->_eventLoop, EVLOOP_NO_EXIT_ON_EMPTY); -#endif +//#endif (void)result; } } |