diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-07 23:13:54 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-07 23:13:54 (GMT) |
| commit | 36b5c7614cc896d043ddeebae1cdb4e8e94afe18 (patch) | |
| tree | e14ac52189363b252aa8ea10fdd66efef069d665 /src/uscxml/concurrency | |
| parent | 567df9318fff6d1bb570191c33ea68cd6ef88bee (diff) | |
| download | uscxml-36b5c7614cc896d043ddeebae1cdb4e8e94afe18.zip uscxml-36b5c7614cc896d043ddeebae1cdb4e8e94afe18.tar.gz uscxml-36b5c7614cc896d043ddeebae1cdb4e8e94afe18.tar.bz2 | |
Reduced compile times
- new commandline argument handling
- compiles on windows again
Diffstat (limited to 'src/uscxml/concurrency')
| -rw-r--r-- | src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp | 12 | ||||
| -rw-r--r-- | src/uscxml/concurrency/eventqueue/DelayedEventQueue.h | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp index cbb82eb..fe16361 100644 --- a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp +++ b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp @@ -26,14 +26,12 @@ DelayedEventQueue::~DelayedEventQueue() { } void DelayedEventQueue::run(void* instance) { - DelayedEventQueue* THIS = (DelayedEventQueue*)instance; + DelayedEventQueue* INSTANCE = (DelayedEventQueue*)instance; int result; - while(THIS->_isStarted) { - { - //result = event_base_dispatch(THIS->_eventLoop); - result = event_base_loop(THIS->_eventLoop, EVLOOP_NO_EXIT_ON_EMPTY); - (void)result; - } + while(INSTANCE->_isStarted) { + //result = event_base_dispatch(THIS->_eventLoop); + result = event_base_loop(INSTANCE->_eventLoop, EVLOOP_NO_EXIT_ON_EMPTY); + (void)result; } } diff --git a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h index 0b72719..fa76c3f 100644 --- a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h +++ b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.h @@ -19,9 +19,9 @@ class DelayedEventQueue { public: enum OpMask { - FD_READ = EV_READ, - FD_WRITE = EV_WRITE, - FD_SIGNAL = EV_SIGNAL + DEQ_READ = EV_READ, + DEQ_WRITE = EV_WRITE, + DEQ_SIGNAL = EV_SIGNAL }; struct callbackData { |