diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | ace/Select_Reactor.cpp | 22 | ||||
| -rw-r--r-- | ace/Select_Reactor_Base.h | 5 | ||||
| -rw-r--r-- | ace/Select_Reactor_T.cpp | 8 |
6 files changed, 31 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog index f33520b240d..781ba79dc52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Feb 26 00:38:50 2002 UTC Don Hinton <dhinton@ieee.org> + + * ace/Select_Reactor_Base.h: + * ace/Select_Reactor.cpp: + * ace/Select_Reactor_T.cpp: + + Removed ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION since + it isn't used. + Tue Feb 26 22:54:50 2002 UTC Don Hinton <dhinton@ieee.org> * ace/Synch.i (ACE_Noop_Token::queueing_strategy): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index f33520b240d..781ba79dc52 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Wed Feb 26 00:38:50 2002 UTC Don Hinton <dhinton@ieee.org> + + * ace/Select_Reactor_Base.h: + * ace/Select_Reactor.cpp: + * ace/Select_Reactor_T.cpp: + + Removed ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION since + it isn't used. + Tue Feb 26 22:54:50 2002 UTC Don Hinton <dhinton@ieee.org> * ace/Synch.i (ACE_Noop_Token::queueing_strategy): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f33520b240d..781ba79dc52 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,12 @@ +Wed Feb 26 00:38:50 2002 UTC Don Hinton <dhinton@ieee.org> + + * ace/Select_Reactor_Base.h: + * ace/Select_Reactor.cpp: + * ace/Select_Reactor_T.cpp: + + Removed ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION since + it isn't used. + Tue Feb 26 22:54:50 2002 UTC Don Hinton <dhinton@ieee.org> * ace/Synch.i (ACE_Noop_Token::queueing_strategy): diff --git a/ace/Select_Reactor.cpp b/ace/Select_Reactor.cpp index fe5be69789f..168b2cc969b 100644 --- a/ace/Select_Reactor.cpp +++ b/ace/Select_Reactor.cpp @@ -7,17 +7,10 @@ ACE_RCSID(ace, Select_Reactor, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -# if defined (ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION) -template class ACE_Select_Reactor_Token_T<ACE_Local_Mutex>; -template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Local_Mutex> >; -template class ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Local_Mutex> >; -template class ACE_Guard< ACE_Select_Reactor_Token_T<ACE_Local_Mutex> >; -# else template class ACE_Select_Reactor_Token_T<ACE_Token>; template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Token> >; template class ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Token> >; template class ACE_Guard< ACE_Select_Reactor_Token_T<ACE_Token> >; -# endif /* ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION */ # else template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>; template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >; @@ -25,17 +18,10 @@ template class ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >; # endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -# if defined (ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION) -# pragma instantiate ACE_Select_Reactor_Token_T<ACE_Local_Mutex> -# pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Local_Mutex> > -# pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Local_Mutex> > -# pragma instantiate ACE_Guard< ACE_Select_Reactor_Token_T<ACE_Local_Mutex> > -# else -# pragma instantiate ACE_Select_Reactor_Token_T<ACE_Token> -# pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Token> > -# pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Token> > -# pragma instantiate ACE_Guard< ACE_Select_Reactor_Token_T<ACE_Token> > -# endif /* ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION */ +# pragma instantiate ACE_Select_Reactor_Token_T<ACE_Token> +# pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Token> > +# pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Token> > +# pragma instantiate ACE_Guard< ACE_Select_Reactor_Token_T<ACE_Token> > # else # pragma instantiate ACE_Select_Reactor_Token_T<ACE_Noop_Token> # pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h index 3ef9935c086..9c088d1d1d9 100644 --- a/ace/Select_Reactor_Base.h +++ b/ace/Select_Reactor_Base.h @@ -36,12 +36,7 @@ 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 */ diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 3790c37e474..a932f29f25b 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -202,11 +202,7 @@ ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::ACE_Select_Reactor_Token_T { ACE_TRACE ("ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token"); -#if defined (ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION) - ACE_UNUSED_ARG (s_queue); -#else this->queueing_strategy (s_queue); -#endif } template <class ACE_SELECT_REACTOR_MUTEX> @@ -215,11 +211,7 @@ ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::ACE_Select_Reactor_Token_T { ACE_TRACE ("ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token"); -#if defined (ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION) - ACE_UNUSED_ARG (s_queue); -#else this->queueing_strategy (s_queue); -#endif } template <class ACE_SELECT_REACTOR_MUTEX> |