diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2012-11-07 22:20:09 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2012-11-07 22:20:09 (GMT) |
| commit | da08a1d3c3bca8070c9b029cfc1f8faf9e34dd25 (patch) | |
| tree | b285148ab6ca415814d9370148f91736f83c852c /src/uscxml/concurrency | |
| parent | 0ae6c27d9322208053033d9b19c0ffffed3d99eb (diff) | |
| download | uscxml-da08a1d3c3bca8070c9b029cfc1f8faf9e34dd25.zip uscxml-da08a1d3c3bca8070c9b029cfc1f8faf9e34dd25.tar.gz uscxml-da08a1d3c3bca8070c9b029cfc1f8faf9e34dd25.tar.bz2 | |
Committing local version again
Diffstat (limited to 'src/uscxml/concurrency')
| -rw-r--r-- | src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp | 8 | ||||
| -rw-r--r-- | src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp b/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp index c5e7c3b..170e5d9 100644 --- a/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp +++ b/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp @@ -5,7 +5,11 @@ namespace uscxml { DelayedEventQueue::DelayedEventQueue() { - evthread_use_pthreads(); +#ifndef _WIN32 + evthread_use_pthreads(); +#else + evthread_use_windows_threads(); +#endif _eventLoop = event_base_new(); _thread = NULL; } @@ -80,8 +84,8 @@ namespace uscxml { std::string eventId = data->eventId; // copy eventId event_free(data->event); - data->eventQueue->_callbackData.erase(data->eventId); data->callback(data->userData, eventId); + data->eventQueue->_callbackData.erase(data->eventId); } }
\ No newline at end of file diff --git a/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.h b/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.h index 4c59ce1..024e353 100644 --- a/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.h +++ b/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.h @@ -7,6 +7,8 @@ #include <event2/http.h> #include <event2/event.h> +#include <inttypes.h> + #include <map> #include <string> #include <iostream> |