diff options
| author | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-29 18:34:51 +0000 |
|---|---|---|
| committer | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-29 18:34:51 +0000 |
| commit | de22f7c09353b47153c3f59f4085b3e510aab5eb (patch) | |
| tree | 4445a522a9169dcc3f458f0f6f46e0bb5545ab67 /TAO/orbsvcs | |
| parent | 11d10c58543dcc0dcf0395716d2df453fbe0a93c (diff) | |
| download | ATCD-de22f7c09353b47153c3f59f4085b3e510aab5eb.tar.gz | |
ChangeLogTag:Fri Sep 29 13:34:45 2000 Marina Spivak <marina@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connect.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connect.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connect.cpp index d0b47e61b33..329beb175e5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connect.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connect.cpp @@ -375,7 +375,8 @@ TAO_SSLIOP_Client_Connection_Handler (ACE_Thread_Manager *t) TAO_SSLIOP_Client_Connection_Handler:: TAO_SSLIOP_Client_Connection_Handler (ACE_Thread_Manager *t, TAO_ORB_Core* orb_core, - CORBA::Boolean /* flag */) + CORBA::Boolean /* flag */, + void *arg) : TAO_SSLIOP_Handler_Base (t), transport_ (this, orb_core), orb_core_ (orb_core), diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index b81b856a727..d50d5831242 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -335,6 +335,7 @@ TAO_SSLIOP_Connect_Creation_Strategy::make_svc_handler TAO_SSLIOP_Client_Connection_Handler (this->orb_core_->thr_mgr (), this->orb_core_, + 0, this->arg_), -1); return 0; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp index eb9badd4600..d5a4f7349d7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp @@ -184,10 +184,6 @@ TAO_SSLIOP_Profile::encode (TAO_OutputCDR &stream) const TAO_SSLIOP_Profile *p = ACE_const_cast (TAO_SSLIOP_Profile *, this); -#if (TAO_HAS_RT_CORBA == 1) - // For now, use/transfer multiple endpoints per profile only with - // RTCORBA. - if (!this->endpoints_encoded_) r = p->encode_endpoints (); |