From 0c333544a89363a8f8e197386c6e0c7dc39b2f04 Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Thu, 29 Sep 2005 16:35:27 +0000 Subject: Thu Sep 29 11:34:55 2005 William Otte --- TAO/CIAO/ChangeLog | 6 ++++++ TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 869738f9881..d6467681d56 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 29 11:34:55 2005 William Otte + + * ciao/Swapping_Servant_Home_Impl_T.cpp + + Fixed build problem on non-exception systems. + Thu Sep 29 07:28:12 UTC 2005 Johnny Willemsen * tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp: diff --git a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp index cc1ff27bcd9..22ddf32cb00 100644 --- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -228,7 +228,7 @@ namespace CIAO (ec, home.in (), this->ins_name_, this, this->container_); this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (COMP::_nil ()); this->dynamic_servant_map_.bind (oid, svt); -- cgit v1.2.1