diff options
author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-07 01:36:10 +0000 |
---|---|---|
committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-07 01:36:10 +0000 |
commit | 8a90cdcfe8d8e33c83baa847cbd8c36f56561218 (patch) | |
tree | 6acd1f92911b3db8e1af16e1d90feab8264ca378 /ace | |
parent | b95459d6b93c3474ffd643675ef32726fdc12a64 (diff) | |
download | ATCD-8a90cdcfe8d8e33c83baa847cbd8c36f56561218.tar.gz |
ChangeLogTag:Sun Jun 6 20:34:40 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'ace')
-rw-r--r-- | ace/Select_Reactor.cpp | 2 | ||||
-rw-r--r-- | ace/Synch.h | 3 | ||||
-rw-r--r-- | ace/Timer_Queue.cpp | 5 | ||||
-rw-r--r-- | ace/Timer_Queue_T.h | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/ace/Select_Reactor.cpp b/ace/Select_Reactor.cpp index 863f2512e47..e027f474083 100644 --- a/ace/Select_Reactor.cpp +++ b/ace/Select_Reactor.cpp @@ -25,7 +25,6 @@ template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>; template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >; template class ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >; # endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -template class ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # if defined (ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION) @@ -44,5 +43,4 @@ template class ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX # pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > # pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > # endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#pragma instantiate ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Synch.h b/ace/Synch.h index a15155352d1..d3d42b7f7af 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -1564,6 +1564,7 @@ public: template <class ACE_LOCK> class ACE_Guard; +ACE_TEMPLATE_SPECIALIZATION class ACE_Export ACE_Guard<ACE_Null_Mutex> { // = TITLE @@ -1597,6 +1598,7 @@ private: template <class ACE_LOCK> class ACE_Write_Guard; +ACE_TEMPLATE_SPECIALIZATION class ACE_Export ACE_Write_Guard<ACE_Null_Mutex> : public ACE_Guard<ACE_Null_Mutex> { // = TITLE @@ -1616,6 +1618,7 @@ public: template <class ACE_LOCK> class ACE_Read_Guard; +ACE_TEMPLATE_SPECIALIZATION class ACE_Export ACE_Read_Guard<ACE_Null_Mutex> : public ACE_Guard<ACE_Null_Mutex> { // = TITLE diff --git a/ace/Timer_Queue.cpp b/ace/Timer_Queue.cpp index ddbbff88021..635435d6141 100644 --- a/ace/Timer_Queue.cpp +++ b/ace/Timer_Queue.cpp @@ -42,13 +42,18 @@ template class ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<ACE_Event_Handler *> template class ACE_Timer_Node_T<ACE_Event_Handler *>; template class ACE_Timer_Queue_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>; template class ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>; +template class ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + #pragma instantiate ACE_Unbounded_Set<ACE_Timer_Node_T<ACE_Event_Handler *> *> #pragma instantiate ACE_Node<ACE_Timer_Node_T<ACE_Event_Handler *> *> #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<ACE_Event_Handler *> *> #pragma instantiate ACE_Timer_Node_T<ACE_Event_Handler *> #pragma instantiate ACE_Timer_Queue_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX> #pragma instantiate ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX> +#pragma instantiate ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h index 2f60778cc3f..9c619b6ac9f 100644 --- a/ace/Timer_Queue_T.h +++ b/ace/Timer_Queue_T.h @@ -229,12 +229,12 @@ public: // This does not account for <timer_skew>. Returns the number of // timers canceled. - virtual int expire (void); + /* virtual */ int expire (void); // Run the <functor> for all timers whose values are <= // <ACE_OS::gettimeofday>. Also accounts for <timer_skew>. Returns // the number of timers canceled. - virtual ACE_Time_Value gettimeofday (void); + /* virtual */ ACE_Time_Value gettimeofday (void); // Returns the current time of day. This allows different // implementations of the timer queue to use special high resolution // timers. @@ -281,7 +281,7 @@ public: // after it is returned by a method like remove_first () protected: - virtual void upcall (TYPE &type, + /* virtual */ void upcall (TYPE &type, const void *act, const ACE_Time_Value &cur_time); // This method will call the <functor> with the <type>, <act> and |