diff options
Diffstat (limited to 'TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp')
| -rw-r--r-- | TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp index 8df9c7554e8..22ddf32cb00 100644 --- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -3,8 +3,8 @@ #ifndef CIAO_SWAPPING_SERVANT_IMPL_T_C #define CIAO_SWAPPING_SERVANT_IMPL_T_C -#include "ciao/Swapping_Servant_Home_Impl_T.h" -#include "ciao/Dynamic_Component_Servant_T.h" +#include "Swapping_Servant_Home_Impl_T.h" +#include "Dynamic_Component_Servant_T.h" namespace CIAO { @@ -105,7 +105,7 @@ namespace CIAO PortableServer::string_to_ObjectId (this->obj_id_); Dynamic_Component_Servant_Base *servant = 0; - if (this->dynamic_servant_map_.find (oid.in (), servant) == 0) + if (this->dynamic_servant_map_.find (oid, servant) == 0) { servant->destroy (oid); } @@ -230,7 +230,7 @@ namespace CIAO this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (COMP::_nil ()); - this->dynamic_servant_map_.bind (oid.in (), svt); + this->dynamic_servant_map_.bind (oid, svt); COMP_VAR ho = COMP::_narrow (objref.in () ACE_ENV_ARG_PARAMETER); |