diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-10-23 14:56:46 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-10-23 14:56:46 +0200 |
| commit | c53cccafe9907d2d110ae2c2055d903316b17b02 (patch) | |
| tree | a434bb8856ecdfb64a4a5527a27b46e25b659102 /ACE/ace | |
| parent | 09d2c2817ef061a651026aebafa1357136b7b239 (diff) | |
| download | ATCD-c53cccafe9907d2d110ae2c2055d903316b17b02.tar.gz | |
Layout change
* ACE/ace/TP_Reactor.inl:
* ACE/ace/WFMO_Reactor.cpp:
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/TP_Reactor.inl | 1 | ||||
| -rw-r--r-- | ACE/ace/WFMO_Reactor.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ACE/ace/TP_Reactor.inl b/ACE/ace/TP_Reactor.inl index fc712b13c68..1660925ee3c 100644 --- a/ACE/ace/TP_Reactor.inl +++ b/ACE/ace/TP_Reactor.inl @@ -52,7 +52,6 @@ ACE_EH_Dispatch_Info::dispatch () const ACE_INLINE ACE_TP_Token_Guard::ACE_TP_Token_Guard (ACE_Select_Reactor_Token &token) - : token_ (token), owner_ (false) { diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index f5d7943bab4..a5ba55009c1 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1896,12 +1896,12 @@ ACE_WFMO_Reactor::calculate_timeout (ACE_Time_Value *max_wait_time) return time->msec (); } - int -ACE_WFMO_Reactor::expire_timers (void) +ACE_WFMO_Reactor::expire_timers () { // If "owner" thread if (ACE_Thread::self () == this->owner_) + // expire all pending timers. return this->timer_queue_->expire (); |