diff options
author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-02-25 17:25:39 +0000 |
---|---|---|
committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-02-25 17:25:39 +0000 |
commit | 50bb68e0fa9d8cff15c36b66733523fe42237dd8 (patch) | |
tree | a96a6d5bda61df5ee0cb7fa79d2a792db4eb1c4e /ace | |
parent | e10b5639897814e525781970a7e950ac339156d3 (diff) | |
download | ATCD-50bb68e0fa9d8cff15c36b66733523fe42237dd8.tar.gz |
ChangeLogTag:Mon Feb 25 17:17:37 2002 UTC Don Hinton <dhinton@ieee/org>
Diffstat (limited to 'ace')
-rw-r--r-- | ace/Select_Reactor.h | 11 | ||||
-rw-r--r-- | ace/Select_Reactor_Base.h | 11 | ||||
-rw-r--r-- | ace/Select_Reactor_T.h | 9 |
3 files changed, 17 insertions, 14 deletions
diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h index ab94d6c7f40..3a490c82ae2 100644 --- a/ace/Select_Reactor.h +++ b/ace/Select_Reactor.h @@ -20,16 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -#if defined (ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION) -#include "ace/Local_Tokens.h" -typedef ACE_Select_Reactor_Token_T<ACE_Local_Mutex> ACE_Select_Reactor_Token; -#else -typedef ACE_Select_Reactor_Token_T<ACE_Token> ACE_Select_Reactor_Token; -#endif /* ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION */ -#else -typedef ACE_Select_Reactor_Token_T<ACE_Noop_Token> ACE_Select_Reactor_Token; -#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ +typedef ACE_Select_Reactor_Token_T<ACE_SELECT_TOKEN> ACE_Select_Reactor_Token; typedef ACE_Select_Reactor_T<ACE_Select_Reactor_Token> ACE_Select_Reactor; ACE_TEMPLATE_SPECIALIZATION diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h index 62c2bec4f50..3ef9935c086 100644 --- a/ace/Select_Reactor_Base.h +++ b/ace/Select_Reactor_Base.h @@ -35,6 +35,17 @@ typedef void (ACE_Handle_Set::*ACE_FDS_PTMF) (ACE_HANDLE); typedef int (ACE_Event_Handler::*ACE_EH_PTMF) (ACE_HANDLE); +#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +#if defined (ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION) +#include "ace/Local_Tokens.h" +typedef ACE_Local_Mutex ACE_SELECT_TOKEN; +#else +typedef ACE_Token ACE_SELECT_TOKEN; +#endif /* ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION */ +#else +typedef ACE_Noop_Token ACE_SELECT_TOKEN; +#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ + // Forward declaration. class ACE_Select_Reactor_Impl; diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h index 27c1d2f2910..4ecaa62d6d2 100644 --- a/ace/Select_Reactor_T.h +++ b/ace/Select_Reactor_T.h @@ -72,8 +72,8 @@ class ACE_Select_Reactor_Token_T : public ACE_SELECT_REACTOR_MUTEX public: ACE_Select_Reactor_Token_T (ACE_Select_Reactor_Impl &r, - int s_queue = ACE_SELECT_REACTOR_MUTEX::FIFO); - ACE_Select_Reactor_Token_T (int s_queue = ACE_SELECT_REACTOR_MUTEX::FIFO); + int s_queue = ACE_SELECT_TOKEN::FIFO); + ACE_Select_Reactor_Token_T (int s_queue = ACE_SELECT_TOKEN::FIFO); virtual ~ACE_Select_Reactor_Token_T (void); /// Called just before the ACE_Event_Handler goes to sleep. @@ -111,6 +111,7 @@ template <class ACE_SELECT_REACTOR_TOKEN> class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl { public: + // = Initialization and termination methods. /// If <disable_notify_pipe> is non-0 then the reactor will @@ -125,7 +126,7 @@ public: int disable_notify_pipe = 0, ACE_Reactor_Notify *notify = 0, int mask_signals = 1, - int s_queue = ACE_SELECT_REACTOR_TOKEN::FIFO); + int s_queue = ACE_SELECT_TOKEN::FIFO); /// Initialize @c ACE_Select_Reactor with size @arg size. /// If @arg disable_notify_pipe is non-0 then the reactor will @@ -150,7 +151,7 @@ public: int disable_notify_pipe = 0, ACE_Reactor_Notify *notify = 0, int mask_signals = 1, - int s_queue = ACE_SELECT_REACTOR_TOKEN::FIFO); + int s_queue = ACE_SELECT_TOKEN::FIFO); /** * Initialize the @c ACE_Select_Reactor to manage |