diff options
Diffstat (limited to 'TAO/tao/IORManipulation/IORManipulation.cpp')
| -rw-r--r-- | TAO/tao/IORManipulation/IORManipulation.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index dcc9217a1fb..28ad17d8f5e 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -26,7 +26,7 @@ TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void) CORBA::Object_ptr TAO_IOR_Manipulation_impl::merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::EmptyProfileList, TAO_IOP::Duplicate, @@ -97,8 +97,7 @@ TAO_IOR_Manipulation_impl::merge_iors ( TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string Merged_Profiles - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ); // Make the stub memory allocation exception safe for the duration // of this method. @@ -112,7 +111,6 @@ TAO_IOR_Manipulation_impl::merge_iors ( CORBA::Object_var new_obj = temp_obj; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Clean up in case of errors. if (CORBA::is_nil (new_obj.in ())) @@ -132,7 +130,7 @@ CORBA::Object_ptr TAO_IOR_Manipulation_impl::add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::EmptyProfileList, TAO_IOP::Duplicate, @@ -144,14 +142,14 @@ TAO_IOR_Manipulation_impl::add_profiles ( buffer [0] = ior1; buffer [1] = ior2; TAO_IOP::TAO_IOR_Manipulation::IORList iors (2, 2, buffer, 0); - return this->merge_iors (iors ACE_ENV_ARG_PARAMETER); + return this->merge_iors (iors); } CORBA::Object_ptr TAO_IOR_Manipulation_impl::remove_profiles ( CORBA::Object_ptr group, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::Invalid_IOR, @@ -197,8 +195,7 @@ TAO_IOR_Manipulation_impl::remove_profiles ( TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string Diff_Profiles - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ); // Make the stub memory allocation exception safe for the duration // of this method. @@ -244,7 +241,7 @@ CORBA::Boolean TAO_IOR_Manipulation_impl::set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::Invalid_IOR, TAO_IOP::Duplicate)) @@ -256,7 +253,7 @@ TAO_IOR_Manipulation_impl::set_property ( // Call the implementation object to return prop->set_property (group - ACE_ENV_ARG_PARAMETER); + ); } //@@ note awkward argument order @@ -265,7 +262,7 @@ TAO_IOR_Manipulation_impl::set_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr new_primary, CORBA::Object_ptr group - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::Invalid_IOR, TAO_IOP::Duplicate, @@ -285,14 +282,14 @@ TAO_IOR_Manipulation_impl::set_primary ( // Call the callback object to do the rest of the processing. return prop->set_primary (new_primary, group - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Object_ptr TAO_IOR_Manipulation_impl::get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -308,34 +305,34 @@ TAO_IOR_Manipulation_impl::get_primary ( // here? return prop->get_primary (group - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean TAO_IOR_Manipulation_impl::is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - return prop->is_primary_set (group ACE_ENV_ARG_PARAMETER); + return prop->is_primary_set (group); } CORBA::Boolean TAO_IOR_Manipulation_impl:: remove_primary_tag ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - return prop->remove_primary_tag (group ACE_ENV_ARG_PARAMETER); + return prop->remove_primary_tag (group); } CORBA::ULong TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::NotFound)) { @@ -365,7 +362,7 @@ TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::ULong TAO_IOR_Manipulation_impl::get_profile_count ( CORBA::Object_ptr group - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::EmptyProfileList)) { |