From 15f9b16afed320b4e581b8f61fee7d7fbf1aa9a8 Mon Sep 17 00:00:00 2001 From: okellogg Date: Tue, 29 Jan 2002 20:21:11 +0000 Subject: ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg --- TAO/tao/IORManipulation/IORC.cpp | 54 +++++++++++++------------- TAO/tao/IORManipulation/IORC.h | 60 ++++++++++++++--------------- TAO/tao/IORManipulation/IORC.i | 8 ++-- TAO/tao/IORManipulation/IORManip_Loader.cpp | 2 +- TAO/tao/IORManipulation/IORManip_Loader.h | 2 +- TAO/tao/IORManipulation/IORManipulation.cpp | 32 +++++++-------- TAO/tao/IORManipulation/IORManipulation.h | 18 ++++----- 7 files changed, 88 insertions(+), 88 deletions(-) (limited to 'TAO/tao/IORManipulation') diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index 783f085ef51..6432a6ef17f 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -84,7 +84,7 @@ void TAO_IOP::EmptyProfileList::_raise () void TAO_IOP::EmptyProfileList::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -97,7 +97,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode ( void TAO_IOP::EmptyProfileList::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -210,7 +210,7 @@ void TAO_IOP::NotFound::_raise () void TAO_IOP::NotFound::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -223,7 +223,7 @@ void TAO_IOP::NotFound::_tao_encode ( void TAO_IOP::NotFound::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -332,7 +332,7 @@ void TAO_IOP::Duplicate::_raise () void TAO_IOP::Duplicate::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -345,7 +345,7 @@ void TAO_IOP::Duplicate::_tao_encode ( void TAO_IOP::Duplicate::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -454,7 +454,7 @@ void TAO_IOP::Invalid_IOR::_raise () void TAO_IOP::Invalid_IOR::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -467,7 +467,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode ( void TAO_IOP::Invalid_IOR::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -576,7 +576,7 @@ void TAO_IOP::MultiProfileList::_raise () void TAO_IOP::MultiProfileList::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -589,7 +589,7 @@ void TAO_IOP::MultiProfileList::_tao_encode ( void TAO_IOP::MultiProfileList::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -761,10 +761,10 @@ TAO_IOP::TAO_IOR_Property_var::tao_nil (void) ::TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_IOP::TAO_IOR_Property::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -846,15 +846,15 @@ TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void) TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_IOR_Property::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TAO_IOR_Property::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1014,10 +1014,10 @@ TAO_IOP::TAO_IOR_Manipulation_var::tao_nil (void) ::TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1099,15 +1099,15 @@ TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void) TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_IOR_Manipulation::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TAO_IOR_Manipulation::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1230,11 +1230,11 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, target); - *tmp = CORBA::Object::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = CORBA::Object::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1337,7 +1337,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::EmptyProf { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1427,7 +1427,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::NotFound { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1517,7 +1517,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Duplicate { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1607,7 +1607,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Invalid_I { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1697,7 +1697,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProf { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index ed6557ecc35..601190f4f12 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -90,12 +90,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static EmptyProfileList *_downcast (CORBA::Exception *); @@ -136,12 +136,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NotFound *_downcast (CORBA::Exception *); @@ -182,12 +182,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static Duplicate *_downcast (CORBA::Exception *); @@ -228,12 +228,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static Invalid_IOR *_downcast (CORBA::Exception *); @@ -274,12 +274,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static MultiProfileList *_downcast (CORBA::Exception *); @@ -334,7 +334,7 @@ TAO_NAMESPACE TAO_IOP static TAO_IOR_Property_ptr tao_duplicate (TAO_IOR_Property_ptr); static void tao_release (TAO_IOR_Property_ptr); static TAO_IOR_Property_ptr tao_nil (void); - static TAO_IOR_Property_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static TAO_IOR_Property_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -389,11 +389,11 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj); static TAO_IOR_Property_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_IOR_Property_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_IOR_Property_ptr _nil (void) { @@ -402,7 +402,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual CORBA::Boolean set_property ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -412,7 +412,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual CORBA::Boolean set_primary ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -422,7 +422,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual CORBA::Object_ptr get_primary ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -431,7 +431,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual CORBA::Boolean is_primary_set ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -492,7 +492,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object static TAO_IOR_Manipulation_ptr tao_duplicate (TAO_IOR_Manipulation_ptr); static void tao_release (TAO_IOR_Manipulation_ptr); static TAO_IOR_Manipulation_ptr tao_nil (void); - static TAO_IOR_Manipulation_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static TAO_IOR_Manipulation_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -547,11 +547,11 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj); static TAO_IOR_Manipulation_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_IOR_Manipulation_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_IOR_Manipulation_ptr _nil (void) { @@ -590,7 +590,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; @@ -709,7 +709,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -721,7 +721,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Object_ptr add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -733,7 +733,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Object_ptr remove_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -745,7 +745,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Boolean set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -757,7 +757,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -770,7 +770,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Object_ptr get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -780,7 +780,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Boolean is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -789,7 +789,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::ULong is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -798,7 +798,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::ULong get_profile_count ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i index 073be5e1c98..f7d24f5143b 100644 --- a/TAO/tao/IORManipulation/IORC.i +++ b/TAO/tao/IORManipulation/IORC.i @@ -70,10 +70,10 @@ tao_TAO_IOP_TAO_IOR_Property_nil ( ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr tao_TAO_IOP_TAO_IOR_Property_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_IOP::TAO_IOR_Property::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -494,10 +494,10 @@ tao_TAO_IOP_TAO_IOR_Manipulation_nil ( ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr tao_TAO_IOP_TAO_IOR_Manipulation_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_IOP::TAO_IOR_Manipulation::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp index 46365ab2016..2ac6b5b4597 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.cpp +++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp @@ -27,7 +27,7 @@ CORBA::Object_ptr TAO_IORManip_Loader::create_object (CORBA::ORB_ptr, int, char *[] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h index 68d63af9f64..af9b77b1984 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.h +++ b/TAO/tao/IORManipulation/IORManip_Loader.h @@ -36,7 +36,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv [] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Creates a IORManip factory and returns it. diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 95df98ceb57..728d357f902 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -50,7 +50,7 @@ TAO_IOR_Manipulation_impl::_remove_ref (void) CORBA::Object_ptr TAO_IOR_Manipulation_impl::merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::EmptyProfileList, TAO_IOP::Duplicate, @@ -121,7 +121,7 @@ TAO_IOR_Manipulation_impl::merge_iors ( TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string Merged_Profiles - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Make the stub memory allocation exception safe for the duration @@ -156,7 +156,7 @@ CORBA::Object_ptr TAO_IOR_Manipulation_impl::add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList, @@ -170,14 +170,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 TAO_ENV_ARG_PARAMETER); + return this->merge_iors (iors ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr TAO_IOR_Manipulation_impl::remove_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::Invalid_IOR, @@ -225,7 +225,7 @@ TAO_IOR_Manipulation_impl::remove_profiles ( TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string Diff_Profiles - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Make the stub memory allocation exception safe for the duration @@ -260,7 +260,7 @@ CORBA::Boolean TAO_IOR_Manipulation_impl::set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -275,7 +275,7 @@ TAO_IOR_Manipulation_impl::set_property ( // Call the implementation object to return prop->set_property (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean @@ -283,7 +283,7 @@ TAO_IOR_Manipulation_impl::set_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -306,14 +306,14 @@ TAO_IOR_Manipulation_impl::set_primary ( // Call the callback object to do the rest of the processing. return prop->set_primary (ior1, ior2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr TAO_IOR_Manipulation_impl::get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -329,27 +329,27 @@ TAO_IOR_Manipulation_impl::get_primary ( // here? return prop->get_primary (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_IOR_Manipulation_impl::is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - return prop->is_primary_set (ior TAO_ENV_ARG_PARAMETER); + return prop->is_primary_set (ior ACE_ENV_ARG_PARAMETER); } CORBA::ULong TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound @@ -381,7 +381,7 @@ TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::ULong TAO_IOR_Manipulation_impl::get_profile_count ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h index f446acfdb12..2fe4a8cc396 100644 --- a/TAO/tao/IORManipulation/IORManipulation.h +++ b/TAO/tao/IORManipulation/IORManipulation.h @@ -63,7 +63,7 @@ public: virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList, @@ -74,7 +74,7 @@ public: virtual CORBA::Object_ptr add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList, @@ -85,7 +85,7 @@ public: virtual CORBA::Object_ptr remove_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::Invalid_IOR, @@ -96,7 +96,7 @@ public: virtual CORBA::Boolean set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -108,7 +108,7 @@ public: TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -120,7 +120,7 @@ public: virtual CORBA::Object_ptr get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -130,7 +130,7 @@ public: virtual CORBA::Boolean is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -139,7 +139,7 @@ public: virtual CORBA::ULong is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound @@ -147,7 +147,7 @@ public: virtual CORBA::ULong get_profile_count ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList -- cgit v1.2.1