diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-01-17 02:23:09 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-01-17 02:23:09 +0000 |
| commit | f498ec3072a4f20dbedadc2340592e24ed3301b7 (patch) | |
| tree | a80d069160b1500ffdc3aa8c7d6430ba9ea9e23b | |
| parent | c5f0eb74bf2cd44e94d5c403e92e258ff4939f24 (diff) | |
| download | ATCD-f498ec3072a4f20dbedadc2340592e24ed3301b7.tar.gz | |
update
| -rw-r--r-- | ace/OS.h | 16 | ||||
| -rw-r--r-- | ace/Timer_Heap.cpp | 2 | ||||
| -rw-r--r-- | ace/Timer_Heap.h | 2 | ||||
| -rw-r--r-- | ace/Timer_List.cpp | 2 | ||||
| -rw-r--r-- | ace/Timer_List.h | 2 | ||||
| -rw-r--r-- | ace/Timer_Queue.cpp | 4 |
6 files changed, 14 insertions, 14 deletions
@@ -1450,14 +1450,6 @@ extern "C" int sigwait (sigset_t *set); #include /**/ <sys/sockio.h> #endif /* ACE_HAS_SOCKIO_ */ -#if !defined (_SC_TIMER_MAX) -#define _SC_TIMER_MAX 44 -#endif /* _SC_TIMER_MAX */ - -// Default number of <ACE_Event_Handler>s supported by -// <ACE_Timer_Heap>. -#define ACE_DEFAULT_TIMERS _SC_TIMER_MAX - // There must be a better way to do this... #if !defined (RLIMIT_NOFILE) #if defined (linux) || defined (AIX) || defined (SCO) @@ -1744,6 +1736,14 @@ typedef long ACE_INT32; #define ETIME ETIMEDOUT #endif /* ETIMED */ +#if !defined (_SC_TIMER_MAX) +#define _SC_TIMER_MAX 44 +#endif /* _SC_TIMER_MAX */ + +// Default number of <ACE_Event_Handler>s supported by +// <ACE_Timer_Heap>. +#define ACE_DEFAULT_TIMERS _SC_TIMER_MAX + // Note that this assumes shorts are 16 bits. typedef u_short ACE_USHORT16; diff --git a/ace/Timer_Heap.cpp b/ace/Timer_Heap.cpp index bd768b86a9e..3a4fd301422 100644 --- a/ace/Timer_Heap.cpp +++ b/ace/Timer_Heap.cpp @@ -120,7 +120,7 @@ ACE_Timer_Heap::is_empty (void) const } ACE_Timer_Queue_Iterator & -ACE_Timer_Heap::get_iterator (void) +ACE_Timer_Heap::iter (void) { return this->iterator_; } diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h index 3490f761a0d..de0b37295fb 100644 --- a/ace/Timer_Heap.h +++ b/ace/Timer_Heap.h @@ -118,7 +118,7 @@ protected: virtual void reschedule (ACE_Timer_Node *); // Reschedule an "interval" <ACE_Timer_Node>. - virtual ACE_Timer_Queue_Iterator &get_iterator (void); + virtual ACE_Timer_Queue_Iterator &iter (void); // Returns a pointer to this <ACE_Timer_Queue>'s iterator. virtual ACE_Timer_Node *alloc_node (void); diff --git a/ace/Timer_List.cpp b/ace/Timer_List.cpp index 5b769ccdcc0..75a398aca12 100644 --- a/ace/Timer_List.cpp +++ b/ace/Timer_List.cpp @@ -27,7 +27,7 @@ ACE_Timer_List_Iterator::next (ACE_Timer_Node *&node, ACE_ALLOC_HOOK_DEFINE(ACE_Timer_List) ACE_Timer_Queue_Iterator & -ACE_Timer_List::get_iterator (void) +ACE_Timer_List::iter (void) { return this->iterator_; } diff --git a/ace/Timer_List.h b/ace/Timer_List.h index db4da1c90c9..500faa8ff7d 100644 --- a/ace/Timer_List.h +++ b/ace/Timer_List.h @@ -132,7 +132,7 @@ private: virtual void reschedule (ACE_Timer_Node *); // Reschedule an "interval" <ACE_Timer_Node>. - virtual ACE_Timer_Queue_Iterator &get_iterator (void); + virtual ACE_Timer_Queue_Iterator &iter (void); // Returns a pointer to this <ACE_Timer_Queue>'s iterator. ACE_Timer_Node *head_; diff --git a/ace/Timer_Queue.cpp b/ace/Timer_Queue.cpp index f41ef58ddaf..5566d1f3b2b 100644 --- a/ace/Timer_Queue.cpp +++ b/ace/Timer_Queue.cpp @@ -119,13 +119,13 @@ ACE_Timer_Queue::expire (const ACE_Time_Value &cur_time) int number_of_timers_expired = 0; - ACE_Timer_Queue_Iterator &iterator = this->iterator (); + ACE_Timer_Queue_Iterator &iter = this->iter (); // Keep looping while there are timers remaining and the earliest // timer is <= the <cur_time> passed in to the method. for (ACE_Timer_Node *expired; - iterator.next (expired, cur_time) != 0; + iter.next (expired, cur_time) != 0; ) { ACE_Event_Handler *handler = |