diff options
| -rw-r--r-- | ChangeLog-97b | 6 | ||||
| -rw-r--r-- | ace/CORBA_Handler.h | 9 | ||||
| -rw-r--r-- | ace/CORBA_Handler.i | 16 | ||||
| -rw-r--r-- | examples/Connection/non_blocking/README | 6 |
4 files changed, 9 insertions, 28 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index c275967f86c..d74d8e1f587 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,3 +1,9 @@ +Fri Oct 3 11:39:45 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> + + * ace/CORBA_Handler: Removed the reactor() accessors since they + are subsumed by the methods in ACE_Event_Handler. Thanks to + Jean-Marc STRAUSS <strauss@objectif.fr> for reporting this. + Thu Oct 02 15:38:34 1997 <irfan@TWOSTEP> * Reactor: Renamed reset_new_handle to uses_event_associations. diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h index ec9439a1227..f32ac335e6a 100644 --- a/ace/CORBA_Handler.h +++ b/ace/CORBA_Handler.h @@ -73,12 +73,6 @@ public: ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. - void reactor (ACE_Reactor *); - // Set the reactor instance. - - ACE_Reactor *reactor (void) ; - // Get the reactor instance. - protected: ACE_CORBA_Handler (void); // Make this into an "abstract" class... @@ -98,9 +92,6 @@ protected: // Register <service_name> by doing a "putit" to register // <service_name> using the <marker_name> with orbixd. - ACE_Reactor *reactor_; - // Event demultiplexor used by ACE_ST_CORBA_Handler - ssize_t reference_count_; // Keep track of the number of active CORBA_Handlers. diff --git a/ace/CORBA_Handler.i b/ace/CORBA_Handler.i index 8b630a5fa11..a1f3bfbd774 100644 --- a/ace/CORBA_Handler.i +++ b/ace/CORBA_Handler.i @@ -22,22 +22,6 @@ ACE_ST_CORBA_Handler::iterations (size_t i) this->iterations_ = i; } -/* static */ -ACE_INLINE void -ACE_CORBA_Handler::reactor (ACE_Reactor *reactor) -{ - ACE_TRACE ("ACE_CORBA_Handler::reactor"); - this->reactor_ = reactor; -} - -/* static */ -ACE_INLINE ACE_Reactor * -ACE_CORBA_Handler::reactor (void) -{ - ACE_TRACE ("ACE_CORBA_Handler::reactor"); - return this->reactor_; -} - #if defined (ACE_HAS_MT_ORBIX) && (ACE_HAS_MT_ORBIX != 0) ACE_INLINE void ACE_MT_CORBA_Handler::thr_mgr (ACE_Thread_Manager *tm) diff --git a/examples/Connection/non_blocking/README b/examples/Connection/non_blocking/README index 748e167ed4a..74c44fe6de7 100644 --- a/examples/Connection/non_blocking/README +++ b/examples/Connection/non_blocking/README @@ -7,13 +7,13 @@ client). Here's how I typically run these tests: -% test_sock_acceptor localhost:10005 & +% test_sock_acceptor localhost:10020 & starting up daemon ./test_sock_acceptor -starting server addr 127.0.0.1:10007 on handle 5 +starting server addr 127.0.0.1:10020 on handle 5 client addr 127.0.0.1:10003 on handle 6 hello -% test_sock_connector localhost:10005 +% test_sock_connector localhost:10020 starting up daemon ./test_sock_connector activating 5 in handle_output |