diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2005-09-29 16:35:27 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2005-09-29 16:35:27 +0000 |
| commit | 0c333544a89363a8f8e197386c6e0c7dc39b2f04 (patch) | |
| tree | 9c50c8ee364e0168c4695537f82697f8ca228899 | |
| parent | 3ba33e364c6221b7f78f2b3f7f9d1c12d9489b5e (diff) | |
| download | ATCD-0c333544a89363a8f8e197386c6e0c7dc39b2f04.tar.gz | |
Thu Sep 29 11:34:55 2005 William Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
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 <wotte@dre.vanderbilt.edu> + + * ciao/Swapping_Servant_Home_Impl_T.cpp + + Fixed build problem on non-exception systems. + Thu Sep 29 07:28:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * 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); |