diff options
| author | fredk <fredk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-02-01 21:36:02 +0000 |
|---|---|---|
| committer | fredk <fredk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-02-01 21:36:02 +0000 |
| commit | dbf1fa84190852549406ba9f5c1608f6f49ed3d1 (patch) | |
| tree | b64ee271064592974aae5f3743bc1a314241f967 | |
| parent | 294886b7a4b39d88e9e9195219ac48141b64ac81 (diff) | |
| download | ATCD-dbf1fa84190852549406ba9f5c1608f6f49ed3d1.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-99c | 4 | ||||
| -rw-r--r-- | TAO/tao/Connect.cpp | 12 | ||||
| -rw-r--r-- | TAO/tao/Connect.h | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 56e262af554..56f6d6aeccc 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,7 @@ +Mon Feb 1 15:33:59 1999 Fred Kuhns <fredk@cs.wuslt.edu> + * Updatet Connect.{h,cpp}, removed two unused args + TAO_IIOP_Handler_Base + Mon Feb 01 13:55:19 1999 David L. Levine <levine@cs.wustl.edu> * orbsvcs/tests/EC_Custom_Marshal/Makefile: ran make depend. diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp index 224f37477bd..c057d21b036 100644 --- a/TAO/tao/Connect.cpp +++ b/TAO/tao/Connect.cpp @@ -42,31 +42,25 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Connect_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (ACE_Thread_Manager *t) - : TAO_SVC_HANDLER (t) -{ -} - TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (TAO_ORB_Core *orb_core) : TAO_SVC_HANDLER (orb_core->thr_mgr (), 0, 0) { } -TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (ACE_Thread_Manager *t, int x, int y) +TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (ACE_Thread_Manager *t) : TAO_SVC_HANDLER (t, 0, 0) { } // @@ For pluggable protocols, added a reference to the corresponding transport obj. TAO_Server_Connection_Handler::TAO_Server_Connection_Handler (ACE_Thread_Manager *t) - : TAO_IIOP_Handler_Base (t ? t : TAO_ORB_Core_instance()->thr_mgr (), 0, 0), + : TAO_IIOP_Handler_Base (t ? t : TAO_ORB_Core_instance()->thr_mgr ()), orb_core_ (TAO_ORB_Core_instance ()) { iiop_transport_ = new TAO_IIOP_Server_Transport(this); } // @@ For pluggable protocols, added a reference to the corresponding transport obj. -//@@ iiop_transport_(new TAO_IIOP_Transport(TAO_IOP_TAG_INTERNET_IOP, this)) TAO_Server_Connection_Handler::TAO_Server_Connection_Handler (TAO_ORB_Core *orb_core) : TAO_IIOP_Handler_Base (orb_core), orb_core_ (orb_core) @@ -685,7 +679,7 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE) // @@ For pluggable protocols, added a reference to the corresponding transport obj. TAO_Client_Connection_Handler::TAO_Client_Connection_Handler (ACE_Thread_Manager *t) - : TAO_IIOP_Handler_Base (t == 0 ? TAO_ORB_Core_instance ()->thr_mgr () : t, 0, 0), + : TAO_IIOP_Handler_Base (t == 0 ? TAO_ORB_Core_instance ()->thr_mgr () : t), expecting_response_ (0), input_available_ (0) { diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h index ed5fa5d878b..0f8ab91acc7 100644 --- a/TAO/tao/Connect.h +++ b/TAO/tao/Connect.h @@ -45,7 +45,6 @@ class TAO_IIOP_Handler_Base : public TAO_SVC_HANDLER public: TAO_IIOP_Handler_Base (ACE_Thread_Manager *t); TAO_IIOP_Handler_Base (TAO_ORB_Core *orb_core); - TAO_IIOP_Handler_Base (ACE_Thread_Manager *t, int x, int y); virtual TAO_Transport *transport (void) = 0; }; |