diff options
Diffstat (limited to 'ACE/ace')
51 files changed, 230 insertions, 403 deletions
diff --git a/ACE/ace/ATM_Params.h b/ACE/ace/ATM_Params.h index f40746e8b72..5a2ea9f7207 100644 --- a/ACE/ace/ATM_Params.h +++ b/ACE/ace/ATM_Params.h @@ -62,7 +62,7 @@ class ACE_Export ACE_ATM_Params public: /** * Initialize the data members. This class combines options from - * ACE_SOCK_Connector (<protocol_family>, <protocol>, <type>, + * ACE_SOCK_Connector (<protocol_family>, <protocol>, @a type, * <protocol_info>, <group>, and <flags>) and * ACE_TLI_Connector (<device>, <info>, <rw_flag>, <oflag>, and <udata>) * so that either mechanism can be used transparently for ATM. diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index 24bf3c4efc9..d1b3e6fc462 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1604,20 +1604,20 @@ void ACE_InputCDR::exchange_data_blocks (ACE_InputCDR &cdr) { // Exchange byte orders - int byte_order = cdr.do_byte_swap_; + int const byte_order = cdr.do_byte_swap_; cdr.do_byte_swap_ = this->do_byte_swap_; this->do_byte_swap_ = byte_order; // Get the destination read and write pointers - size_t drd_pos = + size_t const drd_pos = cdr.start_.rd_ptr () - cdr.start_.base (); - size_t dwr_pos = + size_t const dwr_pos = cdr.start_.wr_ptr () - cdr.start_.base (); // Get the source read & write pointers - size_t srd_pos = + size_t const srd_pos = this->start_.rd_ptr () - this->start_.base (); - size_t swr_pos = + size_t const swr_pos = this->start_.wr_ptr () - this->start_.base (); // Exchange data_blocks. Dont release any of the data blocks. @@ -1652,8 +1652,8 @@ ACE_InputCDR::exchange_data_blocks (ACE_InputCDR &cdr) if (this->start_.size () >= dwr_pos) this->start_.wr_ptr (dwr_pos); - ACE_CDR::Octet dmajor = cdr.major_version_; - ACE_CDR::Octet dminor = cdr.minor_version_; + ACE_CDR::Octet const dmajor = cdr.major_version_; + ACE_CDR::Octet const dminor = cdr.minor_version_; // Exchange the GIOP version info cdr.major_version_ = this->major_version_; diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl index c8711ca3f65..9f13889237f 100644 --- a/ACE/ace/CDR_Stream.inl +++ b/ACE/ace/CDR_Stream.inl @@ -266,7 +266,7 @@ ACE_OutputCDR::write_string (const ACE_CDR::Char *x) { if (x) { - const ACE_CDR::ULong len = + ACE_CDR::ULong const len = static_cast<ACE_CDR::ULong> (ACE_OS::strlen (x)); return this->write_string (len, x); } @@ -279,7 +279,7 @@ ACE_OutputCDR::write_wstring (const ACE_CDR::WChar *x) { if (x) { - ACE_CDR::ULong len = + ACE_CDR::ULong const len = static_cast<ACE_CDR::ULong> (ACE_OS::strlen (x)); return this->write_wstring (len, x); } diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index f82283a70b7..8f67ddae1ad 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -748,10 +748,10 @@ public: const ACE_Time_Value &interval = ACE_Time_Value::zero); /** - * Resets the interval of the timer represented by <timer_id> to - * <interval>, which is specified in relative time to the current - * <gettimeofday>. If <interval> is equal to - * <ACE_Time_Value::zero>, the timer will become a non-rescheduling + * Resets the interval of the timer represented by @a timer_id to + * @a interval, which is specified in relative time to the current + * <gettimeofday>. If @a interval is equal to + * ACE_Time_Value::zero, the timer will become a non-rescheduling * timer. Returns 0 if successful, -1 if not. */ virtual int reset_timer_interval (long timer_id, diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h index 5c1e382750c..3f5ccb98224 100644 --- a/ACE/ace/Event_Handler.h +++ b/ACE/ace/Event_Handler.h @@ -115,7 +115,7 @@ public: /** * Called when timer expires. <current_time> represents the current * time that the <Event_Handler> was selected for timeout - * dispatching and <act> is the asynchronous completion token that + * dispatching and @a act is the asynchronous completion token that * was passed in when <schedule_timer> was invoked. */ virtual int handle_timeout (const ACE_Time_Value ¤t_time, diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index e96cd9335e9..5081d19bb1b 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -71,7 +71,7 @@ void ACE_LD_Symbol_Registry::register_symbol (const ACE_TCHAR* symname, void* symaddr) { - int result = symbol_registry_.bind (symname, symaddr); + int const result = symbol_registry_.bind (symname, symaddr); if (result == 1) { ACE_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:") @@ -84,17 +84,13 @@ ACE_LD_Symbol_Registry::register_symbol (const ACE_TCHAR* symname, ACE_TEXT (" failed to register symbol %s\n"), ACE_TEXT_ALWAYS_CHAR (symname))); } - - //::fprintf (stderr, "ACE_LD_Symbol_Registry::register_symbol(%s, %x) -> %d\n", symname, symaddr, result); } void* ACE_LD_Symbol_Registry::find_symbol (const ACE_TCHAR* symname) { void* symaddr = 0; - int result = symbol_registry_.find (symname, symaddr); - - //::fprintf (stderr, "ACE_LD_Symbol_Registry::find_symbol(%s) -> %x, %d\n", symname, symaddr, result); + int const result = symbol_registry_.find (symname, symaddr); return (result == 0 ? symaddr : 0); } @@ -110,7 +106,7 @@ typedef ACE_Singleton<ACE_LD_Symbol_Registry, ACE_Thread_Mutex> #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<ACE_LD_Symbol_Registry, ACE_Thread_Mutex> * ACE_Singleton<ACE_LD_Symbol_Registry, ACE_Thread_Mutex>::singleton_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ #endif ACE_RCSID(ace, Lib_Find, "$Id$") diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am index 113fe3bff05..3f440a5ed7e 100644 --- a/ACE/ace/Makefile.am +++ b/ACE/ace/Makefile.am @@ -313,11 +313,6 @@ libACE_la_SOURCES = \ Throughput_Stats.cpp \ Time_Value.cpp \ Timeprobe.cpp \ - Timer_Hash.cpp \ - Timer_Heap.cpp \ - Timer_List.cpp \ - Timer_Queue.cpp \ - Timer_Wheel.cpp \ Token.cpp \ Token_Collection.cpp \ Token_Invariants.cpp \ diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp index f1b136ac3af..9c6da58fb0a 100644 --- a/ACE/ace/Malloc.cpp +++ b/ACE/ace/Malloc.cpp @@ -126,8 +126,7 @@ ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name, const char * ACE_Control_Block::ACE_Name_Node::name (void) const { - const char *c = this->name_; - return c; + return this->name_; } ACE_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void) diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 164a464888b..af4ff0decd1 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -1387,7 +1387,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s) { ACE_OSCALL (::sem_destroy (s->sema_), int, -1, result); # if defined (ACE_LACKS_NAMED_POSIX_SEM) - if (s->new_sema_ != 0) + if (s->new_sema_) # endif /* ACE_LACKS_NAMED_POSIX_SEM */ delete s->sema_; s->sema_ = 0; @@ -1474,7 +1474,7 @@ ACE_OS::sema_init (ACE_sema_t *s, # endif /* ACE_HAS_POSIX_SEM_TIMEOUT || ACE_DISABLE_POSIX_SEM_TIMEOUT_EMULATION */ # if defined (ACE_LACKS_NAMED_POSIX_SEM) - s->new_sema_ = 0; + s->new_sema_ = false; if (type == USYNC_PROCESS) { // Let's see if it already exists. @@ -1565,7 +1565,7 @@ ACE_OS::sema_init (ACE_sema_t *s, sem_t, -1); # if defined (ACE_LACKS_NAMED_POSIX_SEM) - s->new_sema_ = 1; + s->new_sema_ = true; # endif /* ACE_LACKS_NAMED_POSIX_SEM */ ACE_OSCALL_RETURN (::sem_init (s->sema_, type != USYNC_THREAD, diff --git a/ACE/ace/PI_Malloc.cpp b/ACE/ace/PI_Malloc.cpp index 8637fbd211f..5b2897d2dcf 100644 --- a/ACE/ace/PI_Malloc.cpp +++ b/ACE/ace/PI_Malloc.cpp @@ -125,8 +125,7 @@ ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &) const char * ACE_PI_Control_Block::ACE_Name_Node::name (void) const { - const char *c = this->name_; - return c; + return this->name_; } void diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h index 88dd9321c4a..ddbeaec7ca5 100644 --- a/ACE/ace/Proactor.h +++ b/ACE/ace/Proactor.h @@ -306,7 +306,7 @@ public: // = Timer management. /** * Schedule a <handler> that will expire after <time>. If it - * expires then <act> is passed in as the value to the <handler>'s + * expires then @a act is passed in as the value to the <handler>'s * <handle_timeout> callback method. This method returns a * <timer_id>. This <timer_id> can be used to cancel a timer before * it expires. The cancellation ensures that <timer_ids> are unique @@ -323,7 +323,7 @@ public: const void *act, const ACE_Time_Value &interval); - // Same as above except <interval> it is used to reschedule the + // Same as above except @a interval it is used to reschedule the // <handler> automatically. /// This combines the above two methods into one. Mostly for backward @@ -339,12 +339,12 @@ public: int dont_call_handle_close = 1); /** - * Cancel the single <ACE_Handler> that matches the <timer_id> value - * (which was returned from the <schedule> method). If <act> is + * Cancel the single <ACE_Handler> that matches the @a timer_id value + * (which was returned from the <schedule> method). If @a act is * non-NULL then it will be set to point to the ``magic cookie'' * argument passed in when the <Handler> was registered. This makes * it possible to free up the memory and avoid memory leaks. - * Returns 1 if cancellation succeeded and 0 if the <timer_id> + * Returns 1 if cancellation succeeded and 0 if the @a timer_id * wasn't found. */ int cancel_timer (long timer_id, diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp index ed2dd8f2886..125d26909eb 100644 --- a/ACE/ace/Reactor.cpp +++ b/ACE/ace/Reactor.cpp @@ -449,8 +449,7 @@ ACE_Reactor::register_handler (ACE_Event_Handler *event_handler, // Assign *this* <Reactor> to the <Event_Handler>. event_handler->reactor (this); - int result = this->implementation ()->register_handler (event_handler, - mask); + int result = this->implementation ()->register_handler (event_handler, mask); if (result == -1) // Reset the old reactor in case of failures. event_handler->reactor (old_reactor); @@ -888,9 +887,7 @@ ACE_Reactor::mask_ops (ACE_HANDLE handle, ACE_Reactor_Mask mask, int ops) { - return this->implementation ()->mask_ops (handle, - mask, - ops); + return this->implementation ()->mask_ops (handle, mask, ops); } int @@ -898,9 +895,7 @@ ACE_Reactor::ready_ops (ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask, int ops) { - return this->implementation ()->ready_ops (event_handler, - mask, - ops); + return this->implementation ()->ready_ops (event_handler, mask, ops); } int @@ -908,9 +903,7 @@ ACE_Reactor::ready_ops (ACE_HANDLE handle, ACE_Reactor_Mask mask, int ops) { - return this->implementation ()->ready_ops (handle, - mask, - ops); + return this->implementation ()->ready_ops (handle, mask, ops); } int diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h index 18c968b3980..9b18ce64ad6 100644 --- a/ACE/ace/Reactor.h +++ b/ACE/ace/Reactor.h @@ -180,8 +180,8 @@ public: * <ACE_Reactor::handle_events/ACE_Reactor::alertable_handle_events> * method returns -1 or the <end_reactor_event_loop> method is invoked. */ - virtual int run_reactor_event_loop (REACTOR_EVENT_HOOK = 0); - virtual int run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK = 0); + int run_reactor_event_loop (REACTOR_EVENT_HOOK = 0); + int run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK = 0); /** * Run the event loop until the <ACE_Reactor::handle_events> or @@ -189,10 +189,10 @@ public: * <end_reactor_event_loop> method is invoked, or the ACE_Time_Value * expires. */ - virtual int run_reactor_event_loop (ACE_Time_Value &tv, - REACTOR_EVENT_HOOK = 0); - virtual int run_alertable_reactor_event_loop (ACE_Time_Value &tv, - REACTOR_EVENT_HOOK = 0); + int run_reactor_event_loop (ACE_Time_Value &tv, + REACTOR_EVENT_HOOK = 0); + int run_alertable_reactor_event_loop (ACE_Time_Value &tv, + REACTOR_EVENT_HOOK = 0); /** * Instruct the Reactor to terminate its event loop and notifies the @@ -205,14 +205,14 @@ public: * will be dispatched then. If the reactor is closed or deleted without * further dispatching, the notifications will be lost. */ - virtual int end_reactor_event_loop (void); + int end_reactor_event_loop (void); /// Indicate if the Reactor's event loop has been ended. - virtual int reactor_event_loop_done (void); + int reactor_event_loop_done (void); /// Resets the <ACE_Reactor::end_event_loop_> static so that the /// <run_event_loop> method can be restarted. - virtual void reset_reactor_event_loop (void); + void reset_reactor_event_loop (void); /** * Create the Reactor using @a implementation. The flag @@ -236,22 +236,22 @@ public: * <signal_handler> or <timer_queue> are non-0 they are used as the * signal handler and timer queue, respectively. */ - virtual int open (size_t max_number_of_handles, - int restart = 0, - ACE_Sig_Handler *signal_handler = 0, - ACE_Timer_Queue *timer_queue = 0); + int open (size_t max_number_of_handles, + int restart = 0, + ACE_Sig_Handler *signal_handler = 0, + ACE_Timer_Queue *timer_queue = 0); /// Use a user specified signal handler instead. - virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); + int set_sig_handler (ACE_Sig_Handler *signal_handler); /// Set a user-specified timer queue. - virtual int timer_queue (ACE_Timer_Queue *tq); + int timer_queue (ACE_Timer_Queue *tq); /// Return the current ACE_Timer_Queue. - virtual ACE_Timer_Queue *timer_queue (void) const; + ACE_Timer_Queue *timer_queue (void) const; /// Close down and release all resources. - virtual int close (void); + int close (void); // = Event loop drivers. @@ -260,7 +260,7 @@ public: * but does not actually dispatch the event handlers. By default, * don't block while checking this, i.e., "poll". */ - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); + int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); /** * This event loop driver blocks for up to <max_wait_time> before @@ -284,8 +284,8 @@ public: * return when the system queues an I/O completion routine or an * Asynchronous Procedure Call. */ - virtual int handle_events (ACE_Time_Value *max_wait_time = 0); - virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0); + int handle_events (ACE_Time_Value *max_wait_time = 0); + int alertable_handle_events (ACE_Time_Value *max_wait_time = 0); /** * This method is just like the one above, except the @@ -297,8 +297,8 @@ public: * return when the system queues an I/O completion routine or an * Asynchronous Procedure Call. */ - virtual int handle_events (ACE_Time_Value &max_wait_time); - virtual int alertable_handle_events (ACE_Time_Value &max_wait_time); + int handle_events (ACE_Time_Value &max_wait_time); + int alertable_handle_events (ACE_Time_Value &max_wait_time); // = Register and remove handlers. @@ -322,8 +322,8 @@ public: * existing masks plus any masks added through this call. Handlers * do not have partial suspensions. */ - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + int register_handler (ACE_Event_Handler *event_handler, + ACE_Reactor_Mask mask); /** * Register handler for I/O events. @@ -331,9 +331,9 @@ public: * Same as register_handler(ACE_Event_Handler*,ACE_Reactor_Mask), * except handle is explicitly specified. */ - virtual int register_handler (ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + int register_handler (ACE_HANDLE io_handle, + ACE_Event_Handler *event_handler, + ACE_Reactor_Mask mask); #if defined (ACE_WIN32) @@ -342,7 +342,7 @@ public: * * Register an <event_handler> that will be notified when * <event_handle> is signaled. This will call back its - * <handle_signal> hook method. + * <handle_signal> hook method. * * Reactor will call ACE_Event_Handler::add_reference() for a new * handler/handle pair. @@ -353,8 +353,8 @@ public: * register_handler(ACE_Event_Handler*,ACE_Reactor_Mask) and * register_handler(ACE_Event_Handler*,ACE_HANDLE). */ - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_HANDLE event_handle = ACE_INVALID_HANDLE); + int register_handler (ACE_Event_Handler *event_handler, + ACE_HANDLE event_handle = ACE_INVALID_HANDLE); #endif /* ACE_WIN32 */ @@ -367,10 +367,10 @@ public: * be used for this registration. This only applies to Reactors * that use event handles for I/O registrations. */ - virtual int register_handler (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + int register_handler (ACE_HANDLE event_handle, + ACE_HANDLE io_handle, + ACE_Event_Handler *event_handler, + ACE_Reactor_Mask mask); /** * Register handler for multiple I/O events. @@ -380,9 +380,9 @@ public: * multiple times for the same <event_handler> and <masks> but * different <handles>. */ - virtual int register_handler (const ACE_Handle_Set &handles, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks); + int register_handler (const ACE_Handle_Set &handles, + ACE_Event_Handler *event_handler, + ACE_Reactor_Mask masks); /** * Register handler for signals. @@ -394,11 +394,11 @@ public: * Reactor will call ACE_Event_Handler::add_reference() on @a new_sh * and ACE_Event_Handler::remove_reference() on @a old_sh. */ - virtual int register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0, - ACE_Event_Handler **old_sh = 0, - ACE_Sig_Action *old_disp = 0); + int register_handler (int signum, + ACE_Event_Handler *new_sh, + ACE_Sig_Action *new_disp = 0, + ACE_Event_Handler **old_sh = 0, + ACE_Sig_Action *old_disp = 0); /** * Register handler for multiple signals. @@ -408,9 +408,9 @@ public: * multiple times for the same <event_handler> and <sig_action> but * different <signals>. */ - virtual int register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *event_handler, - ACE_Sig_Action *sig_action = 0); + int register_handler (const ACE_Sig_Set &sigset, + ACE_Event_Handler *event_handler, + ACE_Sig_Action *sig_action = 0); /** * Remove <masks> from <handle> registration. @@ -427,8 +427,8 @@ public: * <ACE_Event_Handler::NULL_MASK>. * ACE_Event_Handler::remove_reference() will also be called. */ - virtual int remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask masks); + int remove_handler (ACE_HANDLE handle, + ACE_Reactor_Mask masks); /** * Remove <masks> from <event_handler> registration. @@ -436,8 +436,8 @@ public: * Same as remove_handler(ACE_HANDLE,ACE_Reactor_Mask), except * <handle> comes from ACE_Event_Handler::get_handle(). */ - virtual int remove_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks); + int remove_handler (ACE_Event_Handler *event_handler, + ACE_Reactor_Mask masks); /** * Remove <masks> from multiple <handle> registrations. @@ -445,8 +445,8 @@ public: * Shorthand for calling remove_handler(ACE_HANDLE,ACE_Reactor_Mask) * multiple times for the same <masks> but different <handles>. */ - virtual int remove_handler (const ACE_Handle_Set &handles, - ACE_Reactor_Mask masks); + int remove_handler (const ACE_Handle_Set &handles, + ACE_Reactor_Mask masks); /** * Remove signal handler registration. @@ -459,33 +459,33 @@ public: * @c ACE_Event_Handler::SIGNAL_MASK. * ACE_Event_Handler::remove_reference() will also be called. */ - virtual int remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp = 0, - int sigkey = -1); + int remove_handler (int signum, + ACE_Sig_Action *new_disp, + ACE_Sig_Action *old_disp = 0, + int sigkey = -1); /** * Remove multiple signal handler registrations. * * Shorthand for calling * remove_handler(int,ACE_Sig_Action*,ACE_Sig_Action*,int) multiple - * times for every signal in <sigset>. + * times for every signal in @a sigset. */ - virtual int remove_handler (const ACE_Sig_Set &sigset); + int remove_handler (const ACE_Sig_Set &sigset); // = Suspend and resume Handlers. /** * Suspend @a handle temporarily. */ - virtual int suspend_handler (ACE_HANDLE handle); + int suspend_handler (ACE_HANDLE handle); /** * Suspend @a event_handler temporarily. * * Handle is obtained from ACE_Event_Handler::get_handle(). */ - virtual int suspend_handler (ACE_Event_Handler *event_handler); + int suspend_handler (ACE_Event_Handler *event_handler); /** * Suspend @a handles temporarily. @@ -493,43 +493,43 @@ public: * Shorthand for calling suspend_handler(ACE_HANDLE) with multiple * <handles>. */ - virtual int suspend_handler (const ACE_Handle_Set &handles); + int suspend_handler (const ACE_Handle_Set &handles); /** * Suspend all registered handles temporarily. */ - virtual int suspend_handlers (void); + int suspend_handlers (void); /** * Resume @a handle. */ - virtual int resume_handler (ACE_HANDLE handle); + int resume_handler (ACE_HANDLE handle); /** * Resume @a event_handler. * * Handle is obtained from ACE_Event_Handler::get_handle(). */ - virtual int resume_handler (ACE_Event_Handler *event_handler); + int resume_handler (ACE_Event_Handler *event_handler); /** - * Resume <handles>. + * Resume @a handles. * * Shorthand for calling resume_handler(ACE_HANDLE) with multiple * <handles>. */ - virtual int resume_handler (const ACE_Handle_Set &handles); + int resume_handler (const ACE_Handle_Set &handles); /** * Resume all registered handles. */ - virtual int resume_handlers (void); + int resume_handlers (void); /// Does the reactor allow the application to resume the handle on /// its own ie. can it pass on the control of handle resumption to /// the application. A positive value indicates that the handlers /// are application resumable. A value of 0 indicates otherwise. - virtual int resumable_handler (void); + int resumable_handler (void); // = Timer management. @@ -570,8 +570,8 @@ public: * * Resets the interval of the timer represented by @a timer_id to * @a interval, which is specified in relative time to the current - * <gettimeofday>. If <interval> is equal to - * <ACE_Time_Value::zero>, the timer will become a non-rescheduling + * <gettimeofday>. If @a interval is equal to + * ACE_Time_Value::zero, the timer will become a non-rescheduling * timer. Returns 0 if successful, -1 if not. * * This change will not take effect until the next timeout. @@ -624,8 +624,8 @@ public: /// activity expected, or you need immediate re-examination of the /// wait masks, either call ACE_Reactor::notify after this call, or /// use ACE_Reactor::register_handler instead. - virtual int schedule_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_added); + int schedule_wakeup (ACE_Event_Handler *event_handler, + ACE_Reactor_Mask masks_to_be_added); /// Add @a masks_to_be_added to the @a handle's entry. <event_handler> /// associated with @a handle must already have been registered. @@ -635,8 +635,8 @@ public: /// activity expected, or you need immediate re-examination of /// the wait masks, either call ACE_Reactor::notify after this call, /// or use ACE_Reactor::register_handler instead. - virtual int schedule_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_added); + int schedule_wakeup (ACE_HANDLE handle, + ACE_Reactor_Mask masks_to_be_added); /// Clear <masks_to_be_cleared> from the <event_handler>'s entry. /// Note that this call does not cause the Reactor to re-examine @@ -645,8 +645,8 @@ public: /// activity expected, or you need immediate re-examination of /// the wait masks, either call ACE_Reactor::notify after this /// call, or use ACE_Reactor::register_handler instead. - virtual int cancel_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_cleared); + int cancel_wakeup (ACE_Event_Handler *event_handler, + ACE_Reactor_Mask masks_to_be_cleared); /// Clear <masks_to_be_cleared> from the <handle>'s entry. /// Note that this call does not cause the Reactor to re-examine @@ -655,8 +655,8 @@ public: /// activity expected, or you need immediate re-examination of /// the wait masks, either call ACE_Reactor::notify after this /// call, or use ACE_Reactor::register_handler instead. - virtual int cancel_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_cleared); + int cancel_wakeup (ACE_HANDLE handle, + ACE_Reactor_Mask masks_to_be_cleared); // = Notification methods. @@ -687,9 +687,9 @@ public: * indefinitely. When the call returns, tv has the time remaining * after the call completes. */ - virtual int notify (ACE_Event_Handler *event_handler = 0, - ACE_Reactor_Mask masks = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value *timeout = 0); + int notify (ACE_Event_Handler *event_handler = 0, + ACE_Reactor_Mask masks = ACE_Event_Handler::EXCEPT_MASK, + ACE_Time_Value *timeout = 0); /** * Set the maximum number of times that ACE_Reactor will @@ -701,7 +701,7 @@ public: * prevent starvation) at the expense of slightly higher dispatching * overhead. */ - virtual void max_notify_iterations (int iterations); + void max_notify_iterations (int iterations); /** * Get the maximum number of times that the ACE_Reactor will @@ -709,7 +709,7 @@ public: * via the notify queue before breaking out of its * <ACE_Message_Queue::dequeue> loop. */ - virtual int max_notify_iterations (void); + int max_notify_iterations (void); /** * Purge any notifications pending in this reactor for the specified @@ -722,8 +722,8 @@ public: * from the Reactor and ACE_Event_Handler::remove_reference() will * be called. */ - virtual int purge_pending_notifications (ACE_Event_Handler *eh, - ACE_Reactor_Mask = + int purge_pending_notifications (ACE_Event_Handler *eh, + ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); // = Assorted helper methods. @@ -735,7 +735,7 @@ public: * Reactor will call ACE_Event_Handler::add_reference() on the * handler before returning it. */ - virtual ACE_Event_Handler *find_handler (ACE_HANDLE handle); + ACE_Event_Handler *find_handler (ACE_HANDLE handle); /** * Check to see if @a handle is associated with a valid Event_Handler @@ -745,79 +745,79 @@ public: * Reactor will call ACE_Event_Handler::add_reference() on the * handler before returning it if @a event_handler != 0. */ - virtual int handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler = 0); + int handler (ACE_HANDLE handle, + ACE_Reactor_Mask mask, + ACE_Event_Handler **event_handler = 0); /** * Check to see if @a signum is associated with a valid Event_Handler * bound to a signal. Return the <event_handler> associated with * this <handler> if @a event_handler != 0. */ - virtual int handler (int signum, - ACE_Event_Handler **event_handler = 0); + int handler (int signum, + ACE_Event_Handler **event_handler = 0); /// Returns true if Reactor has been successfully initialized, else /// false. - virtual int initialized (void); + int initialized (void); /// Returns the current size of the Reactor's internal descriptor /// table. - virtual size_t size (void) const; + size_t size (void) const; /// Returns a reference to the Reactor's internal lock. - virtual ACE_Lock &lock (void); + ACE_Lock &lock (void); /// Wake up all threads in waiting in the event loop - virtual void wakeup_all_threads (void); + void wakeup_all_threads (void); /// Transfers ownership of Reactor to the @a new_owner. - virtual int owner (ACE_thread_t new_owner, - ACE_thread_t *old_owner = 0); + int owner (ACE_thread_t new_owner, + ACE_thread_t *old_owner = 0); /// Return the ID of the "owner" thread. - virtual int owner (ACE_thread_t *owner); + int owner (ACE_thread_t *owner); /// Set position of the owner thread. - virtual void requeue_position (int position); + void requeue_position (int position); /// Get position of the owner thread. - virtual int requeue_position (void); + int requeue_position (void); /// Get the existing restart value. - virtual int restart (void); + int restart (void); /// Set a new value for restart and return the original value. - virtual int restart (int r); + int restart (int r); // = Low-level wait_set mask manipulation methods. /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the /// @a event_handler and @a mask. - virtual int mask_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops); + int mask_ops (ACE_Event_Handler *event_handler, + ACE_Reactor_Mask mask, + int ops); /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the @a handle /// and @a mask. - virtual int mask_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops); + int mask_ops (ACE_HANDLE handle, + ACE_Reactor_Mask mask, + int ops); // = Low-level ready_set mask manipulation methods. /// GET/SET/ADD/CLR the ready "bit" bound with the <event_handler> /// and <mask>. - virtual int ready_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops); + int ready_ops (ACE_Event_Handler *event_handler, + ACE_Reactor_Mask mask, + int ops); /// GET/SET/ADD/CLR the ready "bit" bound with the <handle> and <mask>. - virtual int ready_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops); + int ready_ops (ACE_HANDLE handle, + ACE_Reactor_Mask mask, + int ops); /// Get the implementation class - virtual ACE_Reactor_Impl *implementation (void) const; + ACE_Reactor_Impl *implementation (void) const; /** * Returns 0, if the size of the current message has been put in @@ -825,12 +825,11 @@ public: * check if the caller is valid. Used for CLASSIX Reactor * implementation. */ - virtual int current_info (ACE_HANDLE handle, - size_t &msg_size); + int current_info (ACE_HANDLE handle, size_t &msg_size); /// Return 1 if we any event associations were made by the reactor /// for the handles that it waits on, 0 otherwise. - virtual int uses_event_associations (void); + int uses_event_associations (void); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -840,7 +839,7 @@ public: protected: /// Set the implementation class. - virtual void implementation (ACE_Reactor_Impl *implementation); + void implementation (ACE_Reactor_Impl *implementation); /// Delegation/implementation class that all methods will be /// forwarded to. diff --git a/ACE/ace/Reactor_Impl.h b/ACE/ace/Reactor_Impl.h index df341bf5f40..f3c32ae7734 100644 --- a/ACE/ace/Reactor_Impl.h +++ b/ACE/ace/Reactor_Impl.h @@ -388,10 +388,10 @@ public: const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0; /** - * Resets the interval of the timer represented by <timer_id> to - * <interval>, which is specified in relative time to the current - * <gettimeofday>. If <interval> is equal to - * <ACE_Time_Value::zero>, the timer will become a non-rescheduling + * Resets the interval of the timer represented by @a timer_id to + * @a interval, which is specified in relative time to the current + * <gettimeofday>. If @a interval is equal to + * ACE_Time_Value::zero, the timer will become a non-rescheduling * timer. Returns 0 if successful, -1 if not. */ virtual int reset_timer_interval (long timer_id, @@ -403,12 +403,12 @@ public: int dont_call_handle_close = 1) = 0; /** - * Cancel the single Event_Handler that matches the <timer_id> value + * Cancel the single Event_Handler that matches the @a timer_id value * (which was returned from the schedule method). If arg is * non-NULL then it will be set to point to the ``magic cookie'' * argument passed in when the Event_Handler was registered. This * makes it possible to free up the memory and avoid memory leaks. - * Returns 1 if cancellation succeeded and 0 if the <timer_id> + * Returns 1 if cancellation succeeded and 0 if the @a timer_id * wasn't found. */ virtual int cancel_timer (long timer_id, diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index 7573a3ab76b..fdedc5e88a1 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -362,10 +362,10 @@ public: const ACE_Time_Value &interval = ACE_Time_Value::zero); /** - * Resets the interval of the timer represented by <timer_id> to - * <interval>, which is specified in relative time to the current - * <gettimeofday>. If <interval> is equal to - * <ACE_Time_Value::zero>, the timer will become a non-rescheduling + * Resets the interval of the timer represented by @a timer_id to + * @a interval, which is specified in relative time to the current + * <gettimeofday>. If @a interval is equal to + * ACE_Time_Value::zero, the timer will become a non-rescheduling * timer. Returns 0 if successful, -1 if not. */ virtual int reset_timer_interval (long timer_id, @@ -381,14 +381,14 @@ public: int dont_call_handle_close = 1); /** - * Cancel the single ACE_Event_Handler that matches the <timer_id> + * Cancel the single ACE_Event_Handler that matches the @a timer_id * value (which was returned from the <schedule> method). If arg is * non-NULL then it will be set to point to the ``magic cookie'' * argument passed in when the <Event_Handler> was registered. This * makes it possible to free up the memory and avoid memory leaks. * If <dont_call_handle_close> is 0 then the <handle_close> method * of <event_handler> will be invoked. Returns 1 if cancellation - * succeeded and 0 if the <timer_id> wasn't found. + * succeeded and 0 if the @a timer_id wasn't found. */ virtual int cancel_timer (long timer_id, const void **arg = 0, diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp index bd57aa95891..37d8de90bc6 100644 --- a/ACE/ace/Sig_Handler.cpp +++ b/ACE/ace/Sig_Handler.cpp @@ -25,7 +25,6 @@ ace_sig_handler_dispatch (int signum, siginfo_t *info, ucontext_t *context) #define ace_signal_handler_dispatcher ACE_SignalHandler(ace_sig_handler_dispatch) -#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) extern "C" void ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context) { @@ -34,14 +33,11 @@ ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context) } #define ace_signal_handlers_dispatcher ACE_SignalHandler(ace_sig_handlers_dispatch) -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ #else #define ace_signal_handler_dispatcher ACE_SignalHandler(ACE_Sig_Handler::dispatch) -#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) #define ace_signal_handlers_dispatcher ACE_SignalHandler(ACE_Sig_Handlers::dispatch) -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ #endif /* ACE_HAS_SIG_C_FUNC */ @@ -286,7 +282,6 @@ ACE_Sig_Handler::dispatch (int signum, // There are bugs with HP/UX's C++ compiler that prevents this stuff // from compiling... -#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) #define ACE_MAX_SIGNAL_HANDLERS ((size_t) 20) // Keeps track of the id that uniquely identifies each registered @@ -606,7 +601,7 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh) // ... and then insert the new signal handler into the beginning of // the set (note, this is a bit too tied up in the implementation of // ACE_Unbounded_Set...). - ACE_Sig_Adapter *temp; + ACE_Sig_Adapter *temp = 0; ACE_NEW_RETURN (temp, ACE_Sig_Adapter (new_sh, @@ -616,6 +611,4 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh) return *eh; } -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h index 6ea7218e941..0d99bf81341 100644 --- a/ACE/ace/Sig_Handler.h +++ b/ACE/ace/Sig_Handler.h @@ -82,7 +82,7 @@ public: // = Set/get the handler associated with a particular signal. - /// Return the <ACE_Sig_Handler> associated with @a signum. + /// Return the ACE_Sig_Handler associated with @a signum. virtual ACE_Event_Handler *handler (int signum); /// Set a new ACE_Event_Handler that is associated with @a signum. @@ -142,7 +142,6 @@ private: static ACE_Event_Handler *signal_handlers_[ACE_NSIG]; }; -#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) /** * @class ACE_Sig_Handlers * @@ -175,7 +174,7 @@ public: /** * Remove an ACE_Event_Handler currently associated with @a signum. - * We remove the handler if (1) its <sigkey> matches the <sigkey> + * We remove the handler if (1) its sigkey> matches the @a sigkey * passed as a parameter or (2) if we've been told to remove all the * handlers, i.e., <sigkey> == -1. If a new disposition is given it * is installed and the previous disposition is returned (if desired @@ -226,7 +225,6 @@ private: /// handler... static int third_party_sig_handler_; }; -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Timer_Hash.cpp b/ACE/ace/Timer_Hash.cpp deleted file mode 100644 index 532f0d83c64..00000000000 --- a/ACE/ace/Timer_Hash.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -#include "ace/Timer_Hash.h" -#include "ace/Synch_Traits.h" -#include "ace/Recursive_Thread_Mutex.h" - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Hash_T.cpp" -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -ACE_RCSID(ace, Timer_Hash, "$Id$") - diff --git a/ACE/ace/Timer_Hash_T.cpp b/ACE/ace/Timer_Hash_T.cpp index ee312e59547..aafe6c8b41c 100644 --- a/ACE/ace/Timer_Hash_T.cpp +++ b/ACE/ace/Timer_Hash_T.cpp @@ -492,7 +492,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reset_interval (long timer_id } // Locate and remove the single <ACE_Event_Handler> with a value of -// <timer_id> from the correct table timer queue. +// @a timer_id from the correct table timer queue. template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (long timer_id, @@ -726,7 +726,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value { expired = this->table_[i]->remove_first (); const void *act = expired->get_act (); - int reclaim = 1; + bool reclaim = true; Hash_Token<TYPE> *h = reinterpret_cast<Hash_Token<TYPE> *> (const_cast<void *> (act)); @@ -754,7 +754,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value // Since this is an interval timer, we need to // reschedule it. this->reschedule (expired); - reclaim = 0; + reclaim = false; } ACE_Timer_Node_Dispatch_Info_T<TYPE> info; diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h index 595193404c5..0f1fc07c6f3 100644 --- a/ACE/ace/Timer_Hash_T.h +++ b/ACE/ace/Timer_Hash_T.h @@ -201,17 +201,17 @@ public: virtual const ACE_Time_Value &earliest_time (void) const; /** - * Resets the interval of the timer represented by <timer_id> to - * <interval>, which is specified in relative time to the current - * <gettimeofday>. If <interval> is equal to - * <ACE_Time_Value::zero>, the timer will become a non-rescheduling + * Resets the interval of the timer represented by @a timer_id to + * @a interval, which is specified in relative time to the current + * <gettimeofday>. If @a interval is equal to + * ACE_Time_Value::zero, the timer will become a non-rescheduling * timer. Returns 0 if successful, -1 if not. */ virtual int reset_interval (long timer_id, const ACE_Time_Value &interval); /** - * Cancel all timer associated with <type>. If <dont_call> is 0 + * Cancel all timer associated with @a type. If <dont_call> is 0 * then the <functor> will be invoked. Returns number of timers * cancelled. */ @@ -219,13 +219,13 @@ public: int dont_call_handle_close = 1); /** - * Cancel the single timer that matches the <timer_id> value (which + * Cancel the single timer that matches the @a timer_id value (which * was returned from the <schedule> method). If act is non-NULL * then it will be set to point to the ``magic cookie'' argument * passed in when the timer was registered. This makes it possible * to free up the memory and avoid memory leaks. If <dont_call> is * 0 then the <functor> will be invoked. Returns 1 if cancellation - * succeeded and 0 if the <timer_id> wasn't found. + * succeeded and 0 if the @a timer_id wasn't found. */ virtual int cancel (long timer_id, const void **act = 0, @@ -260,10 +260,10 @@ public: private: /** - * Schedule <type> that will expire at <future_time>, - * which is specified in absolute time. If it expires then <act> is - * passed in as the value to the <functor>. If <interval> is != to - * <ACE_Time_Value::zero> then it is used to reschedule the <type> + * Schedule @a type that will expire at @a future_time, + * which is specified in absolute time. If it expires then @a act is + * passed in as the value to the <functor>. If @a interval is != to + * ACE_Time_Value::zero then it is used to reschedule the @a type * automatically, using relative time to the current <gettimeofday>. * This method returns a <timer_id> that is a pointer to a token * which stores information about the event. This <timer_id> can be @@ -316,9 +316,9 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Hash_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Timer_Hash_T.cpp") diff --git a/ACE/ace/Timer_Heap.cpp b/ACE/ace/Timer_Heap.cpp deleted file mode 100644 index 300859dba8f..00000000000 --- a/ACE/ace/Timer_Heap.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "ace/Timer_Heap.h" -#include "ace/Synch_Traits.h" -#include "ace/Recursive_Thread_Mutex.h" - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Hash.h" -#include "ace/Timer_Heap_T.cpp" - -ACE_RCSID(ace, - Timer_Heap, - "$Id$") - -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp index 5746b08b837..b00d796ba8f 100644 --- a/ACE/ace/Timer_Heap_T.cpp +++ b/ACE/ace/Timer_Heap_T.cpp @@ -701,7 +701,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::schedule_i (const TYPE &type, return -1; } -// Locate and remove the single timer with a value of <timer_id> from +// Locate and remove the single timer with a value of @a timer_id from // the timer queue. template <class TYPE, class FUNCTOR, class ACE_LOCK> int @@ -793,7 +793,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval (long timer_id, } } -// Locate and remove all values of <type> from the timer queue. +// Locate and remove all values of @a type from the timer queue. template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type, diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h index 2191588a555..1e6642c214d 100644 --- a/ACE/ace/Timer_Heap_T.h +++ b/ACE/ace/Timer_Heap_T.h @@ -132,17 +132,17 @@ public: virtual const ACE_Time_Value &earliest_time (void) const; /** - * Resets the interval of the timer represented by <timer_id> to - * <interval>, which is specified in relative time to the current - * <gettimeofday>. If <interval> is equal to - * <ACE_Time_Value::zero>, the timer will become a non-rescheduling + * Resets the interval of the timer represented by @a timer_id to + * @a interval, which is specified in relative time to the current + * <gettimeofday>. If @a interval is equal to + * ACE_Time_Value::zero, the timer will become a non-rescheduling * timer. Returns 0 if successful, -1 if not. */ virtual int reset_interval (long timer_id, const ACE_Time_Value &interval); /** - * Cancel all timers associated with <type>. If <dont_call> is 0 + * Cancel all timers associated with @a type. If <dont_call> is 0 * then the <functor> will be invoked. Returns number of timers * cancelled. */ @@ -150,13 +150,13 @@ public: int dont_call_handle_close = 1); /** - * Cancel the single timer that matches the <timer_id> value (which + * Cancel the single timer that matches the @a timer_id value (which * was returned from the <schedule> method). If act is non-NULL * then it will be set to point to the ``magic cookie'' argument * passed in when the timer was registered. This makes it possible * to free up the memory and avoid memory leaks. If <dont_call> is * 0 then the <functor> will be invoked. Returns 1 if cancellation - * succeeded and 0 if the <timer_id> wasn't found. + * succeeded and 0 if the @a timer_id wasn't found. */ virtual int cancel (long timer_id, const void **act = 0, @@ -185,13 +185,13 @@ protected: /** * Schedule a timer that may optionally auto-reset. - * Schedule <type> that will expire at <future_time>, - * which is specified in absolute time. If it expires then <act> is - * passed in as the value to the <functor>. If <interval> is != to - * <ACE_Time_Value::zero> then it is used to reschedule the <type> + * Schedule @a type that will expire at @a future_time, + * which is specified in absolute time. If it expires then @a act is + * passed in as the value to the <functor>. If @a interval is != to + * ACE_Time_Value::zero then it is used to reschedule the @a type * automatically, using relative time to the current <gettimeofday>. * This method returns a <timer_id> that uniquely identifies the the - * <type> entry in an internal list. This <timer_id> can be used to + * @a type entry in an internal list. This <timer_id> can be used to * cancel the timer before it expires. The cancellation ensures * that <timer_ids> are unique up to values of greater than 2 * billion timers. As long as timers don't stay around longer than @@ -219,7 +219,7 @@ protected: virtual void free_node (ACE_Timer_Node_T<TYPE> *); private: - /// Remove and return the @a slotth ACE_Timer_Node and restore the + /// Remove and return the @a sloth ACE_Timer_Node and restore the /// heap property. ACE_Timer_Node_T<TYPE> *remove (size_t slot); @@ -243,7 +243,7 @@ private: size_t slot, size_t child); - /// Copy <moved_node> into the @a slot slot of <heap_> and move + /// Copy @a moved_node into the @a slot slot of <heap_> and move /// @a slot into the corresponding slot in the <timer_id_> array. void copy (size_t slot, ACE_Timer_Node_T<TYPE> *moved_node); @@ -326,9 +326,9 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Heap_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Timer_Heap_T.cpp") diff --git a/ACE/ace/Timer_List.cpp b/ACE/ace/Timer_List.cpp deleted file mode 100644 index d94976115b5..00000000000 --- a/ACE/ace/Timer_List.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// $Id$ - -#include "ace/Timer_List.h" -#include "ace/Synch_Traits.h" -#include "ace/Recursive_Thread_Mutex.h" - -ACE_RCSID(ace, Timer_List, "$Id$") - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Hash.h" -#include "ace/Timer_List_T.cpp" -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - diff --git a/ACE/ace/Timer_List_T.cpp b/ACE/ace/Timer_List_T.cpp index 0af2bb67526..82055720782 100644 --- a/ACE/ace/Timer_List_T.cpp +++ b/ACE/ace/Timer_List_T.cpp @@ -272,7 +272,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval (long timer_id, } // Locate and remove the single <ACE_Event_Handler> with a value of -// <timer_id> from the timer queue. +// @a timer_id from the timer queue. template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, const void **act, diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h index 763ef9c905c..a49f721b199 100644 --- a/ACE/ace/Timer_List_T.h +++ b/ACE/ace/Timer_List_T.h @@ -140,7 +140,7 @@ public: * passed in when the timer was registered. This makes it possible * to free up the memory and avoid memory leaks. If <dont_call> is * 0 then the <functor> will be invoked. Returns 1 if cancellation - * succeeded and 0 if the <timer_id> wasn't found. + * succeeded and 0 if the @a timer_id wasn't found. */ virtual int cancel (long timer_id, const void** act = 0, @@ -165,13 +165,13 @@ public: private: /** - * Schedule <type> that will expire at <future_time>, which is - * specified in absolute time. If it expires then <act> is passed - * in as the value to the <functor>. If <interval> is != to - * <ACE_Time_Value::zero> then it is used to reschedule the <type> + * Schedule @a type that will expire at @a future_time, which is + * specified in absolute time. If it expires then @a act is passed + * in as the value to the <functor>. If @a interval is != to + * ACE_Time_Value::zero then it is used to reschedule the @a type * automatically, using relative time to the current <gettimeofday>. * This method returns a <timer_id> that uniquely identifies the the - * <type> entry in an internal list. This <timer_id> can be used to + * @a type entry in an internal list. This <timer_id> can be used to * cancel the timer before it expires. The cancellation ensures * that <timer_ids> are unique up to values of greater than 2 * billion timers. As long as timers don't stay around longer than @@ -214,9 +214,9 @@ private: ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &)) }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Timer_List_T.cpp") diff --git a/ACE/ace/Timer_Queue.cpp b/ACE/ace/Timer_Queue.cpp deleted file mode 100644 index f3cf230e6e8..00000000000 --- a/ACE/ace/Timer_Queue.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "ace/Containers.h" -#include "ace/Timer_Queue.h" -#include "ace/Synch_Traits.h" -#include "ace/Recursive_Thread_Mutex.h" - -ACE_RCSID(ace, Timer_Queue, "$Id$") - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Hash.h" -#include "ace/Timer_Queue_T.cpp" -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp index 8f76209147b..0f4179476f6 100644 --- a/ACE/ace/Timer_Queue_Adapters.cpp +++ b/ACE/ace/Timer_Queue_Adapters.cpp @@ -159,7 +159,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::ACE_Thread_Timer_Queue_Adapter (ACE_Thread_M TQ* timer_queue) : ACE_Task_Base (tm), timer_queue_(timer_queue), - delete_timer_queue_(0), + delete_timer_queue_(false), condition_ (mutex_), active_ (1), // Assume that we start in active mode. thr_id_ (ACE_OS::NULL_thread) @@ -168,7 +168,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::ACE_Thread_Timer_Queue_Adapter (ACE_Thread_M { ACE_NEW (this->timer_queue_, TQ); - this->delete_timer_queue_ = 1; + this->delete_timer_queue_ = true; } } @@ -179,7 +179,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::~ACE_Thread_Timer_Queue_Adapter (void) { delete this->timer_queue_; this->timer_queue_ = 0; - this->delete_timer_queue_ = 0; + this->delete_timer_queue_ = false; } } diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h index 3905b1d18b7..76255b2a231 100644 --- a/ACE/ace/Timer_Queue_Adapters.h +++ b/ACE/ace/Timer_Queue_Adapters.h @@ -221,7 +221,7 @@ private: /// Keeps track of whether we should delete the timer queue (if we /// didn't create it, then we don't delete it). - int delete_timer_queue_; + bool delete_timer_queue_; /// The mutual exclusion mechanism that is required to use the /// <condition_>. diff --git a/ACE/ace/Timer_Queue_Adapters.inl b/ACE/ace/Timer_Queue_Adapters.inl index e66168bbe98..3252b186e07 100644 --- a/ACE/ace/Timer_Queue_Adapters.inl +++ b/ACE/ace/Timer_Queue_Adapters.inl @@ -13,10 +13,10 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::timer_queue (void) const template<class TQ> ACE_INLINE int ACE_Thread_Timer_Queue_Adapter<TQ>::timer_queue (TQ *tq) { - if (this->delete_timer_queue_ != 0) + if (this->delete_timer_queue_) delete this->timer_queue_; this->timer_queue_ = tq; - this->delete_timer_queue_ = 0; + this->delete_timer_queue_ = false; return 0; } diff --git a/ACE/ace/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h index c539bd435a1..3df2d319520 100644 --- a/ACE/ace/Timer_Queue_T.h +++ b/ACE/ace/Timer_Queue_T.h @@ -232,13 +232,13 @@ public: virtual const ACE_Time_Value &earliest_time (void) const = 0; /** - * Schedule <type> that will expire at <future_time>, which is - * specified in absolute time. If it expires then <act> is passed - * in as the value to the <functor>. If <interval> is != to - * <ACE_Time_Value::zero> then it is used to reschedule the <type> + * Schedule @a type that will expire at @a future_time, which is + * specified in absolute time. If it expires then @a act is passed + * in as the value to the <functor>. If @a interval is != to + * ACE_Time_Value::zero then it is used to reschedule the @a type * automatically, using relative time to the current <gettimeofday>. * This method returns a <timer_id> that uniquely identifies the the - * <type> entry in an internal list. This <timer_id> can be used to + * @a type entry in an internal list. This <timer_id> can be used to * cancel the timer before it expires. The cancellation ensures * that <timer_ids> are unique up to values of greater than 2 * billion timers. As long as timers don't stay around longer than @@ -252,17 +252,17 @@ public: const ACE_Time_Value &interval = ACE_Time_Value::zero); /** - * Resets the interval of the timer represented by <timer_id> to - * <interval>, which is specified in relative time to the current - * <gettimeofday>. If <interval> is equal to - * <ACE_Time_Value::zero>, the timer will become a non-rescheduling + * Resets the interval of the timer represented by @a timer_id to + * @a interval, which is specified in relative time to the current + * <gettimeofday>. If @a interval is equal to + * ACE_Time_Value::zero, the timer will become a non-rescheduling * timer. Returns 0 if successful, -1 if not. */ virtual int reset_interval (long timer_id, const ACE_Time_Value &interval) = 0; /** - * Cancel all timer associated with <type>. If + * Cancel all timer associated with @a type. If * <dont_call_handle_close> is 0 then the <functor> will be invoked, * which typically invokes the <handle_close> hook. Returns number * of timers cancelled. @@ -271,14 +271,14 @@ public: int dont_call_handle_close = 1) = 0; /** - * Cancel the single timer that matches the <timer_id> value (which + * Cancel the single timer that matches the @a timer_id value (which * was returned from the <schedule> method). If act is non-NULL * then it will be set to point to the ``magic cookie'' argument * passed in when the timer was registered. This makes it possible * to free up the memory and avoid memory leaks. If * <dont_call_handle_close> is 0 then the <functor> will be invoked, * which typically calls the <handle_close> hook. Returns 1 if - * cancellation succeeded and 0 if the <timer_id> wasn't found. + * cancellation succeeded and 0 if the @a timer_id wasn't found. */ virtual int cancel (long timer_id, const void **act = 0, @@ -550,9 +550,9 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Timer_Queue_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Timer_Queue_T.cpp") diff --git a/ACE/ace/Timer_Wheel.cpp b/ACE/ace/Timer_Wheel.cpp deleted file mode 100644 index 4bd16b73df4..00000000000 --- a/ACE/ace/Timer_Wheel.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -#include "ace/Timer_Wheel.h" -#include "ace/Synch_Traits.h" -#include "ace/Recursive_Thread_Mutex.h" - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Wheel_T.cpp" -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -ACE_RCSID(ace, Timer_Wheel, "$Id$") - diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h index 6a93094df38..71acbed5f88 100644 --- a/ACE/ace/Timer_Wheel_T.h +++ b/ACE/ace/Timer_Wheel_T.h @@ -126,7 +126,7 @@ public: virtual int reset_interval (long timer_id, const ACE_Time_Value& interval); - /// Cancel all timer associated with <type>. If <dont_call> is 0 + /// Cancel all timer associated with @a type. If <dont_call> is 0 /// then the <functor> will be invoked. Returns number of timers /// cancelled. virtual int cancel (const TYPE& type, @@ -215,9 +215,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) #include "ace/Timer_Wheel_T.cpp" -#endif /* !ACE_HAS_BROKEN_HPUX_TEMPLATES */ #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 5c36247b101..8136720656a 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -253,11 +253,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca Throughput_Stats.cpp Time_Value.cpp Timeprobe.cpp - Timer_Hash.cpp - Timer_Heap.cpp - Timer_List.cpp - Timer_Queue.cpp - Timer_Wheel.cpp TLI.cpp TLI_Acceptor.cpp TLI_Connector.cpp diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index 130061a5595..b43248f9032 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -176,11 +176,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Throughput_Stats.cpp Time_Value.cpp Timeprobe.cpp - Timer_Hash.cpp - Timer_Heap.cpp - Timer_List.cpp - Timer_Queue.cpp - Timer_Wheel.cpp Token.cpp TP_Reactor.cpp Trace.cpp diff --git a/ACE/ace/config-ghs-common.h b/ACE/ace/config-ghs-common.h index 1cca934a067..8ffa331d8fd 100644 --- a/ACE/ace/config-ghs-common.h +++ b/ACE/ace/config-ghs-common.h @@ -27,7 +27,6 @@ # define ACE_LACKS_AUTO_PTR # define ACE_LACKS_CHAR_RIGHT_SHIFTS # define ACE_LACKS_UNBUFFERED_STREAMBUF -# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION # else # define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA # endif /* __STANDARD_CXX */ diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 91d20560994..b822b72bfc7 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -31,31 +31,6 @@ // support 64-bit or kernel threads. So, though this file has the C++ info // in it, it's copied from the 10.x file and hasn't been verified. -// There are 2 compiler-specific sections, plus a 3rd for common to both. -// First is the HP C++ section... -# if __cplusplus < 199707L - -# define ACE_HAS_BROKEN_HPUX_TEMPLATES - -// Compiler can't handle calls like foo->operator T *() -# define ACE_HAS_BROKEN_CONVERSIONS - -// Necessary with some compilers to pass ACE_TTY_IO as parameter to -// DEV_Connector. -# define ACE_NEEDS_DEV_IO_CONVERSION - -// Compiler's template mechanism must see source code (i.e., .C files). -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Compiler's template mechanism requires the use of explicit C++ -// specializations for all used templates. -# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - -// The HP/UX compiler doesn't support volatile!!!! -# define volatile - -# else // aC++ definitions - // Parts of TAO (at least) use __HP_aCC to detect this compiler, but the // macro is not set until A.03.13. If it's not set, set it - it won't be an // HP-advertised value, but we don't check the value/version - just whether @@ -128,8 +103,6 @@ // Compiler supports template specialization. # define ACE_HAS_TEMPLATE_SPECIALIZATION -# endif /* __cplusplus < 199707L */ - // Compiler doesn't handle 'signed char' correctly (used in ace/IOStream.h) # define ACE_LACKS_SIGNED_CHAR diff --git a/ACE/ace/config-irix6.5.x-sgic++.h b/ACE/ace/config-irix6.5.x-sgic++.h index 62a0d0f14ca..d3fada546a2 100644 --- a/ACE/ace/config-irix6.5.x-sgic++.h +++ b/ACE/ace/config-irix6.5.x-sgic++.h @@ -10,8 +10,6 @@ // Include IRIX 6.[234] configuration #include "ace/config-irix6.x-sgic++.h" -#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - // Irix 6.5 man pages show that they exist #undef ACE_LACKS_CONDATTR_PSHARED #undef ACE_LACKS_MUTEXATTR_PSHARED diff --git a/ACE/ace/config-irix6.x-sgic++.h b/ACE/ace/config-irix6.x-sgic++.h index fa2fba567c6..12dccafd5d5 100644 --- a/ACE/ace/config-irix6.x-sgic++.h +++ b/ACE/ace/config-irix6.x-sgic++.h @@ -16,7 +16,6 @@ // The following three should be enabled/disabled together. #if _COMPILER_VERSION >= 720 #define ACE_HAS_TEMPLATE_SPECIALIZATION -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION #else #define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA #endif /* _COMPILER_VERSION >= 720 */ diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h index d1db0fe45ca..65c0b6aba6f 100644 --- a/ACE/ace/config-macosx-panther.h +++ b/ACE/ace/config-macosx-panther.h @@ -14,8 +14,6 @@ # include "ace/config-g++-common.h" #endif /* __GNUG__ */ -#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - #define ACE_LACKS_SUSECONDS_T #define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h index 968f652dea8..bfa4524cda1 100644 --- a/ACE/ace/config-macosx-tiger.h +++ b/ACE/ace/config-macosx-tiger.h @@ -15,7 +15,6 @@ #endif /* __GNUG__ */ #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION #define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index cdcb55ef10e..c772efb07c8 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -14,8 +14,6 @@ # include "ace/config-g++-common.h" #endif /* __GNUG__ */ -#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - #define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") #if defined (ACE_HAS_PENTIUM) diff --git a/ACE/ace/config-qnx-rtp-pre62x.h b/ACE/ace/config-qnx-rtp-pre62x.h index 2dcb7271e25..5f32f71c318 100644 --- a/ACE/ace/config-qnx-rtp-pre62x.h +++ b/ACE/ace/config-qnx-rtp-pre62x.h @@ -146,7 +146,6 @@ #define ACE_LACKS_WCSPBRK #define ACE_LACKS_WCSRCHR -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION #define ACE_LACKS_ACE_IOSTREAM #include /**/ "ace/post.h" diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h index 69ced888e04..15b1ea097a1 100644 --- a/ACE/ace/config-sunos5.6.h +++ b/ACE/ace/config-sunos5.6.h @@ -12,11 +12,6 @@ #include "ace/config-sunos5.5.h" -#if defined(__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 95 -// gcc-2.95 fixes this problem for us! -#undef ACE_HAS_STL_QUEUE_CONFLICT -#endif /* __GNUC__ */ - #if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE > 2) || \ defined (__EXTENSIONS__) // The asctime_r/ctime_r parameters change at POSIX.1c-1995 diff --git a/ACE/ace/config-sunos5.7.h b/ACE/ace/config-sunos5.7.h index f0ed5766e3e..46e921c2239 100644 --- a/ACE/ace/config-sunos5.7.h +++ b/ACE/ace/config-sunos5.7.h @@ -25,22 +25,7 @@ // SunOS 5.7 has getloadavg() #undef ACE_LACKS_GETLOADAVG -#if defined (__GNUG__) -# if __GNUC__ <= 2 && __GNUC_MINOR__ < 8 - // Assume that later g++ were built on SunOS 5.7, so they don't - // have these problems . . . - - // Disable the following, because g++ 2.7.2.3 can't handle it. - // Maybe later g++ versions can? -# undef ACE_HAS_XPG4_MULTIBYTE_CHAR - - // The Solaris86 g++ 2.7.2.3 sys/types.h doesn't have these . . . - typedef long t_scalar_t; /* historical versions */ - typedef unsigned long t_uscalar_t; - typedef void *timeout_id_t; -# endif /* __GNUC__ <= 2 && __GNUC_MINOR__ < 8 */ - -#elif defined (ghs) +#if defined (ghs) // SunOS 5.7's /usr/include/sys/procfs_isa.h needs uint64_t, // but /usr/include/sys/int_types.h doesn't #define it because // _NO_LONGLONG is # diff --git a/ACE/ace/config-unixware-7.1.0.h b/ACE/ace/config-unixware-7.1.0.h index 667b93db8b0..808a247bb7f 100644 --- a/ACE/ace/config-unixware-7.1.0.h +++ b/ACE/ace/config-unixware-7.1.0.h @@ -345,11 +345,6 @@ /* Staller -> make 0 */ // #undef ACE_TEMPLATES_REQUIRE_SOURCE -/* Compiler's template instantiation mechanism supports the use of explicit - C++ specializations for all used templates. This is also used for GNU G++ - if you don't use the "repo" patches. */ -/* Staller -> make 0 */ -// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION 1 /*********************************************************************/ /* The OS/platform supports the poll() event demultiplexor */ diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h index ed3e0ee576d..d608bbee680 100644 --- a/ACE/ace/config-unixware-7.1.0.udk.h +++ b/ACE/ace/config-unixware-7.1.0.udk.h @@ -10,7 +10,6 @@ /* ACE configuration header file */ #define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION #ifndef UNIXWARE_7_1 #define UNIXWARE_7_1 diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h index fa72fb3847c..32de3ece103 100644 --- a/ACE/ace/config-win32-dmc.h +++ b/ACE/ace/config-win32-dmc.h @@ -56,7 +56,6 @@ # define ACE_HAS_STRING_CLASS 1 # define ACE_HAS_TEMPLATE_SPECIALIZATION 1 # define ACE_HAS_TEMPLATE_TYPEDEFS 1 -//# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION # define ACE_HAS_USER_MODE_MASKS 1 //# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 # define ACE_LACKS_STRPTIME 1 diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h index dc876f50dca..f90f42c62e4 100644 --- a/ACE/ace/config-win32-ghs.h +++ b/ACE/ace/config-win32-ghs.h @@ -64,7 +64,6 @@ # define ACE_HAS_STRING_CLASS 1 # define ACE_HAS_TEMPLATE_SPECIALIZATION 1 # define ACE_HAS_TEMPLATE_TYPEDEFS 1 -//# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION # define ACE_HAS_USER_MODE_MASKS 1 # define ACE_LACKS_ACE_IOSTREAM 1 //# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h index d54647a8204..b9c064c4359 100644 --- a/ACE/ace/config-win32-interix.h +++ b/ACE/ace/config-win32-interix.h @@ -24,7 +24,6 @@ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_NONCONST_SELECT_TIMEVAL -# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION # define ACE_HAS_SIGWAIT # define ACE_HAS_SIGINFO_T diff --git a/ACE/ace/os_include/os_semaphore.h b/ACE/ace/os_include/os_semaphore.h index e041eb061af..edf5532c6c5 100644 --- a/ACE/ace/os_include/os_semaphore.h +++ b/ACE/ace/os_include/os_semaphore.h @@ -56,7 +56,7 @@ extern "C" /// this->sema_ doesn't always get created dynamically if a platform /// doesn't support named posix semaphores. We use this flag to /// remember if we need to delete <sema_> or not. - int new_sema_; + bool new_sema_; # endif /* ACE_LACKS_NAMED_POSIX_SEM */ # if !defined (ACE_HAS_POSIX_SEM_TIMEOUT) && !defined (ACE_DISABLE_POSIX_SEM_TIMEOUT_EMULATION) |