diff options
| -rw-r--r-- | ChangeLog-98b | 10 | ||||
| -rw-r--r-- | ace/Timer_Hash_T.cpp | 2 | ||||
| -rw-r--r-- | ace/Timer_Hash_T.h | 3 | ||||
| -rw-r--r-- | ace/Timer_Heap_T.cpp | 4 | ||||
| -rw-r--r-- | ace/Timer_Wheel_T.cpp | 6 |
5 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 314b37a6889..8a5d2111806 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,3 +1,13 @@ +Thu May 7 14:10:41 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/Timer_Hash_T.h: + * ace/Timer_Hash_T.cpp: + * ace/Timer_Heap_T.cpp: + * ace/Timer_Wheel_T.cpp: + The classes had a INHERITED typedef for the base class, but + Solaris defines a macro by the same name. This causes very weird + problems with EGCS (and probably other g++ versions). + Thu May 07 04:15:23 1998 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Profile_Timer.cpp (elapsed_time): Treat Win32 differently diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp index 38ec1565900..e80d2b288d7 100644 --- a/ace/Timer_Hash_T.cpp +++ b/ace/Timer_Hash_T.cpp @@ -468,7 +468,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::get_first (void) template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire () { - return INHERITED::expire(); + return ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK>::expire(); } diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h index 73ef74b9809..9ecd248c118 100644 --- a/ace/Timer_Hash_T.h +++ b/ace/Timer_Hash_T.h @@ -128,8 +128,7 @@ public: friend class ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>; // Iterator is a friend - typedef ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> - INHERITED; + typedef ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> INHERITED; // Type inherited from // = Initialization and termination methods. diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp index 8483540c711..4ae610412bb 100644 --- a/ace/Timer_Heap_T.cpp +++ b/ace/Timer_Heap_T.cpp @@ -68,7 +68,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size, int preallocate, FUNCTOR *upcall_functor, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) - : INHERITED (upcall_functor, freelist), + : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist), max_size_ (size), cur_size_ (0), timer_ids_freelist_ (1), @@ -116,7 +116,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size, template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_functor, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) - : INHERITED (upcall_functor, freelist), + : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist), max_size_ (ACE_DEFAULT_TIMERS), cur_size_ (0), timer_ids_freelist_ (1), diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp index a93f1595b45..2f3a701680b 100644 --- a/ace/Timer_Wheel_T.cpp +++ b/ace/Timer_Wheel_T.cpp @@ -103,7 +103,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (size_t wheelsize, size_t prealloc, FUNCTOR *upcall_functor, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) - : INHERITED (upcall_functor, freelist), + : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist), wheel_size_ (wheelsize), resolution_ (resolution), earliest_pos_ (0) @@ -135,7 +135,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (size_t wheelsize, template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (FUNCTOR *upcall_functor, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) - : INHERITED (upcall_functor, freelist), + : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist), wheel_size_ (ACE_DEFAULT_TIMER_WHEEL_SIZE), resolution_ (ACE_DEFAULT_TIMER_WHEEL_RESOLUTION), earliest_pos_ (0) @@ -506,7 +506,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::iter (void) template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire () { - return INHERITED::expire (); + return ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK>::expire (); } |