diff options
| -rw-r--r-- | ChangeLog-96b | 12 | ||||
| -rw-r--r-- | ace/Event_Handler.cpp | 4 | ||||
| -rw-r--r-- | ace/Event_Handler.h | 4 | ||||
| -rw-r--r-- | ace/Log_Msg.cpp | 3 | ||||
| -rw-r--r-- | ace/Message_Queue.cpp | 2 | ||||
| -rw-r--r-- | ace/ReactorEx.cpp | 4 |
6 files changed, 21 insertions, 8 deletions
diff --git a/ChangeLog-96b b/ChangeLog-96b index 07cc44df712..3b143f4c2f2 100644 --- a/ChangeLog-96b +++ b/ChangeLog-96b @@ -1,5 +1,17 @@ Mon Dec 2 14:13:44 1996 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + * ace: Changed all occurrences of ACE_Event_Handler + reactorex() to reactorEx() to be consistent. Thanks to + Matthias for suggesting this. + + * ace/Message_Queue.cpp (close): We didn't allocate the memory for + the notification_strategy_, so we darn well can't delete it! + Thanks to Matthias for finding this. + + * ace/Log_Msg.cpp (ACE_TSS_cleanup): Made the ACE_TSS_cleanup + function extern "C" for MVS C++ and compilers like it... Thanks + to Chuck Gehr for reporting this. + * tests/Naming_Test.cpp (main): Added delete ns_context to close things down and free up the semaphores. Thanks to David Levine for suggesting this. diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp index d1f11cfc29b..ef2fbdb9b64 100644 --- a/ace/Event_Handler.cpp +++ b/ace/Event_Handler.cpp @@ -152,14 +152,14 @@ ACE_Event_Handler::reactor (void) const } void -ACE_Event_Handler::reactorex (ACE_ReactorEx *reactorex) +ACE_Event_Handler::reactorEx (ACE_ReactorEx *reactorex) { ACE_TRACE ("ACE_Event_Handler::reactorex"); this->reactorex_ = reactorex; } ACE_ReactorEx * -ACE_Event_Handler::reactorex (void) const +ACE_Event_Handler::reactorEx (void) const { ACE_TRACE ("ACE_Event_Handler::ReactorEx"); diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h index 42ab219c69b..d699e886901 100644 --- a/ace/Event_Handler.h +++ b/ace/Event_Handler.h @@ -132,8 +132,8 @@ public: virtual void reactor (ACE_Reactor *reactor); virtual ACE_Reactor *reactor (void) const; - virtual void reactorex (ACE_ReactorEx *reactorex); - virtual ACE_ReactorEx *reactorex (void) const; + virtual void reactorEx (ACE_ReactorEx *reactorex); + virtual ACE_ReactorEx *reactorEx (void) const; virtual void proactor (ACE_Proactor *proactor); virtual ACE_Proactor *proactor (void) const; diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index e1d83470190..311142b28ff 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -52,6 +52,9 @@ static ACE_thread_key_t key_; #endif /* VXWORKS */ /* static */ +#if defined (ACE_HAS_THR_C_FUNC) +extern "C" +#endif /* ACE_HAS_THR_C_FUNC */ void ACE_TSS_cleanup (void *ptr) { diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp index ed810652121..85967ce42ce 100644 --- a/ace/Message_Queue.cpp +++ b/ace/Message_Queue.cpp @@ -135,8 +135,6 @@ ACE_Message_Queue<ACE_SYNCH_2>::close (void) delete temp; } - delete this->notification_strategy_; - return res; } diff --git a/ace/ReactorEx.cpp b/ace/ReactorEx.cpp index 1fbbec42c9c..2ee63d21e6d 100644 --- a/ace/ReactorEx.cpp +++ b/ace/ReactorEx.cpp @@ -56,7 +56,7 @@ ACE_ReactorEx::register_handler (ACE_Event_Handler *eh, this->active_handles_++; // Assign *this* <ReactorEx> to the <Event_Handler>. - eh->reactorex (this); + eh->reactorEx (this); return 0; } @@ -84,7 +84,7 @@ ACE_ReactorEx::remove_handler (ACE_Event_Handler *eh, // Reinitial the ReactorEx pointer since we no longer point // to this one. - handlers_[index]->reactorex (0); + handlers_[index]->reactorEx (0); // If there was only one handle, reset the pointer to 0. if (this->active_handles_ == 1) |