diff options
| -rw-r--r-- | ace/Reactor.cpp | 9 | ||||
| -rw-r--r-- | ace/Select_Reactor.h | 8 | ||||
| -rw-r--r-- | ace/Token.cpp | 11 |
3 files changed, 5 insertions, 23 deletions
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp index eb3a24a3a78..4c97be43438 100644 --- a/ace/Reactor.cpp +++ b/ace/Reactor.cpp @@ -10,7 +10,6 @@ # include "ace/Msg_WFMO_Reactor.h" #endif /* !ACE_HAS_WINCE */ #include "ace/Select_Reactor.h" -#include "ace/TP_Reactor.h" #include "ace/Object_Manager.h" #if !defined (__ACE_INLINE__) @@ -27,14 +26,8 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl) if (this->implementation () == 0) { -#if !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \ - || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \ - || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) - #if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) - ACE_NEW (impl, ACE_TP_Reactor); - #else +#if !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) ACE_NEW (impl, ACE_Select_Reactor); - #endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */ #else /* We are on Win32 and we have winsock and ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL is not defined */ #if defined (ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL) ACE_NEW (impl, ACE_Msg_WFMO_Reactor); diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h index 79ee6f90e8d..fb268c8f977 100644 --- a/ace/Select_Reactor.h +++ b/ace/Select_Reactor.h @@ -893,16 +893,16 @@ protected: // Enqueue ourselves into the list of waiting threads at the // appropriate point specified by <requeue_position_>. + friend class ACE_Select_Reactor_Notify; + friend class ACE_Select_Reactor_Handler_Repository; + +private: int release_token (void); // Release the token lock when a Win32 structured exception occurs. int handle_events_i (ACE_Time_Value *max_wait_time = 0); // Stops the VC++ compiler from bitching about exceptions and destructors - friend class ACE_Select_Reactor_Notify; - friend class ACE_Select_Reactor_Handler_Repository; - -private: ACE_Select_Reactor (const ACE_Select_Reactor &); ACE_Select_Reactor &operator = (const ACE_Select_Reactor &); // Deny access since member-wise won't work... diff --git a/ace/Token.cpp b/ace/Token.cpp index f1e4ebf1d17..c9fd7c2ed58 100644 --- a/ace/Token.cpp +++ b/ace/Token.cpp @@ -5,10 +5,6 @@ #include "ace/Thread.h" #include "ace/Token.h" -#if defined (DEBUGGING) -#include "ace/streams.h" -#endif /* DEBUGGING */ - #if defined (ACE_HAS_THREADS) #if !defined (__ACE_INLINE__) @@ -18,7 +14,6 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Token) - void ACE_Token::dump (void) const { @@ -97,8 +92,6 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *), cerr << '(' << ACE_Thread::self () << ')' << " acquire: owner_ = " << this->owner_ << ", owner_ addr = " << &this->owner_ - << ", waiters_ = " << this->waiters_ - << ", in_use_ = " << this->in_use_ << ", nesting level = " << this->nesting_level_ << endl; #endif /* DEBUGGING */ @@ -227,8 +220,6 @@ ACE_Token::renew (int requeue_position, ACE_Time_Value *timeout) cerr << '(' << ACE_Thread::self () << ')' << " renew: owner_ thr = " << this->owner_ << ", owner_ addr = " << &this->owner_ - << ", waiters_ = " << this->waiters_ - << ", in_use_ = " << this->in_use_ << ", nesting level = " << this->nesting_level_ << endl; #endif /* DEBUGGING */ ACE_ASSERT (ACE_OS::thr_equal (ACE_Thread::self (), this->owner_)); @@ -322,8 +313,6 @@ ACE_Token::release (void) cerr << '(' << ACE_Thread::self () << ')' << " release: owner_ thr = " << this->owner_ << ", owner_ addr = " << &this->owner_ - << ", waiters_ = " << this->waiters_ - << ", in_use_ = " << this->in_use_ << ", nesting level = " << this->nesting_level_ << endl; #endif /* DEBUGGING */ |