diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-04 11:41:46 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-04 11:41:46 +0000 |
| commit | 27549a0de8b55fb649a7f78028f03ec99ede7ef3 (patch) | |
| tree | e37e2258cb67b5ad037e2d1d6de0d4a2c164ce1d | |
| parent | adeafd158470d00644912ef6d33be08dea122b3d (diff) | |
| download | ATCD-27549a0de8b55fb649a7f78028f03ec99ede7ef3.tar.gz | |
ChangeLogTag: Tue Jul 4 11:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Dynamic_Component_Servant_T.cpp | 5 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index bb55c97685d..bf2cd7de384 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 4 11:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/Home_Servant_Impl_T.cpp: + Fixed compile problems with VxWorks 5.5.1 and GCC 2.96 + Tue Jul 4 06:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: diff --git a/TAO/CIAO/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/ciao/Dynamic_Component_Servant_T.cpp index 700a2094d02..c37f9763076 100644 --- a/TAO/CIAO/ciao/Dynamic_Component_Servant_T.cpp +++ b/TAO/CIAO/ciao/Dynamic_Component_Servant_T.cpp @@ -65,9 +65,10 @@ namespace CIAO swap_exec->incarnate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); + 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 (0); /// @@ Jai, should you be using ACE_NEW_THROW_EX here? diff --git a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp index 4f82cf739d8..12e8fc49527 100644 --- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -179,9 +179,10 @@ namespace CIAO this->dynamic_servant_map_.bind (oid.in (), svt); + 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 ()); return ho._retn (); |