diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-04 11:39:01 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-04 11:39:01 +0000 |
| commit | adeafd158470d00644912ef6d33be08dea122b3d (patch) | |
| tree | 57fe5011f7b6354477ab14af412afbb139513219 | |
| parent | b2bc820b0d8d505d4c859820fa7865d33bdc3565 (diff) | |
| download | ATCD-adeafd158470d00644912ef6d33be08dea122b3d.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/CIAO/ciao/Home_Servant_Impl_T.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp index 418950ddd13..ee7af2c4072 100644 --- a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp +++ b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp @@ -72,9 +72,10 @@ namespace CIAO return; } + typedef typename COMP_SVNT::_stub_type stub_type; typename COMP_SVNT::_stub_var_type _ciao_comp = - COMP_SVNT::_stub_type::_narrow (ccm_obj_var.in () - ACE_ENV_ARG_PARAMETER); + stub_type::_narrow (ccm_obj_var.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (_ciao_comp.in ())) @@ -157,9 +158,10 @@ namespace CIAO this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (COMP::_nil ()); + typedef typename COMP_SVNT::_exec_type exec_type; typename COMP_SVNT::_exec_type::_var_type _ciao_comp = - COMP_SVNT::_exec_type::_narrow (_ciao_ec.in () - ACE_ENV_ARG_PARAMETER); + exec_type::_narrow (_ciao_ec.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (COMP::_nil ()); return this->_ciao_activate_component (_ciao_comp.in () @@ -192,6 +194,7 @@ namespace CIAO ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ()); + typedef typename COMP_SVNT::_stub_type stub_type; COMP_SVNT *svt = 0; ACE_NEW_RETURN (svt, COMP_SVNT (exe, @@ -199,7 +202,7 @@ namespace CIAO this->ins_name_, this, this->container_), - COMP_SVNT::_stub_type::_nil ()); + stub_type::_nil ()); PortableServer::ServantBase_var safe (svt); PortableServer::ObjectId_var oid; @@ -210,9 +213,10 @@ namespace CIAO ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ()); + typedef typename COMP_SVNT::_stub_type stub_type; typename COMP_SVNT::_stub_var_type ho = - COMP_SVNT::_stub_type::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + stub_type::_narrow (objref.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ()); Components::CCMObject_var ccmobjref = |