diff options
728 files changed, 7526 insertions, 11394 deletions
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp index 1e48a102f8c..99d431bc2cb 100644 --- a/TAO/tao/Abstract_Servant_Base.cpp +++ b/TAO/tao/Abstract_Servant_Base.cpp @@ -18,12 +18,15 @@ TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void) // No-Op. } -TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (const TAO_Abstract_ServantBase &) +TAO_Abstract_ServantBase::TAO_Abstract_ServantBase ( + const TAO_Abstract_ServantBase &) { // No-Op } -TAO_Abstract_ServantBase & TAO_Abstract_ServantBase::operator= (const TAO_Abstract_ServantBase&) +TAO_Abstract_ServantBase& +TAO_Abstract_ServantBase::operator= ( + const TAO_Abstract_ServantBase&) { return *this; } diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h index 90feed1c79a..f4a5877ec2c 100644 --- a/TAO/tao/Abstract_Servant_Base.h +++ b/TAO/tao/Abstract_Servant_Base.h @@ -20,13 +20,12 @@ #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" +#include /**/ "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "tao/TAO_Export.h" #include "tao/Basic_Types.h" #include "tao/Collocation_Strategy.h" #include "tao/CORBA_methods.h" @@ -43,8 +42,6 @@ namespace CORBA class InterfaceDef; typedef InterfaceDef *InterfaceDef_ptr; - class Environment; - class Object; typedef Object *Object_ptr; typedef TAO_Pseudo_Var_T<Object> Object_var; @@ -60,18 +57,12 @@ typedef void (*TAO_Skeleton)( TAO_ServerRequest &, void *, void * -#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) - , CORBA::Environment & -#endif ); typedef void (*TAO_Collocated_Skeleton)( TAO_Abstract_ServantBase *, TAO::Argument **, int -#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) - , CORBA::Environment & -#endif ); class TAO_Export TAO_Abstract_ServantBase @@ -81,49 +72,40 @@ public: virtual ~TAO_Abstract_ServantBase (void); /// Local implementation of the CORBA::Object::_is_a method. - virtual CORBA::Boolean _is_a (const char* logical_type_id - ACE_ENV_ARG_DECL) = 0; + virtual CORBA::Boolean _is_a (const char* logical_type_id) = 0; /// Default @c _non_existent: always returns false. - virtual CORBA::Boolean _non_existent ( - ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual CORBA::Boolean _non_existent (void) = 0; /// Query the Interface Repository. - virtual CORBA::InterfaceDef_ptr _get_interface ( - ACE_ENV_SINGLE_ARG_DECL - ) = 0; + virtual CORBA::InterfaceDef_ptr _get_interface (void) = 0; /// Default @c _get_component: always returns nil. - virtual CORBA::Object_ptr _get_component ( - ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual CORBA::Object_ptr _get_component (void) = 0; /// Default @c _repository_id - virtual char * _repository_id ( - ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual char * _repository_id (void) = 0; //@{ /** * @name Reference Counting Operations */ /// Increase reference count by one. - virtual void _add_ref ( - ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void _add_ref (void) = 0; /** * Decreases reference count by one; if the resulting reference * count equals zero, _remove_ref invokes delete on its this pointer * in order to destroy the servant. */ - virtual void _remove_ref ( - ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void _remove_ref (void) = 0; /// Returns the current reference count value. - virtual CORBA::ULong _refcount_value ( - ACE_ENV_SINGLE_ARG_DECL) const = 0; + virtual CORBA::ULong _refcount_value (void) const = 0; //@} /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual TAO_Stub *_create_stub (void) = 0; /// Find an operation in the operation table and return a /// TAO_Skeleton which can be used to make upcalls @@ -158,17 +140,14 @@ protected: * any) or the exceptions thrown into @a request. */ virtual void _dispatch (TAO_ServerRequest &request, - void *servant_upcall - ACE_ENV_ARG_DECL) = 0; + void *servant_upcall) = 0; virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req, void *servant_upcall, - void *derived_this - ACE_ENV_ARG_DECL) = 0; + void *derived_this) = 0; /// Get this interface's repository id (TAO specific). virtual const char *_interface_repository_id (void) const = 0; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index ca0662470c6..a813676ba0d 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -4,7 +4,6 @@ #include "tao/Profile.h" #include "tao/Transport_Acceptor.h" #include "tao/Protocol_Factory.h" -#include "tao/Environment.h" #include "tao/ORB_Core.h" #include "tao/params.h" #include "tao/MProfile.h" @@ -123,8 +122,7 @@ int TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, ACE_Reactor *reactor, const TAO_EndpointSet &endpoint_set, - bool ignore_address - ACE_ENV_ARG_DECL) + bool ignore_address) { if (endpoint_set.is_empty () // No endpoints were specified, we let each protocol pick its @@ -231,7 +229,6 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (-1); } TAO_EndpointSetIterator endpoints (endpoint_set); @@ -293,9 +290,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, reactor, addrs, factory, - ignore_address - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ignore_address); if (result != 0) { @@ -683,8 +678,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, ACE_Reactor *reactor, ACE_CString &addrs, TAO_ProtocolFactorySetItor &factory, - bool ignore_address - ACE_ENV_ARG_DECL) + bool ignore_address) { ACE_CString options_tmp; this->extract_endpoint_options (addrs, diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index 5f6279a161c..4d738f7f9bc 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -73,8 +73,7 @@ public: int open (TAO_ORB_Core *orb_core, ACE_Reactor *reactor, const TAO_EndpointSet &endpoint_set, - bool ignore_address - ACE_ENV_ARG_DECL); + bool ignore_address); /// Close all open acceptors. int close_all (void); @@ -134,8 +133,7 @@ private: ACE_Reactor *reactor, ACE_CString &address, TAO_ProtocolFactorySetItor &factory, - bool ignore_address - ACE_ENV_ARG_DECL); + bool ignore_address); private: diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index 86750d406bd..25eb2828608 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -48,17 +48,17 @@ public: virtual ~TAO_Adapter (void); /// Initialize the Adapter - virtual void open (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void open (void) = 0; /// The ORB is shutting down, destroy any resources attached to this /// adapter. virtual void close (int wait_for_completion - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Check if the adapter can be closed in the current context, raise /// an exception if not. virtual void check_close (int wait_for_completion - ACE_ENV_ARG_DECL) = 0; + ) = 0; /** * Return the priority assigned to this adapter. @@ -71,7 +71,7 @@ public: virtual int dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) = 0; + ) = 0; enum { /// The operation was successfully dispatched, an exception may diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp index 16aa66007e0..49600648fcb 100644 --- a/TAO/tao/Adapter_Registry.cpp +++ b/TAO/tao/Adapter_Registry.cpp @@ -36,46 +36,42 @@ TAO_Adapter_Registry::~TAO_Adapter_Registry (void) void TAO_Adapter_Registry::close (int wait_for_completion - ACE_ENV_ARG_DECL) + ) { - ACE_TRY + try { for (size_t i = 0; i != this->adapters_count_; ++i) { this->adapters_[i]->close (wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 3) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, "Exception in TAO_Adapter_Registry::close ()"); } return; } - ACE_ENDTRY; return; } void -TAO_Adapter_Registry::check_close (int wait_for_completion - ACE_ENV_ARG_DECL) +TAO_Adapter_Registry::check_close (int wait_for_completion) { for (size_t i = 0; i != this->adapters_count_; ++i) { this->adapters_[i]->check_close (wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } void TAO_Adapter_Registry::insert (TAO_Adapter *adapter - ACE_ENV_ARG_DECL) + ) { if (this->adapters_capacity_ == this->adapters_count_) { @@ -84,7 +80,6 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter ACE_NEW_THROW_EX (tmp, TAO_Adapter*[this->adapters_capacity_], CORBA::NO_MEMORY ()); - ACE_CHECK; for (size_t i = 0; i != this->adapters_count_; ++i) tmp[i] = this->adapters_[i]; @@ -115,15 +110,14 @@ void TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) + ) { for (size_t i = 0; i != this->adapters_count_; ++i) { int const r = this->adapters_[i]->dispatch (key, request, forward_to - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (r != TAO_Adapter::DS_MISMATCHED_KEY) { @@ -133,7 +127,7 @@ TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key, if (CORBA::is_nil (forward_to)) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } } diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h index 3af900bf370..8dde72b3288 100644 --- a/TAO/tao/Adapter_Registry.h +++ b/TAO/tao/Adapter_Registry.h @@ -63,7 +63,7 @@ public: * POA while performing an upcall). */ void close (int wait_for_completion - ACE_ENV_ARG_DECL); + ); /** * Verify if the close() call can be invoked in the current @@ -71,11 +71,11 @@ public: * Raise the right exception if not. */ void check_close (int wait_for_completion - ACE_ENV_ARG_DECL); + ); /// Insert a new adapter into the registry. void insert (TAO_Adapter *adapter - ACE_ENV_ARG_DECL); + ); /** * Dispatch the request to all the adapters. @@ -85,7 +85,7 @@ public: void dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - ACE_ENV_ARG_DECL); + ); /// Create a collocated object using the given profile and stub. CORBA::Object_ptr create_collocated_object (TAO_Stub *, diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp index d968f65b205..ee9de863444 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp @@ -83,20 +83,19 @@ CORBA::Boolean TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The CORBA::TypeCode base class already verified equality of the // base attributes (id and name). Perform an equality comparison of // the content. CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<StringType>::get_typecode (this->content_type_)->equal ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } template<typename StringType, @@ -107,7 +106,7 @@ TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equivalence already verified in the base class // CORBA::TypeCode::equivalent() method. @@ -121,8 +120,7 @@ template<typename StringType, CORBA::TypeCode_ptr TAO::TypeCode::Alias<StringType, TypeCodeType, - RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + RefCountPolicy>::get_compact_typecode_i (void) const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -138,22 +136,21 @@ TAO::TypeCode::Alias<StringType, CORBA::TypeCode_var compact_content_type = Traits<StringType>::get_typecode ( this->content_type_)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); if (this->kind_ == CORBA::tk_alias) { return adapter->create_alias_tc (this->attributes_.id (), "", /* empty name */ compact_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } else { return adapter->create_value_box_tc (this->attributes_.id (), "", /* empty name */ compact_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } } @@ -164,7 +161,7 @@ char const * TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -178,7 +175,7 @@ char const * TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -192,7 +189,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::content_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index 201f3f001fc..d9f8b60b4c1 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -89,15 +89,12 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr content_type_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index c3c9e26c1a6..a2db7f4602c 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -73,29 +73,26 @@ TAO::TypeCode::Alias<char const *, CORBA::Boolean TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + TAO::Null_RefCount_Policy>::equal_i ( + CORBA::TypeCode_ptr tc) const { // The CORBA::TypeCode base class already verified equality of the // base attributes (id and name). Perform an equality comparison of // the content. CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<char const *>::get_typecode (this->content_type_)->equal ( - rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + rhs_content_type.in ()); } CORBA::Boolean TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::equivalent_i ( - CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + CORBA::TypeCode_ptr) const { // Equivalence already verified in the base class // CORBA::TypeCode::equivalent() method. @@ -107,7 +104,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -123,30 +120,27 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode_var compact_content_type = Traits<char const *>::get_typecode ( this->content_type_)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); if (this->kind_ == CORBA::tk_alias) { return adapter->create_alias_tc (this->attributes_.id (), "", /* empty name */ compact_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } else { return adapter->create_value_box_tc (this->attributes_.id (), "", /* empty name */ - compact_content_type.in () - ACE_ENV_ARG_PARAMETER); + compact_content_type.in ()); } } char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + TAO::Null_RefCount_Policy>::id_i (void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -156,8 +150,7 @@ TAO::TypeCode::Alias<char const *, char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + TAO::Null_RefCount_Policy>::name_i (void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -168,7 +161,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::content_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h index ce78541df83..709c11039d8 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h @@ -87,15 +87,12 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr content_type_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 19a025db41e..22933693e3d 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -133,7 +133,7 @@ CORBA::Any::_tao_byte_order (void) const void CORBA::Any::type (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean equiv = false; @@ -141,8 +141,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc { equiv = this->impl_->_tao_get_typecode ()->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } if (equiv) @@ -151,7 +150,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc } else { - ACE_THROW (CORBA::BAD_TYPECODE ()); + throw ( ::CORBA::BAD_TYPECODE ()); } } @@ -277,7 +276,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) return false; } - ACE_TRY_NEW_ENV + try { TAO::Unknown_IDL_Type *impl = 0; ACE_NEW_RETURN (impl, @@ -286,14 +285,12 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) any.replace (impl); impl->_tao_decode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index b158adc7feb..27ff8682aa1 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -52,7 +52,6 @@ namespace CORBA class ValueBase; class Exception; - class Environment; /** * @class Any @@ -155,7 +154,7 @@ namespace CORBA /// For use along with <<= of a value of aliased type when the alias must /// be preserved. void type (TypeCode_ptr - ACE_ENV_ARG_DECL); + ); /// TAO extension, does not return a duplicate. CORBA::TypeCode_ptr _tao_get_typecode (void) const; diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 97cda1e2d59..4f233f8040e 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -62,13 +62,12 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == false) { @@ -125,10 +124,9 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { } - ACE_ENDTRY; return 0; } @@ -164,11 +162,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void) template<typename T_slice, typename T_forany> void TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index f7c0d1656ab..40bfa33c897 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -54,7 +54,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); virtual const void *value (void) const; virtual void free_value (void); diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index d5e0e364af3..93f5e5848c1 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -23,10 +23,8 @@ namespace TAO : Any_Impl (0, tc), kind_ (CORBA::tk_null) { - ACE_DECLARE_NEW_CORBA_ENV; this->kind_ = TAO::unaliased_kind (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); switch (this->kind_) { @@ -101,13 +99,12 @@ namespace TAO CORBA::TypeCode_ptr tc, void *_tao_elem) { - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (!_tao_equiv) { @@ -143,8 +140,7 @@ namespace TAO // Get the kind of the type where we are extracting in ie. the // aliased type if there are any. Passing the aliased kind // will not help. - CORBA::TCKind const tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::TCKind const tck = tc->kind (); // We don't want the rd_ptr of unk to move, in case it is // shared by another Any. This copies the state, not the buffer. @@ -167,10 +163,9 @@ namespace TAO // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -264,20 +259,18 @@ namespace TAO void Any_Basic_Impl::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } Any_Basic_Impl * Any_Basic_Impl::create_empty (CORBA::TypeCode_ptr tc) { - ACE_DECLARE_NEW_CORBA_ENV; - CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TCKind const kind = tc->kind (); TAO::Any_Basic_Impl * retval = 0; diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h index 563a252d54a..848056f6ab4 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h @@ -57,8 +57,7 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &, CORBA::Long); - virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL); + virtual void _tao_decode (TAO_InputCDR &); static Any_Basic_Impl *create_empty (CORBA::TypeCode_ptr); diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index 7c892b754d3..79f8f0e2785 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -53,12 +53,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, CORBA::TypeCode_ptr tc, T & _tao_elem) { - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == false) { @@ -108,10 +107,9 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -145,11 +143,11 @@ TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc) template<typename T> void TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index aff9109b34b..48624334d55 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -50,8 +50,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual void _tao_decode (TAO_InputCDR &); virtual const void *value (void) const; static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr); diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 91dc8bdab29..31d096ee324 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -101,12 +101,11 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == false) { @@ -164,10 +163,9 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -203,11 +201,11 @@ TAO::Any_Dual_Impl_T<T>::free_value (void) template<typename T> void TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h index e09cdad1f77..be40f181aed 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -64,8 +64,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL); + virtual void _tao_decode (TAO_InputCDR &); virtual const void *value (void) const; virtual void free_value (void); diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index f00e5898d4d..cd8a8925a36 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -108,9 +108,9 @@ TAO::Any_Impl::_remove_ref (void) void TAO::Any_Impl::_tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL) + ) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } CORBA::Boolean diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 0e04ce527b5..71c8824e7d0 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -51,8 +51,6 @@ namespace CORBA class ValueBase; class AbstractBase; typedef AbstractBase *AbstractBase_ptr; - - class Environment; } namespace TAO @@ -89,8 +87,7 @@ namespace TAO static void _tao_any_string_destructor (void *); static void _tao_any_wstring_destructor (void *); - virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL); + virtual void _tao_decode (TAO_InputCDR &); virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const; virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const; diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index 4555bf32e9e..7f564c35d18 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -60,12 +60,11 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == 0) { @@ -119,10 +118,9 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return 0; } @@ -141,7 +139,7 @@ TAO::Any_Impl_T<T>::to_value (CORBA::ValueBase *&) const return 0; } -template<typename T> +template<typename T> CORBA::Boolean TAO::Any_Impl_T<T>::to_abstract_base (CORBA::AbstractBase_ptr &) const @@ -180,11 +178,11 @@ TAO::Any_Impl_T<T>::free_value (void) template<typename T> void TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index bddd912ecc9..501a85a353a 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -27,7 +27,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { class Any; - class Environment; } namespace TAO @@ -63,7 +62,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual void _tao_decode (TAO_InputCDR & ACE_ENV_ARG_DECL); + virtual void _tao_decode (TAO_InputCDR & ); virtual const void *value (void) const; virtual void free_value (void); diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index adc32568b3f..c1130d8fb92 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -49,9 +49,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any, if (bound > 0) { - ACE_DECLARE_NEW_CORBA_ENV; - CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind const kind = tc->kind (); bounded_tc = TAO::TypeCodeFactory::String_Traits<from_T>::create_typecode (kind, @@ -86,20 +84,17 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_type = any._tao_get_typecode (); CORBA::TypeCode_var unaliased_any_type = TAO::unaliased_typecode (any_type - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); CORBA::TCKind any_kind = - unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + unaliased_any_type->kind (); - CORBA::TCKind try_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::TCKind try_kind = tc->kind (); if (any_kind != try_kind) { @@ -107,8 +102,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, } CORBA::ULong length = - unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + unaliased_any_type->length (); if (length != bound) { @@ -168,10 +162,9 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return 0; } @@ -210,7 +203,7 @@ template<typename T, typename from_T, typename to_T> void TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode ( TAO_InputCDR &cdr - ACE_ENV_ARG_DECL + ) { if (this->value_destructor_ != 0) @@ -221,7 +214,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode ( if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index c166c9293ca..e8dddc81b74 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -55,7 +55,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); virtual const void *value (void) const; virtual void free_value (void); diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index 015d7231ce5..6afaab98900 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -89,12 +89,11 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == false) { @@ -147,10 +146,9 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, return true; } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return 0; } @@ -176,34 +174,30 @@ TAO::Any_SystemException::value (void) const CORBA::Boolean TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr) { - ACE_TRY_NEW_ENV + try { this->value_->_tao_encode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } CORBA::Boolean TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr) { - ACE_TRY_NEW_ENV + try { this->value_->_tao_decode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index 5b2e0257e79..c616ad4a139 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -32,15 +32,13 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type ( : TAO::Any_Impl (0, tc, true) , cdr_ (static_cast<ACE_Message_Block*>(0), lock_i ()) { - ACE_TRY_NEW_ENV + try { - this->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_tao_decode (cdr); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; } TAO::Unknown_IDL_Type::Unknown_IDL_Type ( @@ -58,7 +56,7 @@ TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void) CORBA::Boolean TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr) { - ACE_TRY_NEW_ENV + try { // We don't want the rd_ptr to move, in case we are shared by // another Any, so we use this to copy the state, not the buffer. @@ -68,19 +66,17 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr) TAO_Marshal_Object::perform_append (this->type_, &for_reading, &cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (status != TAO::TRAVERSE_CONTINUE) { return false; } } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } @@ -110,7 +106,7 @@ TAO::Unknown_IDL_Type::_tao_byte_order (void) const } void TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { // @@ (JP) The following code depends on the fact that // TAO_InputCDR does not contain chained message blocks, @@ -124,12 +120,11 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr TAO::traverse_status status = TAO_Marshal_Object::perform_skip (this->type_, &cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (status != TAO::TRAVERSE_CONTINUE) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } // This will be the end of the new message block. @@ -174,22 +169,19 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr CORBA::Boolean TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const { - ACE_TRY_NEW_ENV + try { CORBA::ULong kind = - this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->type_->kind (); CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_); while (kind == CORBA::tk_alias) { - tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tcvar = tcvar->content_type (); - kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + kind = tcvar->kind (); } if (kind != CORBA::tk_objref) @@ -200,13 +192,12 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const // We don't want the rd_ptr to move, in case we are shared by // another Any, so we use this to copy the state, not the buffer. TAO_InputCDR for_reading (this->cdr_); - + return for_reading >> obj; } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -214,22 +205,19 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const CORBA::Boolean TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const { - ACE_TRY_NEW_ENV + try { CORBA::ULong kind = - this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->type_->kind (); CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_); while (kind == CORBA::tk_alias) { - tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tcvar = tcvar->content_type (); - kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + kind = tcvar->kind (); } if (kind != CORBA::tk_value) @@ -253,10 +241,9 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter(); return adapter->stream_to_value (this->cdr_, val); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -264,22 +251,19 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const CORBA::Boolean TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const { - ACE_TRY_NEW_ENV + try { CORBA::ULong kind = - this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->type_->kind (); CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_); while (kind == CORBA::tk_alias) { - tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tcvar = tcvar->content_type (); - kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + kind = tcvar->kind (); } if (kind != CORBA::tk_value) @@ -304,10 +288,9 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const return adapter->stream_to_abstract_base (this->cdr_, obj); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h index 063fb77aeba..af1385ee255 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h @@ -54,7 +54,7 @@ namespace TAO virtual int _tao_byte_order (void) const; virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL); + ); virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const; virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const; diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 9c77532c4e3..4660b359253 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -41,7 +41,7 @@ TAO::TypeCode::Empty_Param::tao_release (void) CORBA::Boolean TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equality has already been established in the // CORBA::TypeCode base class. @@ -51,7 +51,7 @@ TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr CORBA::Boolean TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // We could refactor this code to the CORBA::TypeCode::equivalent() // method but doing so would force us to determine the unaliased @@ -61,8 +61,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc CORBA::TCKind const tc_kind = TAO::unaliased_kind (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (tc_kind != this->kind_) return false; @@ -72,7 +71,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc CORBA::TypeCode_ptr TAO::TypeCode::Empty_Param::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since parameter list is empty. diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h index 62b9936a1a9..4887b9d5b63 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h @@ -78,12 +78,9 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; }; diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp index b84a50f9b72..a1030c33e3c 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp @@ -82,15 +82,14 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this // method, meaning that member_count() is supported. CORBA::ULong const tc_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -102,8 +101,7 @@ TAO::TypeCode::Enum<StringType, char const * const lhs_name = Traits<StringType>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -118,14 +116,13 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -138,7 +135,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -170,13 +167,13 @@ TAO::TypeCode::Enum<StringType, "" /* empty name */, tc_enumerators, this->nenumerators_ - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> char const * TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -186,7 +183,7 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i ( template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> char const * TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -198,7 +195,7 @@ CORBA::ULong TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nenumerators_; } @@ -209,7 +206,7 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index 64a4d7bf9b0..13020e87c38 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -80,17 +80,13 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; + virtual char const * member_name_i (CORBA::ULong index) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 64cd8f00d37..e4879dad9cc 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -79,15 +79,14 @@ TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this // method, meaning that member_count() is supported. CORBA::ULong const tc_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -99,8 +98,7 @@ TAO::TypeCode::Enum<char const *, char const * const lhs_name = Traits<char const *>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -114,14 +112,13 @@ TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -133,7 +130,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -165,14 +162,14 @@ TAO::TypeCode::Enum<char const *, "" /* empty name */, tc_enumerators, this->nenumerators_ - ACE_ENV_ARG_PARAMETER); + ); } char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -183,7 +180,7 @@ char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -194,7 +191,7 @@ CORBA::ULong TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nenumerators_; } @@ -204,7 +201,7 @@ TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index d9f22d44271..91fba95c276 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -85,17 +85,13 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; + virtual char const * member_name_i (CORBA::ULong index) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index a38566ee6b7..1b1f7645411 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -38,18 +38,16 @@ namespace TAO CORBA::Boolean Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr) { - ACE_TRY_NEW_ENV + try { this->value_->_tao_encode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -58,18 +56,16 @@ namespace TAO CORBA::Boolean Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr) { - ACE_TRY_NEW_ENV + try { this->value_->_tao_decode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h index 44f6cd6834c..2b735a03bd7 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.h +++ b/TAO/tao/AnyTypeCode/ExceptionA.h @@ -26,11 +26,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ // This is used in the implementation of the _raise methods -#if defined (TAO_HAS_EXCEPTIONS) #define TAO_RAISE(EXCEPTION) throw EXCEPTION -#else -#define TAO_RAISE(EXCEPTION) -#endif /* ACE_HAS_EXCEPTIONS */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Exception.h" diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp index 0fae62d507c..04880329ccf 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp @@ -43,17 +43,15 @@ TAO::TypeCode::Fixed<RefCountPolicy>::tao_release (void) template <class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following call won't throw since CORBA::TypeCode::equal() has // already established the kind of tc is the same as our kind. CORBA::UShort const tc_digits = - tc->fixed_digits (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->fixed_digits (); CORBA::UShort const tc_scale = - tc->fixed_scale (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->fixed_scale (); return (this->digits_ == tc_digits && this->scale_ == tc_scale); @@ -62,19 +60,19 @@ TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc template <class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Since TCKind comparisons must be performed before equal_i() is // called, we can also call it to determine equivalence of // tk_fixed TypeCodes. return this->equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } template <class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_fixed TypeCodes have no name or member // names, meaning that we can simply call _duplicate() on this @@ -95,7 +93,7 @@ TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i ( template <class RefCountPolicy> CORBA::UShort TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->digits_; } @@ -103,7 +101,7 @@ TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i ( template <class RefCountPolicy> CORBA::UShort TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->scale_; } diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index 058b327e37e..c70c5ff0ed5 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -75,14 +75,11 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual CORBA::UShort fixed_digits_i (void) const; + virtual CORBA::UShort fixed_scale_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp index 2151f9753f7..2f777c06be7 100644 --- a/TAO/tao/AnyTypeCode/Marshal.cpp +++ b/TAO/tao/AnyTypeCode/Marshal.cpp @@ -34,10 +34,9 @@ TAO_Marshal_Object::~TAO_Marshal_Object (void) TAO::traverse_status TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { - CORBA::ULong const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::ULong const kind = tc->kind (); switch (kind) { @@ -68,75 +67,75 @@ TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc, case CORBA::tk_enum: { TAO_Marshal_Primitive marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_any: { TAO_Marshal_Any marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_TypeCode: { TAO_Marshal_TypeCode marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_Principal: { TAO_Marshal_Principal marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_objref: { TAO_Marshal_ObjRef marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_struct: { TAO_Marshal_Struct marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_union: { TAO_Marshal_Union marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_string: { TAO_Marshal_String marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_sequence: { TAO_Marshal_Sequence marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_array: { TAO_Marshal_Array marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_alias: { TAO_Marshal_Alias marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_except: { TAO_Marshal_Except marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_wstring: { TAO_Marshal_WString marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_value_box: case CORBA::tk_value: case CORBA::tk_event: { TAO_Marshal_Value marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } } } @@ -145,10 +144,9 @@ TAO::traverse_status TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { - CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::ULong kind = tc->kind (); switch (kind) { @@ -179,75 +177,75 @@ TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc, case CORBA::tk_enum: { TAO_Marshal_Primitive marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_any: { TAO_Marshal_Any marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_TypeCode: { TAO_Marshal_TypeCode marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_Principal: { TAO_Marshal_Principal marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_objref: { TAO_Marshal_ObjRef marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_struct: { TAO_Marshal_Struct marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_union: { TAO_Marshal_Union marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_string: { TAO_Marshal_String marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_sequence: { TAO_Marshal_Sequence marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_array: { TAO_Marshal_Array marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_alias: { TAO_Marshal_Alias marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_except: { TAO_Marshal_Except marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_wstring: { TAO_Marshal_WString marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_value_box: case CORBA::tk_value: case CORBA::tk_event: { TAO_Marshal_Value marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } } } diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h index 6232bc5f87d..74de6bf2185 100644 --- a/TAO/tao/AnyTypeCode/Marshal.h +++ b/TAO/tao/AnyTypeCode/Marshal.h @@ -33,8 +33,6 @@ namespace CORBA { class TypeCode; typedef TypeCode *TypeCode_ptr; - - class Environment; } class TAO_OutputCDR; @@ -88,26 +86,22 @@ public: /// skip entry point, it allocates the right kind of Marshal_Object /// and invokes skip on it. static TAO::traverse_status perform_skip (CORBA::TypeCode_ptr tc, - TAO_InputCDR *context - ACE_ENV_ARG_DECL); + TAO_InputCDR *context); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, - TAO_InputCDR *context - ACE_ENV_ARG_DECL) = 0; + TAO_InputCDR *context) = 0; /// append entry point, it allocates the right kind of Marshal_Object /// and invokes skip on it. static TAO::traverse_status perform_append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + TAO_OutputCDR *dest); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) = 0; + TAO_OutputCDR *dest) = 0; }; /** @@ -124,14 +118,12 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, - TAO_InputCDR *context - ACE_ENV_ARG_DECL); + TAO_InputCDR *context); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + TAO_OutputCDR *dest); }; /** @@ -148,14 +140,12 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, - TAO_InputCDR *context - ACE_ENV_ARG_DECL); + TAO_InputCDR *context); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + TAO_OutputCDR *dest); }; /** @@ -173,13 +163,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -197,13 +187,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -221,13 +211,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -245,13 +235,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -269,13 +259,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -293,13 +283,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -317,13 +307,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -341,13 +331,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -365,13 +355,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -389,13 +379,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -413,13 +403,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -437,13 +427,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); private: CORBA::Boolean nested_processing_; diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 56528db0c81..90c42779410 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -96,23 +96,22 @@ CORBA::NVList::~NVList (void) // add an element and just initialize its flags CORBA::NamedValue_ptr CORBA::NVList::add (CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // call the helper to allocate a NamedValue element (if necessary) return this->add_element (flags - ACE_ENV_ARG_PARAMETER); + ); } // add an element and just initialize its flags and name CORBA::NamedValue_ptr CORBA::NVList::add_item (const char *name, CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // call the helper to allocate a NamedValue element CORBA::NamedValue_ptr nv = this->add_element (flags - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (nv) { @@ -131,12 +130,11 @@ CORBA::NamedValue_ptr CORBA::NVList::add_value (const char *name, const CORBA::Any &value, CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // Call the helper to allocate a NamedValue element. CORBA::NamedValue_ptr nv = this->add_element (flags - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (nv) { @@ -161,13 +159,12 @@ CORBA::NVList::add_value (const char *name, CORBA::NamedValue_ptr CORBA::NVList::add_item_consume (char *name, CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // call the helper to allocate a NamedValue element CORBA::NamedValue_ptr nv = this->add_element (flags - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (nv) { @@ -188,12 +185,11 @@ CORBA::NamedValue_ptr CORBA::NVList::add_value_consume (char * name, CORBA::Any * value, CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // call the helper to allocate a NamedValue element CORBA::NamedValue_ptr nv = this->add_element (flags - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (nv) { @@ -216,7 +212,7 @@ CORBA::NVList::add_value_consume (char * name, //CORBA::Status void CORBA::NVList::remove (CORBA::ULong /* n */ - ACE_ENV_ARG_DECL_NOT_USED) + ) { // not implemented // @@ (ASG) - TODO @@ -225,10 +221,9 @@ CORBA::NVList::remove (CORBA::ULong /* n */ // Helper method CORBA::NamedValue_ptr CORBA::NVList::add_element (CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { - this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); + this->evaluate (); if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT)) @@ -243,7 +238,6 @@ CORBA::NVList::add_element (CORBA::Flags flags ACE_NEW_THROW_EX (nv, CORBA::NamedValue, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); // set the flags and enqueue in the queue nv->flags_ = flags; @@ -261,10 +255,9 @@ CORBA::NVList::add_element (CORBA::Flags flags // return the item at location n CORBA::NamedValue_ptr CORBA::NVList::item (CORBA::ULong n - ACE_ENV_ARG_DECL) + ) { - this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); + this->evaluate (); if (n >= this->max_) { @@ -282,7 +275,7 @@ void CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, int flag, bool &lazy_evaluation - ACE_ENV_ARG_DECL) + ) { // If the list is empty then using lazy evaluation is the only // choice. @@ -298,7 +291,7 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, { this->_tao_decode (cdr, flag - ACE_ENV_ARG_PARAMETER); + ); return; } @@ -317,7 +310,7 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, void CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, int flag - ACE_ENV_ARG_DECL) + ) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, @@ -368,8 +361,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, (void) TAO_Marshal_Object::perform_append (tc, this->incoming_, &cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } delete this->incoming_; @@ -402,7 +394,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, void CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag - ACE_ENV_ARG_DECL) + ) { if (TAO_debug_level > 3) { @@ -438,8 +430,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, CORBA::Any_ptr any = nv->value (); any->impl ()->_tao_decode (incoming - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } @@ -468,7 +459,7 @@ CORBA::NVList::_tao_target_alignment (void) } void -CORBA::NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL) +CORBA::NVList::evaluate (void) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -482,7 +473,7 @@ CORBA::NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL) this->_tao_decode (*(incoming.get ()), this->incoming_flag_ - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index d78a228726a..9b6e212c11f 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -165,44 +165,44 @@ namespace CORBA public: /// return the current number of elements in the list - ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + ULong count (void) const; /// add an element and just initialize the flags NamedValue_ptr add (Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// add an element and initialize its name and flags NamedValue_ptr add_item (const char *, Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// initializes a value, name, and flags NamedValue_ptr add_value (const char *, const Any &, Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// just like add_item. In addition, memory management of char * /// name is taken over by the NVList NamedValue_ptr add_item_consume (char *, Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// just like add_value. In addition, the NVList controls the /// memory management of the char *name and Any *value parameter NamedValue_ptr add_value_consume (char *, Any_ptr, Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// retrieve the item at the nth location. Raises Bounds NamedValue_ptr item (ULong n - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // CORBA::Status /// remove element at index n. Raises Bounds void remove (ULong n - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // The pseudo object static methods.. static NVList * _duplicate (NVList *); @@ -223,18 +223,18 @@ namespace CORBA void _tao_incoming_cdr (TAO_InputCDR & cdr, int flag, bool &lazy_evaluation - ACE_ENV_ARG_DECL); + ); - /// Encode the NVList into the CDR stream. <flag> masks the type of + /// Encode the NVList into the CDR stream. @a flag masks the type of /// arguments (IN, OUT or INOUT) that are to be marshaled. void _tao_encode (TAO_OutputCDR & cdr, int flag - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); - /// Decode the NVList arguments from the <cdr> stream. + /// Decode the NVList arguments from the @a cdr stream. void _tao_decode (TAO_InputCDR & cdr, int flag - ACE_ENV_ARG_DECL); + ); /** * Return the required alignment to marshal the NVList without any @@ -265,24 +265,24 @@ namespace CORBA ~NVList (void); private: - /// constructor - cannot be instantiated directly other than + /// Constructor - cannot be instantiated directly other than /// through the CORBA::ORB::create_list method NVList (void); - /// helper to increase the list size. This is used by all the add_ + /// Helper to increase the list size. This is used by all the add_ /// methods of the NVList class NamedValue_ptr add_element (Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Lazy evaluation routine to fill up the Anys in the NVList from /// the CDR stream. - void evaluate (ACE_ENV_SINGLE_ARG_DECL); + void evaluate (void); private: - /// internal list of parameters stored as NamedValues + /// Internal list of parameters stored as NamedValues ACE_Unbounded_Queue<NamedValue_ptr> values_; - /// maximum length of list + /// Maximum length of list ULong max_; /// Reference counter. diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index e89db0e4dfb..d3fd8f93d3c 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -99,11 +99,10 @@ CORBA::NVList::NVList (void) ACE_INLINE CORBA::ULong -CORBA::NVList::count (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::NVList::count (void) const { (const_cast<CORBA::NVList *> (this))->evaluate ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); return this->max_; } diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index 7ed8cb3d983..094c4c43d94 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -15,7 +15,7 @@ void TAO_NVList_Adapter_Impl::create_list ( CORBA::Long count, CORBA::NVList_ptr &new_list - ACE_ENV_ARG_DECL) + ) { ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX); // Create an empty list @@ -26,7 +26,6 @@ TAO_NVList_Adapter_Impl::create_list ( 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; // If count is greater than 0, create a list of NamedValues. if (count != 0) @@ -43,7 +42,6 @@ TAO_NVList_Adapter_Impl::create_list ( 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; new_list->values_.enqueue_tail (nv); } @@ -53,7 +51,7 @@ TAO_NVList_Adapter_Impl::create_list ( void TAO_NVList_Adapter_Impl::create_named_value ( CORBA::NamedValue_ptr &nv - ACE_ENV_ARG_DECL) + ) { ACE_NEW_THROW_EX (nv, CORBA::NamedValue, diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h index e24ebd357c5..0eea676bc2c 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h @@ -36,11 +36,11 @@ public: virtual void create_list ( CORBA::Long count, CORBA::NVList_ptr &new_list - ACE_ENV_ARG_DECL); + ); virtual void create_named_value ( CORBA::NamedValue_ptr &nv - ACE_ENV_ARG_DECL); + ); /// Used to force the initialization of the NVList adapter static int Initializer (void); diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp index c897143e4dc..33ff55b2fff 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp @@ -56,7 +56,7 @@ template <typename StringType, class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Objref<StringType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr /* tc */ - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equality has already been established in the // CORBA::TypeCode base class. @@ -68,7 +68,7 @@ template <typename StringType, class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equivalence already verified in the base class // CORBA::TypeCode::equivalent() method. @@ -80,7 +80,7 @@ template <typename StringType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Objref<StringType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -97,45 +97,45 @@ TAO::TypeCode::Objref<StringType, { return adapter->create_abstract_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_component) { return adapter->create_component_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_home) { return adapter->create_home_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_local_interface) { return adapter->create_local_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_native) { return adapter->create_native_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else // CORBA::tk_objref { return adapter->create_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } } template <typename StringType, class RefCountPolicy> char const * TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -145,7 +145,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i ( template <typename StringType, class RefCountPolicy> char const * TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 8444669513a..5fe946cf468 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -88,13 +88,13 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; protected: diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index 883b13ab3ed..e202799ce7a 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -56,7 +56,7 @@ TAO::TypeCode::Objref<char const *, CORBA::Boolean TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr /* tc */ - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equality has already been established in the // CORBA::TypeCode base class. @@ -67,7 +67,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::Boolean TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equivalence already verified in the base class // CORBA::TypeCode::equivalent() method. @@ -78,7 +78,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -95,44 +95,44 @@ TAO::TypeCode::Objref<char const *, { return adapter->create_abstract_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_component) { return adapter->create_component_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_home) { return adapter->create_home_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_local_interface) { return adapter->create_local_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_native) { return adapter->create_native_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else // CORBA::tk_objref { return adapter->create_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } } char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -141,7 +141,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h index f67bb980e66..e73dc34911c 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h @@ -91,14 +91,11 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; protected: diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp index 9d49724bc2f..9b177c88bca 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.cpp +++ b/TAO/tao/AnyTypeCode/PolicyA.cpp @@ -192,16 +192,14 @@ namespace TAO return false; } - ACE_TRY_NEW_ENV + try { - this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->value_->_tao_decode (cdr); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } @@ -280,16 +278,14 @@ namespace TAO return false; } - ACE_TRY_NEW_ENV + try { - this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->value_->_tao_decode (cdr); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp index be526f4b094..e35d3bad781 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp @@ -58,7 +58,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, TypeCodeType, MemberArrayType>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, @@ -77,7 +77,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, Reset flag (this->in_recursion_); return this->TypeCodeBase::equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } // Nothing else to do. @@ -90,7 +90,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, TypeCodeType, MemberArrayType>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, @@ -109,7 +109,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, Reset flag (this->in_recursion_); return this->TypeCodeBase::equivalent_i (tc - ACE_ENV_ARG_PARAMETER); + ); } // Nothing else to do. diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 027100bb476..a1ad3a2f0db 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -122,9 +122,9 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; //@} diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp index 76016fe93fe..16d63027525 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp @@ -63,54 +63,50 @@ template <typename TypeCodeType, class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following calls won't throw since CORBA::TypeCode::equal() // has already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); if (this->length_ != tc_length) return 0; CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<TypeCodeType>::get_typecode (this->content_type_)->equal ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } template <typename TypeCodeType, class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following calls won't throw since CORBA::TypeCode::equal() // has already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); if (this->length_ != tc_length) return 0; CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<TypeCodeType>::get_typecode (this->content_type_)->equivalent ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } template <typename TypeCodeType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_sequence and tk_array TypeCodes have no // name or member names, meaning that we can simply call @@ -130,7 +126,7 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i ( template <typename TypeCodeType, class RefCountPolicy> CORBA::ULong TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->length_; } @@ -138,7 +134,7 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i ( template <typename TypeCodeType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 3b8cd242ade..524f468e748 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -85,14 +85,14 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::ULong length_i (void) const; virtual CORBA::TypeCode_ptr content_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; private: diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index 874fe38365b..ab5af126c49 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -64,54 +64,50 @@ CORBA::Boolean TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following calls won't throw since CORBA::TypeCode::equal() // has already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); if (this->length_ != tc_length) return 0; CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equal ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following calls won't throw since CORBA::TypeCode::equal() // has already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); if (this->length_ != tc_length) return 0; CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equivalent ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_sequence and tk_array TypeCodes have no // name or member names, meaning that we can simply call @@ -132,7 +128,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::ULong TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::length_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->length_; } @@ -140,7 +136,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::content_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 7c3d4746fbc..717fc4ab013 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -83,14 +83,14 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::ULong length_i (void) const; virtual CORBA::TypeCode_ptr content_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; private: diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp index bae404af34e..7f1502b17db 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp @@ -43,12 +43,11 @@ TAO::TypeCode::String<RefCountPolicy>::tao_release (void) template <class RefCountPolicy> CORBA::Boolean TAO::TypeCode::String<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following call won't throw since CORBA::TypeCode::equal() has // already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); return (this->length_ == tc_length); } @@ -56,19 +55,19 @@ TAO::TypeCode::String<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc template <class RefCountPolicy> CORBA::Boolean TAO::TypeCode::String<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Since TCKind comparisons must be performed before equal_i() is // called, we can also call it to determine equivalence of // tk_string-based TypeCodes. return this->equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } template <class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_string and tk_wstring TypeCodes have no // name or member names, meaning that we can simply call @@ -83,7 +82,7 @@ TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i ( template <class RefCountPolicy> CORBA::ULong TAO::TypeCode::String<RefCountPolicy>::length_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->length_; } diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 86a7270f12b..362cfbb53fa 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -77,12 +77,12 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::ULong length_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp index 2066078627a..1fdaf50c6d8 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -42,12 +42,11 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void) CORBA::Boolean TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following call won't throw since CORBA::TypeCode::equal() has // already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); return (this->length_ == tc_length); } @@ -55,18 +54,18 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i ( CORBA::Boolean TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Since TCKind comparisons must be performed before equal_i() is // called, we can also call it to determine equivalence of // tk_string-based TypeCodes. return this->equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_string and tk_wstring TypeCodes have no // name or member names, meaning that we can simply call @@ -80,7 +79,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( CORBA::ULong TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->length_; } diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h index 8911843a9ee..bc7419e1382 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -80,12 +80,12 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::ULong length_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp index aa50e7bdf78..ba7d3ad20a4 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp @@ -113,15 +113,14 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this // method, meaning that member_count() is supported. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -134,8 +133,7 @@ TAO::TypeCode::Struct<StringType, char const * const lhs_name = Traits<StringType>::get_string (lhs_field.name); char const * const rhs_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -144,13 +142,11 @@ TAO::TypeCode::Struct<StringType, Traits<StringType>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_members) return false; @@ -169,14 +165,13 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -187,13 +182,11 @@ TAO::TypeCode::Struct<StringType, Traits<StringType>::get_typecode (this->fields_[i].type); CORBA::TypeCode_var const rhs = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equiv_members = lhs->equivalent (rhs.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_members) return false; @@ -211,7 +204,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -233,8 +226,7 @@ TAO::TypeCode::Struct<StringType, tc_fields[i].type = Traits<StringType>::get_typecode ( this->fields_[i].type)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); } } @@ -254,7 +246,7 @@ TAO::TypeCode::Struct<StringType, "" /* empty name */, tc_fields, this->nfields_ - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, @@ -266,7 +258,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -282,7 +274,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -298,7 +290,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nfields_; } @@ -313,7 +305,7 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -333,7 +325,7 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index df44f2d2a3a..3881586b117 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -92,18 +92,18 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index 57e6be6de4e..2b899defcbd 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -107,15 +107,14 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this // method, meaning that member_count() is supported. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -128,8 +127,7 @@ TAO::TypeCode::Struct<char const *, char const * const lhs_name = Traits<char const *>::get_string (lhs_field.name); char const * const rhs_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -138,13 +136,11 @@ TAO::TypeCode::Struct<char const *, Traits<char const *>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_members) return false; @@ -160,14 +156,13 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -178,13 +173,11 @@ TAO::TypeCode::Struct<char const *, Traits<char const *>::get_typecode (this->fields_[i].type); CORBA::TypeCode_var const rhs = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equiv_members = lhs->equivalent (rhs.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_members) return false; @@ -199,7 +192,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -221,8 +214,7 @@ TAO::TypeCode::Struct<char const *, tc_fields[i].type = Traits<char const *>::get_typecode ( this->fields_[i].type)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); } } @@ -242,7 +234,7 @@ TAO::TypeCode::Struct<char const *, "" /* empty name */, tc_fields, this->nfields_ - ACE_ENV_ARG_PARAMETER); + ); } char const * @@ -251,7 +243,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -264,7 +256,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -277,7 +269,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nfields_; } @@ -289,7 +281,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -306,7 +298,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index dea9405238b..4a627573908 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -96,18 +96,18 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index 5abd467b23c..b2b4f0d92ec 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -32,7 +32,7 @@ CORBA::TypeCode::tao_marshal_kind (TAO_OutputCDR & cdr) const CORBA::Boolean CORBA::TypeCode::equal (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { if (this == tc) { @@ -45,49 +45,42 @@ CORBA::TypeCode::equal (TypeCode_ptr tc false); } - CORBA::TCKind const tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TCKind const tc_kind = tc->kind (); if (tc_kind != this->kind_) return 0; - ACE_TRY + try { - char const * const tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + char const * const tc_id = tc->id (); - char const * const this_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + char const * const this_id = this->id (); if (ACE_OS::strcmp (this_id, tc_id) != 0) return 0; - char const * const tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + char const * const tc_name = tc->name (); - char const * const this_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + char const * const this_name = this->name (); if (ACE_OS::strcmp (this_name, tc_name) != 0) return 0; } - ACE_CATCH (CORBA::TypeCode::BadKind, ex) + catch ( ::CORBA::TypeCode::BadKind&) { // Some TypeCodes do not support the id() and name() // operations. Ignore the failure, and continue equality // verification using TypeCode subclass-specific techniques // below. } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); return this->equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean CORBA::TypeCode::equivalent (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { if (this == tc) { @@ -105,89 +98,81 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc CORBA::TypeCode_var unaliased_this = TAO::unaliased_typecode (mutable_this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::TypeCode_var unaliased_tc = TAO::unaliased_typecode (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::TCKind const this_kind = - unaliased_this->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + unaliased_this->kind (); CORBA::TCKind const tc_kind = - unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + unaliased_tc->kind (); if (tc_kind != this_kind) return false; - ACE_TRY + try { char const * const this_id = - unaliased_this->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + unaliased_this->id (); char const * const tc_id = - unaliased_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + unaliased_tc->id (); if (ACE_OS::strlen (this_id) == 0 || ACE_OS::strlen (tc_id) == 0) { return unaliased_this->equivalent_i (unaliased_tc.in () - ACE_ENV_ARG_PARAMETER); + ); } else if (ACE_OS::strcmp (this_id, tc_id) != 0) { return false; } } - ACE_CATCH (CORBA::TypeCode::BadKind, ex) + catch ( ::CORBA::TypeCode::BadKind&) { // Some TypeCodes do not support the id() operation. Ignore the // failure, and continue equivalence verification using TypeCode // subclass-specific techniques. return unaliased_this->equivalent_i (unaliased_tc.in () - ACE_ENV_ARG_PARAMETER); + ); } - ACE_ENDTRY; - ACE_CHECK_RETURN (false); return true; } char const * -CORBA::TypeCode::id_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::id_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } char const * -CORBA::TypeCode::name_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::name_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::ULong -CORBA::TypeCode::member_count_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::member_count_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } char const * CORBA::TypeCode::member_name_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const + ) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::TypeCode_ptr CORBA::TypeCode::member_type_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const + ) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::TypeCode::_nil ()); @@ -195,66 +180,66 @@ CORBA::TypeCode::member_type_i (CORBA::ULong /* index */ CORBA::Any * CORBA::TypeCode::member_label_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const + ) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::TypeCode_ptr -CORBA::TypeCode::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::discriminator_type_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::TypeCode::_nil ()); } CORBA::Long -CORBA::TypeCode::default_index_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::default_index_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::ULong -CORBA::TypeCode::length_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::length_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::TypeCode_ptr -CORBA::TypeCode::content_type_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::content_type_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::TypeCode::_nil ()); } CORBA::UShort -CORBA::TypeCode::fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::fixed_digits_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::UShort -CORBA::TypeCode::fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::fixed_scale_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::Visibility CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const + ) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::PRIVATE_MEMBER); } CORBA::ValueModifier -CORBA::TypeCode::type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::type_modifier_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::VM_NONE); } CORBA::TypeCode_ptr -CORBA::TypeCode::concrete_base_type_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::concrete_base_type_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::TypeCode::_nil ()); @@ -300,19 +285,19 @@ CORBA::TypeCode::Bounds::_raise (void) const void CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const + ) const { if (cdr << this->_rep_id ()) { return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } @@ -348,19 +333,19 @@ CORBA::TypeCode::BadKind::_raise (void) const void CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const + ) const { if (cdr << this->_rep_id ()) { return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } @@ -406,7 +391,7 @@ operator<< (TAO_OutputCDR & cdr, CORBA::TypeCode_ptr TAO::unaliased_typecode (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { if (CORBA::is_nil (tc)) { @@ -415,8 +400,7 @@ TAO::unaliased_typecode (CORBA::TypeCode_ptr tc tc); } - CORBA::TCKind tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + CORBA::TCKind tc_kind = tc->kind (); if (tc_kind == CORBA::tk_alias) { @@ -427,11 +411,9 @@ TAO::unaliased_typecode (CORBA::TypeCode_ptr tc do { tc_content = - tc_content->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + tc_content->content_type (); - tc_kind = tc_content->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + tc_kind = tc_content->kind (); } while (tc_kind == CORBA::tk_alias); @@ -477,7 +459,7 @@ namespace TAO { CORBA::TypeCode::_duplicate (p); } - + void In_Object_Argument_Cloner_T<CORBA::TypeCode_ptr>::release ( CORBA::TypeCode_ptr p) @@ -490,14 +472,13 @@ namespace TAO CORBA::TCKind TAO::unaliased_kind (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var unaliased_tc = TAO::unaliased_typecode (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TAO_TC_KIND_COUNT); + ); - return unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + return unaliased_tc->kind (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index 98957712997..1539fa9fed7 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -87,9 +87,9 @@ namespace CORBA virtual void _raise (void) const; virtual void _tao_encode (TAO_OutputCDR & cdr - ACE_ENV_ARG_DECL) const; + ) const; virtual void _tao_decode (TAO_InputCDR & cdr - ACE_ENV_ARG_DECL); + ); }; @@ -116,9 +116,9 @@ namespace CORBA virtual void _raise (void) const; virtual void _tao_encode (TAO_OutputCDR & cdr - ACE_ENV_ARG_DECL) const; + ) const; virtual void _tao_decode (TAO_InputCDR & cdr - ACE_ENV_ARG_DECL); + ); }; @@ -160,7 +160,7 @@ namespace CORBA * @c TypeCode and @a tc returns identical results. */ Boolean equal (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; /// Equivalence of two @c TypeCodes. /** @@ -170,10 +170,10 @@ namespace CORBA * @see equal */ Boolean equivalent (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; /// The kind of @c TypeCode. - TCKind kind (ACE_ENV_SINGLE_ARG_DECL) const; + TCKind kind (void) const; /// Return @c TypeCode stripped of optional @c name and /// @c member_name fields. @@ -195,7 +195,7 @@ namespace CORBA * the TAO_IDL compiler by invoking it with its "-Gt" * (i.e. enable optimized TypeCodes) command line option. */ - TypeCode_ptr get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const; + TypeCode_ptr get_compact_typecode (void) const; /// The @c RepositoryId globally identifying the type. /** @@ -221,7 +221,7 @@ namespace CORBA * is required by the C++ mapping. In particular, ownership * is maintained by the @c TypeCode. */ - char const * id (ACE_ENV_SINGLE_ARG_DECL) const; + char const * id (void) const; /// The simple name identifying the type within its enclosing /// scope. @@ -248,7 +248,7 @@ namespace CORBA * behavior is required by the C++ mapping. In particular, * ownership is maintained by the @c TypeCode. */ - char const * name (ACE_ENV_SINGLE_ARG_DECL) const; + char const * name (void) const; /// The type member count. /** @@ -261,7 +261,7 @@ namespace CORBA * @li @c tk_except * @li @c tk_event */ - ULong member_count (ACE_ENV_SINGLE_ARG_DECL) const; + ULong member_count (void) const; /// The type member name. /** @@ -280,7 +280,7 @@ namespace CORBA * ownership is maintained by the @c TypeCode. */ char const * member_name (ULong index - ACE_ENV_ARG_DECL) const; + ) const; /// The type member @c TypeCode. /** @@ -293,7 +293,7 @@ namespace CORBA * @li @c tk_event */ TypeCode_ptr member_type (ULong index - ACE_ENV_ARG_DECL) const; + ) const; /// The union member label. /** @@ -302,7 +302,7 @@ namespace CORBA * @li @c tk_union */ Any * member_label (ULong index - ACE_ENV_ARG_DECL) const; + ) const; /// The type of all non-default union member labels. /** @@ -310,7 +310,7 @@ namespace CORBA * * @li @c tk_union */ - TypeCode_ptr discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const; + TypeCode_ptr discriminator_type (void) const; /// The index of the default union member. /** @@ -318,7 +318,7 @@ namespace CORBA * * @li @c tk_union */ - Long default_index (ACE_ENV_SINGLE_ARG_DECL) const; + Long default_index (void) const; /// The length of the type. /** @@ -329,7 +329,7 @@ namespace CORBA * @li @c tk_sequence * @li @c tk_array */ - ULong length (ACE_ENV_SINGLE_ARG_DECL) const; + ULong length (void) const; /// The underlying content type. /** @@ -340,7 +340,7 @@ namespace CORBA * @li @c tk_value_box * @li @c tk_alias */ - TypeCode_ptr content_type (ACE_ENV_SINGLE_ARG_DECL) const; + TypeCode_ptr content_type (void) const; /// The number of significant digits. /** @@ -348,7 +348,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const; + UShort fixed_digits (void) const; /// The scale factor. /** @@ -356,7 +356,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const; + UShort fixed_scale (void) const; /// The @c Visibility of the @c valuetype or @c eventtype member /// corresponding to index @a index. @@ -367,7 +367,7 @@ namespace CORBA * @li @c tk_event */ Visibility member_visibility (ULong index - ACE_ENV_ARG_DECL) const; + ) const; /// The @c ValueModifier of the @c valuetype of @c eventtype /// represented by this @c TypeCode. @@ -377,7 +377,7 @@ namespace CORBA * @li @c tk_value * @li @c tk_event */ - ValueModifier type_modifier (ACE_ENV_SINGLE_ARG_DECL) const; + ValueModifier type_modifier (void) const; /// The @c TypeCode corresponding to the concrete base /// @c valuetype or @c eventtype. @@ -391,7 +391,7 @@ namespace CORBA * @c valuetype or @c eventtype. * @c CORBA::TypeCode::_nil() if no concrete base exists. */ - TypeCode_ptr concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const; + TypeCode_ptr concrete_base_type (void) const; //@} /// Marshal the @c TypeCode @c TCKind. @@ -472,33 +472,33 @@ namespace CORBA */ //@{ virtual Boolean equal_i (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const = 0; + ) const = 0; virtual Boolean equivalent_i (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const = 0; + ) const = 0; virtual TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const = 0; + void) const = 0; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual ULong member_count_i (void) const; virtual char const * member_name_i (ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual TypeCode_ptr member_type_i (ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual Any * member_label_i (ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual TypeCode_ptr discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual Long default_index_i (void) const; + virtual ULong length_i (void) const; + virtual TypeCode_ptr content_type_i (void) const; + virtual UShort fixed_digits_i (void) const; + virtual UShort fixed_scale_i (void) const; virtual Visibility member_visibility_i (ULong index - ACE_ENV_ARG_DECL) const; - virtual ValueModifier type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const; + ) const; + virtual ValueModifier type_modifier_i (void) const; virtual TypeCode_ptr concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; //@} private: @@ -546,7 +546,7 @@ namespace TAO /// @c TypeCode. TAO_AnyTypeCode_Export CORBA::TypeCode_ptr unaliased_typecode ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Return the unaliased @c TCKind of the given @c TypeCode. /** @@ -556,7 +556,7 @@ namespace TAO */ TAO_AnyTypeCode_Export CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); // --------------------------------------------------------------- diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl index f06f9f5ba2d..8baaeebea97 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.inl +++ b/TAO/tao/AnyTypeCode/TypeCode.inl @@ -43,113 +43,113 @@ CORBA::TypeCode::_nil (void) } ACE_INLINE CORBA::TCKind -CORBA::TypeCode::kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const +CORBA::TypeCode::kind (void) const { return this->kind_; } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::get_compact_typecode (void) const { - return this->get_compact_typecode_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->get_compact_typecode_i (); } ACE_INLINE char const * -CORBA::TypeCode::id (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::id (void) const { - return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->id_i (); } ACE_INLINE char const * -CORBA::TypeCode::name (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::name (void) const { - return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->name_i (); } ACE_INLINE CORBA::ULong -CORBA::TypeCode::member_count (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::member_count (void) const { - return this->member_count_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->member_count_i (); } ACE_INLINE char const * CORBA::TypeCode::member_name (ULong index - ACE_ENV_ARG_DECL) const + ) const { return this->member_name_i (index - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE CORBA::TypeCode_ptr CORBA::TypeCode::member_type (ULong index - ACE_ENV_ARG_DECL) const + ) const { return this->member_type_i (index - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE CORBA::Any * CORBA::TypeCode::member_label (ULong index - ACE_ENV_ARG_DECL) const + ) const { return this->member_label_i (index - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::discriminator_type (void) const { - return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->discriminator_type_i (); } ACE_INLINE CORBA::Long -CORBA::TypeCode::default_index (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::default_index (void) const { - return this->default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->default_index_i (); } ACE_INLINE CORBA::ULong -CORBA::TypeCode::length (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::length (void) const { - return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->length_i (); } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::content_type (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::content_type (void) const { - return this->content_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->content_type_i (); } ACE_INLINE CORBA::UShort -CORBA::TypeCode::fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::fixed_digits (void) const { - return this->fixed_digits_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->fixed_digits_i (); } ACE_INLINE CORBA::UShort -CORBA::TypeCode::fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::fixed_scale (void) const { - return this->fixed_scale_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->fixed_scale_i (); } ACE_INLINE CORBA::Visibility CORBA::TypeCode::member_visibility (ULong index - ACE_ENV_ARG_DECL) const + ) const { return this->member_visibility_i (index - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE CORBA::ValueModifier -CORBA::TypeCode::type_modifier (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::type_modifier (void) const { - return this->type_modifier_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->type_modifier_i (); } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::concrete_base_type (void) const { - return this->concrete_base_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->concrete_base_type_i (); } ACE_INLINE void diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index 0c488de495a..bd489f01c77 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -482,10 +482,8 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, && cdr >> discriminant_type.out ())) // No need to use tc_demarshal() return false; - ACE_DECLARE_NEW_CORBA_ENV; CORBA::TCKind const discriminant_kind = - discriminant_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + discriminant_type->kind (); // Check for valid discriminant type. if (!(discriminant_kind == CORBA::tk_enum @@ -1392,9 +1390,8 @@ namespace TAO::TypeCodeFactory::TC_Info & info = infos[old_size]; - ACE_DECLARE_NEW_CORBA_ENV; - info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); // Should never throw! + info.id = tc->id (); + // Should never throw! info.type = tc; } diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp index 67edee2d6b8..9cb9957d07e 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp @@ -21,13 +21,12 @@ template <typename StringType, typename TypeCodeType> bool TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Check case names. char const * const lhs_name = this->name (); char const * const rhs_name = tc->member_name (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return 0; @@ -36,13 +35,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, CORBA::TypeCode_ptr const lhs_tc = this->type (); CORBA::TypeCode_var const rhs_tc = tc->member_type (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!equal_members) return 0; @@ -50,7 +47,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, // Check case label. return this->equal_label (index, tc - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, typename TypeCodeType> @@ -58,7 +55,7 @@ bool TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Member names are ignore when determining equivalence. @@ -66,13 +63,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( CORBA::TypeCode_ptr const lhs_tc = this->type (); CORBA::TypeCode_var const rhs_tc = tc->member_type (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::Boolean const equivalent_members = lhs_tc->equivalent (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!equivalent_members) return 0; @@ -81,7 +76,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( // The label must be equal when determining equivalence, too. return this->equal_label (index, tc - ACE_ENV_ARG_PARAMETER); + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index 638051bcb6a..e53539887cc 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -78,7 +78,7 @@ namespace TAO /// Return the IDL @c union case label value embedded within a /// @c CORBA::Any. - virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const = 0; + virtual CORBA::Any * label (void) const = 0; /// Get the name of the @c union case/member. char const * name (void) const; @@ -110,14 +110,14 @@ namespace TAO /// index" in the given @c TypeCode @a tc. bool equal (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; /// Check for equivalence of the @c case attributes contained by /// this class and the corresponding member attributes at index /// "@a index" in the given @c TypeCode @a tc. bool equivalent (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; protected: @@ -141,7 +141,7 @@ namespace TAO */ virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const = 0; + ) const = 0; private: diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp index acca54b701e..ecf86e30c38 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp @@ -54,11 +54,10 @@ bool TAO::TypeCode::Case_Enum_T<StringType, TypeCodeType>::equal_label (::CORBA::ULong index, ::CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { CORBA::Any_var const any = tc->member_label (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); // The equality operator == below is guaranteed to be defined for // the discriminator type since an IDL union discriminator type must @@ -79,7 +78,7 @@ template <typename StringType, typename TypeCodeType> CORBA::Any * TAO::TypeCode::Case_Enum_T<StringType, - TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const + TypeCodeType>::label (void) const { TAO_OutputCDR out_cdr; @@ -89,7 +88,6 @@ TAO::TypeCode::Case_Enum_T<StringType, ACE_NEW_THROW_EX (retval, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); TAO_InputCDR in_cdr (out_cdr); TAO::Unknown_IDL_Type *unk = 0; @@ -97,7 +95,6 @@ TAO::TypeCode::Case_Enum_T<StringType, TAO::Unknown_IDL_Type (this->discriminator_tc_.in (), in_cdr), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_value (retval); diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h index 23886d0e1d4..5db4aef460d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h @@ -74,11 +74,11 @@ namespace TAO */ //@{ Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Any * label (void) const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index fc7533e98ae..56915ed0bf5 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -114,11 +114,10 @@ TAO::TypeCode::Case_T<DiscriminatorType, StringType, TypeCodeType>::equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { CORBA::Any_var const any = tc->member_label (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); // The equality operator == below is guaranteed to be defined for // the discriminator type since an IDL union discriminator type must @@ -142,14 +141,13 @@ template <typename DiscriminatorType, CORBA::Any * TAO::TypeCode::Case_T<DiscriminatorType, StringType, - TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const + TypeCodeType>::label (void) const { CORBA::Any * value = 0; ACE_NEW_THROW_EX (value, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_value (value); diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index c0cff25b880..548199bd4ad 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -111,11 +111,11 @@ namespace TAO */ //@{ Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Any * label (void) const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index 892380775ba..c57a1eb8307 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -111,7 +111,7 @@ TAO::TypeCode::Union<StringType, CaseArrayType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // These calls shouldn't throw since CORBA::TypeCode::equal() // verified that the TCKind is the same as our's prior to invoking @@ -119,11 +119,9 @@ TAO::TypeCode::Union<StringType, // are supported. CORBA::ULong const tc_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); - CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + CORBA::Long tc_def = tc->default_index (); if (tc_count != this->ncases_ || tc_def != this->default_index_) @@ -131,14 +129,12 @@ TAO::TypeCode::Union<StringType, // Check the discriminator type. CORBA::TypeCode_var tc_discriminator = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->discriminator_type (); CORBA::Boolean const equal_discriminators = Traits<StringType>::get_typecode (this->discriminant_type_)->equal ( tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_discriminators) return false; @@ -159,8 +155,7 @@ TAO::TypeCode::Union<StringType, bool const equal_case = lhs_case.equal (i, tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_case) return false; @@ -179,31 +174,27 @@ TAO::TypeCode::Union<StringType, CaseArrayType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); - CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + CORBA::Long tc_def = tc->default_index (); if (tc_count != this->ncases_ || tc_def != this->default_index_) return false; CORBA::TypeCode_var tc_discriminator = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->discriminator_type (); CORBA::Boolean const equiv_discriminators = Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent ( tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_discriminators) return false; @@ -224,8 +215,7 @@ TAO::TypeCode::Union<StringType, bool const equivalent_case = lhs_case.equivalent (i, tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equivalent_case) return false; @@ -243,7 +233,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { // typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, // CORBA::TypeCode_var> > elem_type; @@ -264,8 +254,7 @@ TAO::TypeCode::Union<StringType, // tc_cases[i].name = empty_name; // tc_cases[i].type = // this->cases_[i]->type ()->get_compact_typecode ( -// ACE_ENV_ARG_PARAMETER); -// ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); +// ); // } // } @@ -290,8 +279,7 @@ TAO::TypeCode::Union<StringType, // this->default_index_, // "", // Traits<StringType>::get_typecode (this->default_case_.type) -// ACE_ENV_ARG_PARAMETER); -// ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); +// ); ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); @@ -307,7 +295,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -323,7 +311,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -339,7 +327,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->ncases_; } @@ -353,7 +341,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -372,7 +360,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->ncases_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -390,7 +378,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::member_label_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->ncases_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -404,7 +392,6 @@ TAO::TypeCode::Union<StringType, ACE_NEW_THROW_EX (any, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_any (any); @@ -418,7 +405,7 @@ TAO::TypeCode::Union<StringType, } // Non-default cases. - return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->cases_[index]->label (); } template <typename StringType, @@ -430,7 +417,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( @@ -446,7 +433,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::default_index_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->default_index_; } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 8089aeea48f..73d520102b3 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -99,23 +99,23 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Any * member_label_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::Long default_index_i (void) const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index b1ad9868e21..f79809e3af8 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -102,7 +102,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // These calls shouldn't throw since CORBA::TypeCode::equal() // verified that the TCKind is the same as our's prior to invoking @@ -110,11 +110,9 @@ TAO::TypeCode::Union<char const *, // are supported. CORBA::ULong const tc_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); - CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + CORBA::Long tc_def = tc->default_index (); if (tc_count != this->ncases_ || tc_def != this->default_index_) @@ -122,14 +120,12 @@ TAO::TypeCode::Union<char const *, // Check the discriminator type. CORBA::TypeCode_var tc_discriminator = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->discriminator_type (); CORBA::Boolean const equal_discriminators = Traits<char const *>::get_typecode (this->discriminant_type_)->equal ( tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_discriminators) return false; @@ -150,8 +146,7 @@ TAO::TypeCode::Union<char const *, bool const equal_case = lhs_case.equal (i, tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_case) return false; @@ -167,31 +162,27 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); - CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + CORBA::Long tc_def = tc->default_index (); if (tc_count != this->ncases_ || tc_def != this->default_index_) return false; CORBA::TypeCode_var tc_discriminator = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->discriminator_type (); CORBA::Boolean const equiv_discriminators = Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent ( tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_discriminators) return false; @@ -212,8 +203,7 @@ TAO::TypeCode::Union<char const *, bool const equivalent_case = lhs_case.equivalent (i, tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equivalent_case) return false; @@ -228,7 +218,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { // typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, // CORBA::TypeCode_var> > elem_type; @@ -249,8 +239,7 @@ TAO::TypeCode::Union<char const *, // tc_cases[i].name = empty_name; // tc_cases[i].type = // this->cases_[i]->type ()->get_compact_typecode ( -// ACE_ENV_ARG_PARAMETER); -// ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); +// ); // } // } @@ -275,8 +264,7 @@ TAO::TypeCode::Union<char const *, // this->default_index_, // "", // Traits<char const *>::get_typecode (this->default_case_.type) -// ACE_ENV_ARG_PARAMETER); -// ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); +// ); ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } @@ -287,7 +275,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -300,7 +288,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -313,7 +301,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->ncases_; } @@ -325,7 +313,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -342,7 +330,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->ncases_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -358,7 +346,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::member_label_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->ncases_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -372,7 +360,6 @@ TAO::TypeCode::Union<char const *, ACE_NEW_THROW_EX (any, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_any (any); @@ -386,7 +373,7 @@ TAO::TypeCode::Union<char const *, } // Non-default cases. - return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->cases_[index]->label (); } CORBA::TypeCode_ptr @@ -395,7 +382,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( @@ -408,7 +395,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::default_index_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->default_index_; } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index bf58345e03f..4617c259d2e 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -97,23 +97,23 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Any * member_label_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::Long default_index_i (void) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index 8955d4be01b..df14b999403 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -117,34 +117,30 @@ TAO::TypeCode::Value<StringType, FieldArrayType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // None of these calls should throw since CORBA::TypeCode::equal() // verified that the TCKind is the same as our's prior to invoking // this method. CORBA::ValueModifier const tc_type_modifier = - tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->type_modifier (); if (tc_type_modifier != this->type_modifier_) return false; CORBA::TypeCode_var rhs_concrete_base_type = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->concrete_base_type (); CORBA::Boolean const equal_concrete_base_types = this->equal (rhs_concrete_base_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_concrete_base_types) return false; CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -157,17 +153,14 @@ TAO::TypeCode::Value<StringType, CORBA::Visibility const lhs_visibility = lhs_field.visibility; CORBA::Visibility const rhs_visibility = tc->member_visibility (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (lhs_visibility != rhs_visibility) return false; char const * const lhs_name = - Traits<StringType>::get_string (lhs_field.name);; - char const * const rhs_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + Traits<StringType>::get_string (lhs_field.name); + char const * const rhs_name = tc->member_name (i); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -175,14 +168,10 @@ TAO::TypeCode::Value<StringType, CORBA::TypeCode_ptr const lhs_tc = Traits<StringType>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = - tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_type (i); CORBA::Boolean const equal_members = - lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + lhs_tc->equal (rhs_tc.in ()); if (!equal_members) return false; @@ -201,23 +190,19 @@ TAO::TypeCode::Value<StringType, FieldArrayType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { CORBA::ValueModifier const tc_type_modifier = - tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->type_modifier (); if (tc_type_modifier != this->type_modifier_) return false; CORBA::TypeCode_var rhs_concrete_base_type = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->concrete_base_type (); CORBA::Boolean const equivalent_concrete_base_types = - this->equivalent (rhs_concrete_base_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->equivalent (rhs_concrete_base_type.in ()); if (!equivalent_concrete_base_types) return false; @@ -226,8 +211,7 @@ TAO::TypeCode::Value<StringType, // member_name() operations. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -240,9 +224,7 @@ TAO::TypeCode::Value<StringType, CORBA::Visibility const lhs_visibility = lhs_field.visibility; CORBA::Visibility const rhs_visibility = - tc->member_visibility (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_visibility (i); if (lhs_visibility != rhs_visibility) return false; @@ -250,14 +232,11 @@ TAO::TypeCode::Value<StringType, CORBA::TypeCode_ptr const lhs_tc = Traits<StringType>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = - tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_type (i); CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_types) return false; @@ -274,8 +253,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + RefCountPolicy>::get_compact_typecode_i (void) const { ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> > tc_fields (this->nfields_); @@ -296,8 +274,7 @@ TAO::TypeCode::Value<StringType, tc_fields[i].type = Traits<StringType>::get_typecode ( this->fields_[i].type)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); tc_fields[i].visibility = this->fields_[i].visibility; } } @@ -321,7 +298,7 @@ TAO::TypeCode::Value<StringType, Traits<StringType>::get_typecode (this->concrete_base_), tc_fields, this->nfields_ - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, @@ -332,8 +309,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::id_i (void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -348,8 +324,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::name_i (void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -364,8 +339,7 @@ CORBA::ULong TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::member_count_i (void) const { return this->nfields_; } @@ -378,9 +352,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_name_i ( - CORBA::ULong index - ACE_ENV_ARG_DECL) const + RefCountPolicy>::member_name_i (CORBA::ULong index) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -398,9 +370,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_type_i ( - CORBA::ULong index - ACE_ENV_ARG_DECL) const + RefCountPolicy>::member_type_i (CORBA::ULong index) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -419,9 +389,7 @@ CORBA::Visibility TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_visibility_i ( - CORBA::ULong index - ACE_ENV_ARG_DECL) const + RefCountPolicy>::member_visibility_i (CORBA::ULong index) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -438,8 +406,7 @@ CORBA::ValueModifier TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::type_modifier_i (void) const { return this->type_modifier_; } @@ -452,8 +419,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::concrete_base_type_i (void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index ffc18532e6f..c2c4254fd82 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -101,24 +101,24 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::ValueModifier type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; virtual CORBA::TypeCode_ptr concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index f8f661e4bdc..fd811ede635 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -108,34 +108,30 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // None of these calls should throw since CORBA::TypeCode::equal() // verified that the TCKind is the same as our's prior to invoking // this method. CORBA::ValueModifier const tc_type_modifier = - tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->type_modifier (); if (tc_type_modifier != this->type_modifier_) return false; CORBA::TypeCode_var rhs_concrete_base_type = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->concrete_base_type (); CORBA::Boolean const equal_concrete_base_types = this->equal (rhs_concrete_base_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_concrete_base_types) return false; CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -148,8 +144,7 @@ TAO::TypeCode::Value<char const *, CORBA::Visibility const lhs_visibility = lhs_field.visibility; CORBA::Visibility const rhs_visibility = tc->member_visibility (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (lhs_visibility != rhs_visibility) return false; @@ -157,8 +152,7 @@ TAO::TypeCode::Value<char const *, char const * const lhs_name = Traits<char const *>::get_string (lhs_field.name);; char const * const rhs_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -167,13 +161,11 @@ TAO::TypeCode::Value<char const *, Traits<char const *>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_members) return false; @@ -189,23 +181,20 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { CORBA::ValueModifier const tc_type_modifier = - tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->type_modifier (); if (tc_type_modifier != this->type_modifier_) return false; CORBA::TypeCode_var rhs_concrete_base_type = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->concrete_base_type (); CORBA::Boolean const equivalent_concrete_base_types = this->equivalent (rhs_concrete_base_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equivalent_concrete_base_types) return false; @@ -214,8 +203,7 @@ TAO::TypeCode::Value<char const *, // member_name() operations. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -230,8 +218,7 @@ TAO::TypeCode::Value<char const *, lhs_field.visibility; CORBA::Visibility const rhs_visibility = tc->member_visibility (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (lhs_visibility != rhs_visibility) return false; @@ -240,13 +227,11 @@ TAO::TypeCode::Value<char const *, Traits<char const *>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_types) return false; @@ -261,7 +246,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> > tc_fields (this->nfields_); @@ -282,8 +267,7 @@ TAO::TypeCode::Value<char const *, tc_fields[i].type = Traits<char const *>::get_typecode ( this->fields_[i].type)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); tc_fields[i].visibility = this->fields_[i].visibility; } } @@ -307,7 +291,7 @@ TAO::TypeCode::Value<char const *, Traits<char const *>::get_typecode (this->concrete_base_), tc_fields, this->nfields_ - ACE_ENV_ARG_PARAMETER); + ); } char const * @@ -316,7 +300,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -329,7 +313,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -342,7 +326,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nfields_; } @@ -354,7 +338,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -371,7 +355,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -389,7 +373,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_visibility_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -404,7 +388,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->type_modifier_; } @@ -415,7 +399,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index 57ba318ab03..6df27155314 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -98,24 +98,24 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::ValueModifier type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; virtual CORBA::TypeCode_ptr concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 9c6fd0a62f2..0fb04dbc451 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -78,16 +78,14 @@ namespace TAO return false; } - ACE_TRY_NEW_ENV + try { - this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->value_->_tao_decode (cdr); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 618c273141a..0bfbd0adb7d 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -50,14 +50,13 @@ TAO::traverse_status TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; // status of encode operation - CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const k = tc->kind (); switch (k) { @@ -116,7 +115,7 @@ TAO::traverse_status TAO_Marshal_Any::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // Typecode of the element that makes the Any. CORBA::TypeCode_var elem_tc; @@ -136,8 +135,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (elem_tc.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); if (retval != TAO::TRAVERSE_CONTINUE) { @@ -157,7 +155,7 @@ TAO::traverse_status TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; TAO::traverse_status retval = @@ -194,8 +192,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (CORBA::_tc_long, src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; @@ -207,8 +204,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (CORBA::_tc_long, src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; @@ -236,8 +232,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq, src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } } // end of switch } @@ -275,20 +270,20 @@ TAO::traverse_status TAO_Marshal_Principal::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // write the octet sequence representing the Principal return TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq, src, dest - ACE_ENV_ARG_PARAMETER); + ); } TAO::traverse_status TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; @@ -361,7 +356,7 @@ TAO::traverse_status TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -369,23 +364,20 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, // Number of fields in the struct. const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { // get member type - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) @@ -404,15 +396,13 @@ TAO::traverse_status TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var discrim_tc = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->discriminator_type (); CORBA::ULong kind = - discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + discrim_tc->kind (); // Save the discriminator value in a temporary variable... CORBA::Short short_v = CORBA::Short(); @@ -495,8 +485,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U); @@ -508,16 +497,14 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, ++i) { CORBA::Any_var any = tc->member_label (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); CORBA::Octet o; if ((any >>= CORBA::Any::to_octet (o)) && o == 0) { CORBA::ULong default_index = - tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->default_index (); if (i != default_index) ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), @@ -631,12 +618,11 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, { // Good, use the default to append... CORBA::TypeCode_var member_tc = - tc->member_type (default_member ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_type (default_member); return TAO_Marshal_Object::perform_append (member_tc.in (), src, dest - ACE_ENV_ARG_PARAMETER); + ); } // If we're here, we have an implicit default case, and we @@ -647,19 +633,18 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, // If we found the member successfully then just use that one... CORBA::TypeCode_var member_tc = - tc->member_type (current_member ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_type (current_member); return TAO_Marshal_Object::perform_append (member_tc.in (), src, dest - ACE_ENV_ARG_PARAMETER); + ); } TAO::traverse_status TAO_Marshal_String::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; @@ -688,7 +673,7 @@ TAO::traverse_status TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // Size of element. CORBA::ULong bounds; @@ -721,14 +706,12 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, { // Get element typecode. CORBA::TypeCode_var tc2 = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->content_type (); TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; - CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind kind = tc2->kind (); switch (kind) { @@ -882,8 +865,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; }// end of switch @@ -906,19 +888,16 @@ TAO::traverse_status TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // retrieve the bounds of the array - CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::ULong bounds = tc->length (); // get element typecode - CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TypeCode_var tc2 = tc->content_type (); // For CORBA basic types, the copy can be optimized - CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind kind = tc2->kind (); // Return status. TAO::traverse_status retval = @@ -1075,8 +1054,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; }// end of switch @@ -1097,7 +1075,7 @@ TAO::traverse_status TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // Typecode of the aliased type. CORBA::TypeCode_var tc2; @@ -1107,14 +1085,12 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; - tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc2 = tc->content_type (); retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); if (retval == TAO::TRAVERSE_CONTINUE && continue_append == 1) @@ -1139,7 +1115,7 @@ TAO::traverse_status TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -1151,8 +1127,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, // Number of fields in the struct. const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count @@ -1160,14 +1135,12 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, && continue_append == 1; ++i) { - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE @@ -1187,7 +1160,7 @@ TAO::traverse_status TAO_Marshal_WString::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; @@ -1217,7 +1190,7 @@ TAO::traverse_status TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -1273,19 +1246,16 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, // Handle our base valuetype if any. CORBA::TypeCode_var param = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->concrete_base_type (); - CORBA::TCKind const param_kind = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const param_kind = param->kind (); if (param_kind != CORBA::tk_null) { retval = this->append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); if (retval != TAO::TRAVERSE_CONTINUE) { @@ -1295,23 +1265,20 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, // Number of fields in the struct. const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { // get member type - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp index f8c486bc6a2..6e73a6851bb 100644 --- a/TAO/tao/AnyTypeCode/skip.cpp +++ b/TAO/tao/AnyTypeCode/skip.cpp @@ -41,15 +41,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::traverse_status TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; // Status of skip operation. TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; - CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const k = tc->kind (); switch (k) { @@ -106,7 +105,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { // Typecode of the element that makes the Any. CORBA::TypeCode_var elem_tc; @@ -117,13 +116,13 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, return TAO_Marshal_Object::perform_skip (elem_tc.in (), stream - ACE_ENV_ARG_PARAMETER); + ); } TAO::traverse_status TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -224,7 +223,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -255,7 +254,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -317,27 +316,24 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; // Number of fields in the struct. CORBA::ULong const member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) @@ -355,15 +351,13 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *src - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var discrim_tc = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->discriminator_type (); CORBA::ULong const kind = - discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + discrim_tc->kind (); // Save the discriminator value in a temporary variable... CORBA::Short short_v = CORBA::Short(); @@ -438,8 +432,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, } const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U); @@ -450,15 +443,13 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, i < member_count && current_member == null_member; ++i) { - CORBA::Any_var any = tc->member_label (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::Any_var any = tc->member_label (i); CORBA::Octet o; if ((any >>= CORBA::Any::to_octet (o)) && o == 0) { CORBA::ULong default_index = - tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->default_index (); if (i != default_index) ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), @@ -572,11 +563,10 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, { // Good, use the default to append... CORBA::TypeCode_var member_tc = - tc->member_type (default_member ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_type (default_member); return TAO_Marshal_Object::perform_skip (member_tc.in (), src - ACE_ENV_ARG_PARAMETER); + ); } // If we're here, we have an implicit default case, and we @@ -587,18 +577,17 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, // If we found the member successfully then just use that one... CORBA::TypeCode_var member_tc = - tc->member_type (current_member ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_type (current_member); return TAO_Marshal_Object::perform_skip (member_tc.in (), src - ACE_ENV_ARG_PARAMETER); + ); } TAO::traverse_status TAO_Marshal_String::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -627,7 +616,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { // Size of element. CORBA::ULong bounds; @@ -653,12 +642,10 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, // Get element typecode. CORBA::TypeCode_var tc2 = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->content_type (); // For CORBA basic types, the skip can be optimized - CORBA::TCKind const kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const kind = tc2->kind (); char *dummy; switch (kind) @@ -713,8 +700,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, continue_skipping = TAO_Marshal_Object::perform_skip (tc2.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; }// end of switch @@ -734,22 +720,19 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; // retrieve the bounds of the array - CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::ULong bounds = tc->length (); // get element typecode // Typecode of the element. - CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TypeCode_var tc2 = tc->content_type (); // For CORBA basic types, the skip can be optimized - CORBA::TCKind const kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const kind = tc2->kind (); char *dummy; switch (kind) @@ -804,8 +787,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, int stop = TAO_Marshal_Object::perform_skip (tc2.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); if (stop == TAO::TRAVERSE_STOP) continue_skipping = false; } @@ -827,7 +809,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { // Typecode of the aliased type. CORBA::TypeCode_var tc2; @@ -837,13 +819,11 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; - tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc2 = tc->content_type (); retval = TAO_Marshal_Object::perform_skip (tc2.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); // tc2->_decr_refcnt (); if (retval == TAO::TRAVERSE_CONTINUE @@ -869,7 +849,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -881,20 +861,17 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, // Number of fields in the exception const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) @@ -913,7 +890,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -943,7 +920,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; @@ -1028,16 +1005,13 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, } // Handle our base valuetype if any. - param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->concrete_base_type (); - CORBA::TCKind const k = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const k = param->kind (); if (k != CORBA::tk_null) { - retval = this->skip (param.in (), stream ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + retval = this->skip (param.in (), stream); if (retval != TAO::TRAVERSE_CONTINUE) { @@ -1047,20 +1021,17 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, // Number of fields in the valuetype. CORBA::ULong const member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp index f888e2a5abc..55aa49e5bf1 100644 --- a/TAO/tao/Argument.cpp +++ b/TAO/tao/Argument.cpp @@ -64,7 +64,7 @@ TAO::RetArgument::mode (void) const TAO::Argument* TAO::Void_Return_Argument::clone (void) { - TAO::Argument* clone_arg; + TAO::Argument* clone_arg = 0; ACE_NEW_RETURN (clone_arg, Void_Return_Argument (), 0); diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h index a00875866d7..bc9e282d666 100644 --- a/TAO/tao/Asynch_Queued_Message.h +++ b/TAO/tao/Asynch_Queued_Message.h @@ -17,12 +17,12 @@ #include "tao/Queued_Message.h" -#include "ace/Time_Value.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Time_Value.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Message_Block; ACE_END_VERSIONED_NAMESPACE_DECL @@ -45,7 +45,7 @@ public: * * @param alloc Allocator used for creating @c this object. * - * @param timeout The relative timeout after which this + * @param timeout The relative timeout after which this * message should be expired. * * @todo I'm almost sure this class will require a callback diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index 07d64561158..ef6c5bc5fed 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -66,7 +66,7 @@ public: /// Install the timeout handler virtual long schedule_timer (CORBA::ULong , const ACE_Time_Value & - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// @name Mutators for refcount //@{ diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h index a1a394d8b5b..23128844c2a 100644 --- a/TAO/tao/BiDir_Adapter.h +++ b/TAO/tao/BiDir_Adapter.h @@ -40,9 +40,8 @@ public: /// The virtual destructor virtual ~TAO_BiDir_Adapter (void); - virtual void load_policy_validators (TAO_Policy_Validator &validator ACE_ENV_ARG_DECL) + virtual void load_policy_validators (TAO_Policy_Validator &validator) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index 75158d45882..339d705792d 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -32,8 +32,7 @@ TAO_BiDirGIOP_Loader::init (int, PortableInterceptor::ORBInitializer::_nil (); PortableInterceptor::ORBInitializer_var bidir_orb_initializer; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { /// Register the BiDir ORBInitializer. ACE_NEW_THROW_EX (tmp_orb_initializer, @@ -43,18 +42,16 @@ TAO_BiDirGIOP_Loader::init (int, TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; bidir_orb_initializer = tmp_orb_initializer; PortableInterceptor::register_orb_initializer ( bidir_orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); TAO_BiDirGIOP_Loader::is_activated_ = true; } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { @@ -63,7 +60,6 @@ TAO_BiDirGIOP_Loader::init (int, } return -1; } - ACE_ENDTRY; } return 0; @@ -71,7 +67,7 @@ TAO_BiDirGIOP_Loader::init (int, void TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Is this true? Does the GIOP protocol version matter here? @@ -86,7 +82,6 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; // We may be adding another TAO_BiDirPolicy_Validator instance for // the same ORB (different POA). In cases where huge numbers of diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index f18a84ab0e1..00cd082a9fa 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -52,8 +52,7 @@ public: virtual int init (int argc, ACE_TCHAR* []); - virtual void load_policy_validators (TAO_Policy_Validator &validator - ACE_ENV_ARG_DECL) + virtual void load_policy_validators (TAO_Policy_Validator &validator) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to force the initialization of the ORB code. diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp index 0d6734ae2b0..b1e77c43808 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp @@ -16,28 +16,24 @@ TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core) void -TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) +TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies) { CORBA::Policy_var policy = policies.get_cached_policy (TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (policy.in () == 0) return; BiDirPolicy::BidirectionalPolicy_var srp = BiDirPolicy::BidirectionalPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (srp.in () == 0) return; BiDirPolicy::BidirectionalPolicyValue val = - srp->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + srp->value (); // Set the flag in the ORB_Core if (val == BiDirPolicy::BOTH) @@ -45,10 +41,9 @@ TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies } void -TAO_BiDirPolicy_Validator::merge_policies_impl (TAO_Policy_Set & /*policies*/ - ACE_ENV_ARG_DECL_NOT_USED) +TAO_BiDirPolicy_Validator::merge_policies_impl (TAO_Policy_Set &) { - return ; + return; } CORBA::Boolean diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h index 106b1a834c8..d193638a75a 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h @@ -42,14 +42,11 @@ public: TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core); - virtual void validate_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + virtual void validate_impl (TAO_Policy_Set &policies); - virtual void merge_policies_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + virtual void merge_policies_impl (TAO_Policy_Set &policies); virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp index 2aff9aa8432..3b062cd28ad 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp @@ -13,29 +13,23 @@ ACE_RCSID (BiDir_GIOP, TAO_BEGIN_VERSIONED_NAMESPACE_DECL void -TAO_BiDir_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_BiDir_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // } void -TAO_BiDir_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_BiDir_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->register_policy_factories (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->register_policy_factories (info); } void TAO_BiDir_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) { /// Register the BiDir policy factories. PortableInterceptor::PolicyFactory_ptr temp_factory = @@ -48,7 +42,6 @@ TAO_BiDir_ORBInitializer::register_policy_factories ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::PolicyFactory_var policy_factory = temp_factory; @@ -60,10 +53,7 @@ TAO_BiDir_ORBInitializer::register_policy_factories ( type = BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE; info->register_policy_factory (type, - policy_factory.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - + policy_factory.in ()); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h index b09a94da506..7c8c673ce4b 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h @@ -39,21 +39,16 @@ class TAO_BiDir_ORBInitializer { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: - ///< Register BiDir policy factories. - void register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); - + /// Register BiDir policy factories. + void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp index 823dc34c979..397be5ee664 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp @@ -14,8 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr TAO_BiDir_PolicyFactory::create_policy ( CORBA::PolicyType type, - const CORBA::Any &value - ACE_ENV_ARG_DECL) + const CORBA::Any &value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { @@ -39,7 +38,6 @@ TAO_BiDir_PolicyFactory::create_policy ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return policy; } diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h index 9a4175257b5..357c59a85c1 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h @@ -41,8 +41,7 @@ class TAO_BiDir_PolicyFactory public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const CORBA::Any & value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index 71f2fa359d3..d3b548a9347 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -34,7 +34,7 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy } CORBA::PolicyType -TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_BidirectionalPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how this minimizes the @@ -54,7 +54,7 @@ TAO_BidirectionalPolicy::clone (void) const } CORBA::Policy_ptr -TAO_BidirectionalPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_BidirectionalPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is @@ -64,20 +64,18 @@ TAO_BidirectionalPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (tmp, TAO_BidirectionalPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_BidirectionalPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_BidirectionalPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } BiDirPolicy::BidirectionalPolicyValue -TAO_BidirectionalPolicy::value ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_BidirectionalPolicy::value (void) ACE_THROW_SPEC (( CORBA::SystemException)) { diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 93ef62f6c19..718016fc381 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -55,19 +55,16 @@ public: virtual TAO_BidirectionalPolicy *clone (void) const; /// = The BiDir::BidirectionalPolicy methods - virtual BiDirPolicy::BidirectionalPolicyValue value ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual BiDirPolicy::BidirectionalPolicyValue value (void) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/BooleanSeq.pidl b/TAO/tao/BooleanSeq.pidl index 5ae3d3e667c..8042cc7c138 100644 --- a/TAO/tao/BooleanSeq.pidl +++ b/TAO/tao/BooleanSeq.pidl @@ -3,19 +3,7 @@ // $Id$ /** - * This file was used to generate the code in BooleanSeqC.* - * The command used to generate code is: - * - * tao_idl - * -oA AnyTypeCode - * -GA -SS -Sci - * -Wb,pre_include=ace/pre.h - * -Wb,post_include=ace/post.h - * -Wb,export_macro=TAO_Export - * -Wb,export_include=tao/TAO_Export.h - * -Wb,anyop_export_macro=TAO_AnyTypeCode_Export - * -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - * BooleanSeq.pidl + * This file is used to generate the code in BooleanSeqC.* */ #ifndef TAO_CORBA_BOOLEAN_SEQ_IDL diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index 6bd1851c4ec..5c5f1f78e9e 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -39,7 +39,7 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff } CORBA::PolicyType -TAO_Buffering_Constraint_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Buffering_Constraint_Policy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE; @@ -56,27 +56,26 @@ TAO_Buffering_Constraint_Policy::clone (void) const } TAO::BufferingConstraint -TAO_Buffering_Constraint_Policy::buffering_constraint (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Buffering_Constraint_Policy::buffering_constraint (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->buffering_constraint_; } CORBA::Policy_ptr -TAO_Buffering_Constraint_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Buffering_Constraint_Policy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Buffering_Constraint_Policy* servant = 0; ACE_NEW_THROW_EX (servant, TAO_Buffering_Constraint_Policy (*this), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return servant; } void -TAO_Buffering_Constraint_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Buffering_Constraint_Policy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h index f09e55b73b0..c03987881ea 100644 --- a/TAO/tao/Buffering_Constraint_Policy.h +++ b/TAO/tao/Buffering_Constraint_Policy.h @@ -56,18 +56,18 @@ public: // = The TAO::Buffering_Constraint_Policy methods - virtual TAO::BufferingConstraint buffering_constraint (ACE_ENV_SINGLE_ARG_DECL) + virtual TAO::BufferingConstraint buffering_constraint (void) ACE_THROW_SPEC ((CORBA::SystemException)); void get_buffering_constraint (TAO::BufferingConstraint &) const; - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 6101e0b01be..53361ea9f6a 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -3,7 +3,6 @@ #include "tao/CDR.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" -#include "tao/Environment.h" #include "tao/SystemException.h" #include "tao/GIOP_Fragmentation_Strategy.h" @@ -182,31 +181,31 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Data_Block *data_block, } void -TAO_OutputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL) +TAO_OutputCDR::throw_stub_exception (int error_num ) { switch (error_num) { case 0 : break; case EINVAL : // wchar from a GIOP 1.0 - ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); + throw ( ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); ACE_NOTREACHED (break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); ACE_NOTREACHED (break); #endif case EACCES : // wchar but no codeset - ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); + throw ( ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); ACE_NOTREACHED (break); default : - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } void -TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) +TAO_OutputCDR::throw_skel_exception (int error_num ) { switch (error_num) { @@ -214,23 +213,23 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) break; case EINVAL : // wchar from a GIOP 1.0 - ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES)); + throw ( ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES)); ACE_NOTREACHED (break); case EACCES : // wchar but no codeset - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 23, + throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 23, CORBA::COMPLETED_YES)); ACE_NOTREACHED (break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)); ACE_NOTREACHED (break); #endif default : - ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); + throw ( ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); } } @@ -274,51 +273,51 @@ TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs, } void -TAO_InputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL) +TAO_InputCDR::throw_stub_exception (int error_num ) { switch (error_num) { case 0 : break; case EINVAL : // wchar from a GIOP 1.0 - ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES)); + throw ( ::CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES)); ACE_NOTREACHED(break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)); + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)); ACE_NOTREACHED(break); #endif case EACCES : // wchar but no codeset - ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES)); + throw ( ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES)); ACE_NOTREACHED(break); default : - ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); + throw ( ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); } } void -TAO_InputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) +TAO_InputCDR::throw_skel_exception (int error_num ) { switch (error_num) { case 0 : break; case EINVAL : // wchar from a GIOP 1.0 - ACE_THROW (CORBA::MARSHAL(CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); + throw ( ::CORBA::MARSHAL(CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); ACE_NOTREACHED(break); case EACCES : // wchar but no codeset - ACE_THROW (CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO)); + throw ( ::CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO)); ACE_NOTREACHED(break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - ACE_THROW (CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); + throw ( ::CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); ACE_NOTREACHED(break); #endif default : - ACE_THROW (CORBA::MARSHAL()); + throw ( ::CORBA::MARSHAL()); } } diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index d3f75c4d353..1dd62593f70 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -63,11 +63,6 @@ class TAO_ORB_Core; class TAO_GIOP_Fragmentation_Strategy; class TAO_Stub; -namespace CORBA -{ - class Environment; -} - /** * @class TAO_OutputCDR * @@ -167,8 +162,8 @@ public: // strings and wstrings? // = TAO specific methods. - static void throw_stub_exception (int error_num ACE_ENV_ARG_DECL); - static void throw_skel_exception (int error_num ACE_ENV_ARG_DECL); + static void throw_stub_exception (int error_num); + static void throw_skel_exception (int error_num); /** * @name Outgoing GIOP Fragment Related Methods @@ -385,8 +380,8 @@ public: clr_mb_flags( ACE_Message_Block::Message_Flags less_flags ); // = TAO specific methods. - static void throw_stub_exception (int error_num ACE_ENV_ARG_DECL); - static void throw_skel_exception (int error_num ACE_ENV_ARG_DECL); + static void throw_stub_exception (int error_num); + static void throw_skel_exception (int error_num); private: /// The ORB_Core, required to extract object references. diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl index 637f4d35a89..13fb9f106a8 100644 --- a/TAO/tao/CONV_FRAME.pidl +++ b/TAO/tao/CONV_FRAME.pidl @@ -6,19 +6,6 @@ * $Id$ * * This file is used to generate CONV_FRAMEC.{h,cpp}, using the - * following command: - * - * tao_idl - * -o orig -GA -SS -Sci -Sc - * -Wb,export_macro=TAO_Export - * -Wb,export_include="tao/TAO_Export.h" - * -Wb,pre_include="ace/pre.h" - * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL - * CONV_FRAME.pidl - * - * The files are ready to use. */ #ifndef TAO_CORBA_CONV_FRAME_PIDL diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 75bd6179945..26079de0343 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -45,14 +45,13 @@ TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const CORBA::Object_ptr TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb, TAO_MProfile &mprofile - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create a TAO_Stub. TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0, mprofile - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ); TAO_Stub_Auto_Ptr safe_data (data); @@ -75,7 +74,7 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb, CORBA::Object_ptr TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior, CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Pass the key string as an argument to resolve_initial_references. @@ -88,8 +87,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior, CORBA::Object_var rir_obj = orb->resolve_initial_references (*objkey == '\0' ? "NameService" : objkey - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ); return rir_obj._retn (); } @@ -97,7 +95,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior, CORBA::Object_ptr TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // The decomposition of a corbaloc string is in Section 13.6.10. @@ -126,7 +124,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, // First check for rir if (ACE_OS::strncmp (ior,rir_token,rir_token_len) == 0) return this->parse_string_rir_helper (ior,orb - ACE_ENV_ARG_PARAMETER); + ); // set up space for parsed endpoints. there will be at least 1, and // most likely commas will separate endpoints, although they could be @@ -142,8 +140,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, // Get the Connector Registry from the ORB. TAO_Connector_Registry *conn_reg = - orb->orb_core ()->connector_registry(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + orb->orb_core ()->connector_registry(); while (1) { // will loop on comma only. size_t len = 0; @@ -158,8 +155,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, { endpoints[ndx].profile_ = (*conn_iter)->corbaloc_scan(ior,len - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ); if (endpoints[ndx].profile_) { @@ -167,8 +163,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, (*conn_iter)->object_key_delimiter(); uiop_compatible = (endpoints[ndx].obj_key_sep_ == '|'); this->make_canonical (ior,len,endpoints[ndx].prot_addr_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ); ior += len; break; } @@ -231,8 +226,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, endpoints[i].obj_key_sep_ + obj_key; const char * str = full_ep.c_str(); - endpoints[i].profile_->parse_string (str ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + endpoints[i].profile_->parse_string (str); int share = orb->orb_core()->orb_params()->shared_profile(); if (mprofile.give_profile(endpoints[i].profile_, share) != -1) endpoints[i].profile_ = 0; @@ -258,8 +252,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, // Get an object stub out. object = this->make_stub_from_mprofile (orb, mprofile - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ); return object; } @@ -268,7 +261,7 @@ void TAO_CORBALOC_Parser::make_canonical (const char *ior, size_t prot_addr_len, ACE_CString &canonical_endpoint - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { const char *separator = ACE_OS::strchr (ior, ':'); @@ -359,7 +352,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("cannot determine hostname.\n"))); - ACE_THROW (CORBA::INV_OBJREF + throw ( ::CORBA::INV_OBJREF (CORBA::SystemException::_tao_minor_code (TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index bf085b2f508..737d0c4c51e 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -57,7 +57,7 @@ public: /// Parse the ior-string that is passed. virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -69,19 +69,19 @@ private: */ CORBA::Object_ptr make_stub_from_mprofile (CORBA::ORB_ptr orb, TAO_MProfile &mprofile - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Gets the pointer to the key_string when the protocol used is RIR CORBA::Object_ptr parse_string_rir_helper (const char *corbaloc_name, CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); void make_canonical (const char *ior, size_t ior_len, ACE_CString &canonical_endpoint - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); struct parsed_endpoint { diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 328bb860795..b52227d2f1c 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -63,7 +63,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, CORBA::Object_ptr TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -74,7 +74,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::Object_ptr obj = CORBA::Object::_nil (); - ACE_TRY + try { // The position of the seperator between the obj_addr and key // string @@ -103,8 +103,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, // Obtain a reference to the naming context CORBA::Object_var name_context = orb->string_to_object (corbaloc_addr.c_str () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // Check if the Object reference is nil. if (CORBA::is_nil (name_context.in ())) @@ -114,8 +113,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::Boolean is_a = name_context->_is_a ("IDL:omg.org/CosNaming/NamingContextExt:1.0" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (!is_a) { @@ -131,8 +129,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, // Make a dynamic request for resolve_str in this naming context obj = this->parse_string_dynamic_request_helper (name_context.in (), key_string - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { // There was no key string which implies that the caller wants @@ -140,15 +137,13 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, obj = name_context._retn (); } } - ACE_CATCH (CORBA::SystemException, ex) + catch ( ::CORBA::SystemException& ex) { if (TAO_debug_level >= 4) { ACE_PRINT_EXCEPTION (ex, "CORBANAME_Parser"); } } - ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); return obj; } diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index ada5f625df5..72da515ac70 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -54,7 +54,7 @@ public: virtual CORBA::Object_ptr parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, ACE_CString &key_string - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp index 2eb88cc49d3..bcb0e31e1a1 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp @@ -25,7 +25,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + ) { TAO_CSD_POA *poa = 0; @@ -38,9 +38,8 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, thread_lock, orb_core, object_adapter - ACE_ENV_ARG_PARAMETER), + ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); TAO_CSD_Strategy_Repository *repo = @@ -60,8 +59,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, if (! ::CORBA::is_nil (strategy.in ())) { - poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + poa->set_csd_strategy (strategy.in ()); } return poa; diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h index 1d041331e99..3fafa9fe1ea 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h @@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Interface for CSD_POA servant dispatching strategies. */ -class TAO_CSD_FW_Export TAO_CSD_Default_Servant_Dispatcher +class TAO_CSD_FW_Export TAO_CSD_Default_Servant_Dispatcher : public virtual TAO_Default_Servant_Dispatcher { public: @@ -43,8 +43,7 @@ public: ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); + TAO_Object_Adapter *object_adapter); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp index 3a6e3120650..5fdf7a56599 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp @@ -74,20 +74,19 @@ TAO::CSD::FW_Server_Request_Wrapper::~FW_Server_Request_Wrapper() void TAO::CSD::FW_Server_Request_Wrapper::dispatch (PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { - ACE_TRY + try { - servant->_dispatch(*this->request_, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + servant->_dispatch(*this->request_, 0); } // Only CORBA exceptions are caught here. - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (this->request_->collocated()) { // For collocated requests, we re-throw the exception. - ACE_RE_THROW; + throw; } else if (!this->request_->sync_with_server() && this->request_->response_expected() && @@ -113,8 +112,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch "FW_Server_Request_Wrapper::dispatch ()"); } } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { // @@ TODO some c++ exception or another, but what do we do with // it? @@ -130,7 +128,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch if (this->request_->collocated()) { // For collocated requests, we re-throw the exception. - ACE_RE_THROW; + throw; } else if (!this->request_->sync_with_server() && this->request_->response_expected() && @@ -156,9 +154,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch "FW_Server_Request_Wrapper::dispatch ()"); } } -#endif /* TAO_HAS_EXCEPTIONS */ - ACE_ENDTRY; } @@ -166,16 +162,11 @@ TAO_ServerRequest* TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_ServerRequest*& request) { // TBD-CSD: Ultimately add an argument for an allocator. - TAO_ServerRequest* clone_obj; + TAO_ServerRequest* clone_obj = 0; ACE_NEW_RETURN (clone_obj, TAO_ServerRequest (), 0); - if (clone_obj == 0) - { - return 0; - } - // TYPE: TAO_Pluggable_Messaging* // ACTION: Assuming that a shallow-copy is ok here. clone_obj->mesg_base_ = request->mesg_base_; diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h index 5268fb8a357..e01357d3e10 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h @@ -71,7 +71,7 @@ namespace TAO void clone(); /// Dispatch the request to the servant. - void dispatch(PortableServer::Servant servant ACE_ENV_ARG_DECL); + void dispatch(PortableServer::Servant servant); /// Cancel the request. void cancel(); diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp deleted file mode 100644 index b67ea4bbc08..00000000000 --- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// $Id$ -#include "tao/CSD_Framework/CSD_ORBInitializer.h" - -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 - -ACE_RCSID (CSD_Framework, - CSD_ORBInitializer, - "$Id$") - -#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_CSD_ORBInitializer::TAO_CSD_ORBInitializer () -{ -} - -void -TAO_CSD_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void -TAO_CSD_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h deleted file mode 100644 index 8d6aa8a03e5..00000000000 --- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h +++ /dev/null @@ -1,70 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_ORBInitializer.h - * - * $Id$ - * - * @author Yan Dai (dai_y@ociweb.com) - */ -//============================================================================= - - -#ifndef TAO_CSD_ORB_INITIALIZER_H -#define TAO_CSD_ORB_INITIALIZER_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -//#include "tao/PortableInterceptorC.h" -#include "tao/LocalObject.h" -#include "tao/PI/ORBInitializerC.h" - -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/// CSD ORB initializer. -class TAO_CSD_ORBInitializer - : public virtual PortableInterceptor::ORBInitializer - , public virtual TAO_Local_RefCounted_Object -{ -public: - - TAO_CSD_ORBInitializer (); - - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_ORB_INITIALIZER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp index ed74e7c413b..3b4d70b0b43 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp @@ -15,7 +15,7 @@ TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter ( TAO_ORB_Core &orb_core) : TAO_Object_Adapter (creation_parameters, orb_core) { - + } TAO_CSD_Object_Adapter::~TAO_CSD_Object_Adapter () @@ -26,20 +26,19 @@ void TAO_CSD_Object_Adapter::do_dispatch ( TAO_ServerRequest& req, TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL) + ) { TAO_Root_POA& poa = upcall.poa (); TAO_CSD_POA* csd_poa = dynamic_cast<TAO_CSD_POA*> (&poa); - + if (csd_poa == 0) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); } TAO::CSD::Strategy_Proxy& proxy = csd_poa->servant_dispatching_strategy_proxy (); - proxy.dispatch_request (req, upcall ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + proxy.dispatch_request (req, upcall); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h index 34016654cba..6a9346e75cc 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h @@ -28,7 +28,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_CSD_Object_Adapter * - * @brief Defines the CSD version Object Adapter which overrides + * @brief Defines the CSD version Object Adapter which overrides * default dispatch implementation. * * This class will be used as a facade for the CSD POAs in a server @@ -44,11 +44,11 @@ public: /// Destructor virtual ~TAO_CSD_Object_Adapter (void); - /// Hand the request to the Service_Dispatching_Strategy_Proxy for + /// Hand the request to the Service_Dispatching_Strategy_Proxy for /// dispatching. virtual void do_dispatch (TAO_ServerRequest& req, TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp index fa06817ec2c..c9d3a08c683 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp @@ -3,7 +3,6 @@ #include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h" #include "tao/CSD_Framework/CSD_Strategy_Repository.h" #include "tao/CSD_Framework/CSD_Object_Adapter.h" -#include "tao/CSD_Framework/CSD_ORBInitializer.h" #include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h" #include "tao/ORB_Core.h" #include "tao/ORBInitializer_Registry.h" @@ -51,37 +50,6 @@ TAO_CSD_Object_Adapter_Factory::init (int /* argc */, if (repo != 0) repo->init(0,0); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - /// Register the Messaging ORBInitializer. - PortableInterceptor::ORBInitializer_ptr temp_orb_initializer = - PortableInterceptor::ORBInitializer::_nil (); - - ACE_NEW_THROW_EX (temp_orb_initializer, - TAO_CSD_ORBInitializer, - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; - - PortableInterceptor::ORBInitializer_var orb_initializer = - temp_orb_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); - return -1; - } - ACE_ENDTRY; - return 0; } diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp index f3cc8e605f5..57f6f75de41 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.cpp +++ b/TAO/tao/CSD_Framework/CSD_POA.cpp @@ -25,7 +25,7 @@ TAO_CSD_POA::TAO_CSD_POA (const String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + ) : TAO_Regular_POA (name, poa_manager, policies, @@ -34,12 +34,11 @@ TAO_CSD_POA::TAO_CSD_POA (const String &name, thread_lock, orb_core, object_adapter - ACE_ENV_ARG_PARAMETER) + ) { ACE_NEW_THROW_EX (this->sds_proxy_, TAO::CSD::Strategy_Proxy (), CORBA::NO_MEMORY ()); - ACE_CHECK; } @@ -51,7 +50,7 @@ TAO_CSD_POA::~TAO_CSD_POA (void) void TAO_CSD_POA::set_csd_strategy ( ::CSD_Framework::Strategy_ptr strategy - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -59,7 +58,7 @@ void TAO_CSD_POA::set_csd_strategy ( { if (CORBA::is_nil (strategy)) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); } this->sds_proxy_->custom_strategy (strategy); } @@ -73,7 +72,7 @@ TAO_CSD_POA::new_POA (const String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + ) { TAO_CSD_POA *poa = 0; @@ -86,9 +85,8 @@ TAO_CSD_POA::new_POA (const String &name, thread_lock, orb_core, object_adapter - ACE_ENV_ARG_PARAMETER), + ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); TAO_CSD_Strategy_Repository *repo = ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository"); @@ -98,8 +96,7 @@ TAO_CSD_POA::new_POA (const String &name, if (! ::CORBA::is_nil (strategy.in ())) { - poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + poa->set_csd_strategy (strategy.in ()); } return poa; @@ -117,18 +114,16 @@ void TAO_CSD_POA::poa_deactivated_hook () void TAO_CSD_POA::servant_activated_hook (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) + ) { - this->sds_proxy_->servant_activated_event (servant, oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->sds_proxy_->servant_activated_event (servant, oid); } void TAO_CSD_POA::servant_deactivated_hook (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) + ) { - this->sds_proxy_->servant_deactivated_event (servant, oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->sds_proxy_->servant_deactivated_event (servant, oid); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h index bcbf2e0495f..6ad06f92dde 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.h +++ b/TAO/tao/CSD_Framework/CSD_POA.h @@ -33,12 +33,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * Implementation of the CSD_Framework::POA interface. */ -class TAO_CSD_FW_Export TAO_CSD_POA - : public virtual CSD_Framework::POA, +class TAO_CSD_FW_Export TAO_CSD_POA + : public virtual CSD_Framework::POA, public virtual TAO_Regular_POA { public: - //Constructor + //Constructor TAO_CSD_POA (const String &name, PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies, @@ -47,16 +47,16 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); - - //Destructor + ); + + //Destructor virtual ~TAO_CSD_POA (void); - + /// Pass the Strategy object reference to the CSD poa. virtual void set_csd_strategy ( ::CSD_Framework::Strategy_ptr s - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -69,14 +69,14 @@ public: virtual void poa_deactivated_hook (); /// Hook - A servant has been activated. - virtual void servant_activated_hook (PortableServer::Servant servant, + virtual void servant_activated_hook (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); /// Hook - A servant has been deactivated. - virtual void servant_deactivated_hook (PortableServer::Servant servant, + virtual void servant_deactivated_hook (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); ///Method for creating new CSD POA. TAO_Root_POA * new_POA (const String &name, @@ -87,10 +87,10 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); + ); /// Servant Dispatching Strategy proxy accessor. - TAO::CSD::Strategy_Proxy& + TAO::CSD::Strategy_Proxy& servant_dispatching_strategy_proxy (void) const; private: diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp index aa641fe9bc7..2e0a1bbc2e3 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp @@ -24,7 +24,7 @@ TAO::CSD::Strategy_Base::~Strategy_Base() CORBA::Boolean TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil(poa)) @@ -79,16 +79,14 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa // Set the CSD Strategy_Base on the strategy proxy object owned by the POA. bool strategy_set = false; - ACE_TRY_NEW_ENV + try { - poa_impl->set_csd_strategy (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_impl->set_csd_strategy (this); strategy_set = true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; if (! strategy_set) { @@ -113,8 +111,8 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa void TAO::CSD::Strategy_Base::servant_activated_event_i (PortableServer::Servant , - const PortableServer::ObjectId& - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId& + ) { // do nothing. } @@ -124,7 +122,7 @@ void TAO::CSD::Strategy_Base::servant_deactivated_event_i (PortableServer::Servant, const PortableServer::ObjectId& - ACE_ENV_ARG_DECL) + ) { // do nothing. } diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h index d65753a27f7..81576348520 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h @@ -77,7 +77,7 @@ namespace TAO /// This method is invoked to "attach" this strategy object to /// the supplied POA. Returns true for success, and false for failure. - CORBA::Boolean apply_to(PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) + CORBA::Boolean apply_to(PortableServer::POA_ptr poa ) ACE_THROW_SPEC((CORBA::SystemException)); protected: @@ -91,7 +91,7 @@ namespace TAO PortableServer::POA_ptr poa, const char* operation, PortableServer::Servant servant - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Subclass provides implementation to dispatch a collocated request. virtual DispatchResult dispatch_collocated_request_i @@ -100,7 +100,7 @@ namespace TAO PortableServer::POA_ptr poa, const char* operation, PortableServer::Servant servant - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Event - The POA has been activated. virtual bool poa_activated_event_i() = 0; @@ -112,13 +112,13 @@ namespace TAO virtual void servant_activated_event_i (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); /// Event - A servant has been deactivated. virtual void servant_deactivated_event_i (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); private: @@ -132,7 +132,7 @@ namespace TAO /// request. void dispatch_request(TAO_ServerRequest& server_request, ::TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL); + ); /// Event - The POA has been activated. This happens when the POA_Manager /// is activated. @@ -145,13 +145,13 @@ namespace TAO /// Event - A servant has been activated. void servant_activated_event(PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); /// Event - A servant has been deactivated. This also occurs when /// the POA is destroyed. void servant_deactivated_event(PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); /// The POA to which this strategy has been applied. ::PortableServer::POA_var poa_; diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl index 6dce0cf7397..d3b40bfcef9 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl @@ -17,7 +17,7 @@ void TAO::CSD::Strategy_Base::dispatch_request (TAO_ServerRequest& server_request, TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL) + ) { DispatchResult result; @@ -28,8 +28,7 @@ TAO::CSD::Strategy_Base::dispatch_request this->poa_.in(), server_request.operation(), upcall.servant() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { @@ -38,8 +37,7 @@ TAO::CSD::Strategy_Base::dispatch_request this->poa_.in(), server_request.operation(), upcall.servant() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } switch (result) @@ -73,8 +71,7 @@ TAO::CSD::Strategy_Base::dispatch_request // right now, using the current thread. upcall.servant()->_dispatch(server_request, (void*)&upcall - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); break; default: @@ -113,7 +110,7 @@ TAO::CSD::Strategy_Base::poa_deactivated_event() this->poa_deactivated_event_i(); // Reset the poa to nil to decrement the reference count. - // This will break the circular dependency of the deletion + // This will break the circular dependency of the deletion // of the CSD POA. this->poa_ = 0; } @@ -124,10 +121,9 @@ void TAO::CSD::Strategy_Base::servant_activated_event (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) + ) { - this->servant_activated_event_i(servant, oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->servant_activated_event_i(servant, oid); } ACE_INLINE @@ -135,10 +131,9 @@ void TAO::CSD::Strategy_Base::servant_deactivated_event (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) + ) { - this->servant_deactivated_event_i(servant, oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->servant_deactivated_event_i(servant, oid); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h index 959a7cb9ebb..dd0ed342610 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h @@ -73,7 +73,7 @@ namespace TAO /// the smart pointer to the custom dispatching strategy object). void dispatch_request(TAO_ServerRequest& server_request, TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL); + ); /// Event - The POA has been (or is being) activated. @@ -85,12 +85,12 @@ namespace TAO /// Event - A servant has been activated. void servant_activated_event(PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); /// Event - A servant has been deactivated. void servant_deactivated_event(PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); private: diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl index 957852e6517..68bd0b7ee6a 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl @@ -21,7 +21,7 @@ void TAO::CSD::Strategy_Proxy::dispatch_request (TAO_ServerRequest& server_request, TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL) + ) { if (this->strategy_impl_ == 0) @@ -29,16 +29,14 @@ TAO::CSD::Strategy_Proxy::dispatch_request // This is the "default" strategy implementation. upcall.servant()->_dispatch(server_request, (void*)&upcall - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { // Delegate to the custom strategy object. this->strategy_impl_->dispatch_request(server_request, upcall - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } @@ -70,7 +68,7 @@ void TAO::CSD::Strategy_Proxy::servant_activated_event (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) + ) { // We only need to do something if this proxy holds a custom strategy. if (this->strategy_impl_) @@ -78,8 +76,7 @@ TAO::CSD::Strategy_Proxy::servant_activated_event // Delegate to the custom strategy object. this->strategy_impl_->servant_activated_event(servant, oid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } @@ -88,7 +85,7 @@ void TAO::CSD::Strategy_Proxy::servant_deactivated_event (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) + ) { // We only need to do something if this proxy holds a custom strategy. if (this->strategy_impl_) @@ -96,8 +93,7 @@ TAO::CSD::Strategy_Proxy::servant_deactivated_event // Delegate to the custom strategy object. this->strategy_impl_->servant_deactivated_event(servant, oid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl index e1602e2dde3..3cc1e6c5a38 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl @@ -14,19 +14,17 @@ ACE_INLINE TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor(PortableServer::Servant servant) : servant_(servant) { - // This try-catch block is not really necessary for current implementation - // since the _add_ref does not throw exception, but we have to add it to - // satisfy the non-exception builds. If _add_ref really throws an exception + // This try-catch block is not really necessary for current implementation + // since the _add_ref does not throw exception, but we have to add it to + // satisfy the non-exception builds. If _add_ref really throws an exception // then this constructor needs deal with the exception. - ACE_TRY_NEW_ENV + try { - this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->servant_->_add_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp index 0e4c596f682..929eef12517 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp @@ -28,27 +28,22 @@ TAO::CSD::TP_Collocated_Asynch_Request::prepare_for_queue_i() void TAO::CSD::TP_Collocated_Asynch_Request::dispatch_i() { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->do_dispatch(); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or // doing anything with it. } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or // doing anything with it. } -#endif - ACE_ENDTRY; } void diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp index c7d7d00fcde..128db5dd76d 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp @@ -22,27 +22,22 @@ TAO::CSD::TP_Collocated_Synch_Request::~TP_Collocated_Synch_Request() void TAO::CSD::TP_Collocated_Synch_Request::dispatch_i() { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->do_dispatch(); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // We need to save off a copy of the exception. this->exception_ = ACE_ANY_EXCEPTION._tao_duplicate(); } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { ACE_NEW (this->exception_ , CORBA::UNKNOWN (CORBA::SystemException::_tao_minor_code (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0), CORBA::COMPLETED_MAYBE)); } -#endif - ACE_ENDTRY; this->synch_helper_.dispatched(); } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h index cad5fa52bd5..97ec687398c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h @@ -42,9 +42,9 @@ namespace TAO * @brief Represents a "queue-able", synchronous, collocated, * CORBA request. * - * This kind request is the two-way or oneway(with SYNC_WITH_TARGET - * policy applied) collocated request. It is NOT cloned before - * enqueuing and the "enqueuing" thread will block until the request + * This kind request is the two-way or oneway(with SYNC_WITH_TARGET + * policy applied) collocated request. It is NOT cloned before + * enqueuing and the "enqueuing" thread will block until the request * is dispatched/handled or cancelled. */ class TAO_CSD_TP_Export TP_Collocated_Synch_Request @@ -66,9 +66,9 @@ namespace TAO /// Wait until the request has been dispatched (and completed), or /// until it has been cancelled. - /// Returns true if the request has been dispatched, and returns + /// Returns true if the request has been dispatched, and returns /// false if the request has been cancelled. - bool wait(ACE_ENV_SINGLE_ARG_DECL); + bool wait(void); protected: diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl index c92dfe4719f..f946b8fd9c6 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl @@ -27,7 +27,7 @@ TAO::CSD::TP_Collocated_Synch_Request::TP_Collocated_Synch_Request ACE_INLINE bool -TAO::CSD::TP_Collocated_Synch_Request::wait(ACE_ENV_SINGLE_ARG_DECL) +TAO::CSD::TP_Collocated_Synch_Request::wait(void) { bool dispatched = this->synch_helper_.wait_while_pending(); @@ -42,18 +42,14 @@ TAO::CSD::TP_Collocated_Synch_Request::wait(ACE_ENV_SINGLE_ARG_DECL) // first place. CORBA::Exception* ex = this->exception_; this->exception_ = 0; - -#if defined (TAO_HAS_EXCEPTIONS) + ACE_Auto_Basic_Ptr<CORBA::Exception> ex_holder(ex); ex->_raise (); -#else - ACE_TRY_ENV.exception (ex); -#endif /* ACE_HAS_EXCEPTIONS */ } } - + return dispatched; - + } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp index 70f43c863c7..64d74dd7e53 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp @@ -40,27 +40,22 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::dispatch_i() // This is done *before* we do_dispatch(). this->synch_helper_.dispatched(); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->do_dispatch(); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or // doing anything with it. } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or // doing anything with it. } -#endif - ACE_ENDTRY; } void diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h index 0b54d87ed06..f4002388306 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h @@ -42,13 +42,13 @@ namespace TAO * @brief Represents a "queue-able", one-way, collocated, CORBA * request with a "Synch Scope" policy of SYNC_WITH_SERVER. * - * This kind of request is one-way request with the SYNC_WITH_SERVER - * policy applied. It is cloned before enqueuing and the "enqueuing" + * This kind of request is one-way request with the SYNC_WITH_SERVER + * policy applied. It is cloned before enqueuing and the "enqueuing" * thread will block until it is signalled by the TP_Task thread that - * will happen just before the request is dispatched or the request + * will happen just before the request is dispatched or the request * is cancelled. */ - class TAO_CSD_TP_Export TP_Collocated_Synch_With_Server_Request + class TAO_CSD_TP_Export TP_Collocated_Synch_With_Server_Request : public TP_Corba_Request { public: @@ -70,15 +70,15 @@ namespace TAO /// *before* the request is dispatched by a worker thread. This is /// different than the TP_Collocated_Synch_Request which waits until /// just *after* the request is dispatched by a worker thread. - /// Returns true if the request has been dispatched, and returns + /// Returns true if the request has been dispatched, and returns /// false if the request has been cancelled. - bool wait(ACE_ENV_SINGLE_ARG_DECL); + bool wait(void); protected: - /// Prepare this TP_Collocated_Synch_With_Server_Request object to be - /// placed into the request queue. This will cause the underlying + /// Prepare this TP_Collocated_Synch_With_Server_Request object to be + /// placed into the request queue. This will cause the underlying /// TAO_ServerRequest object to be cloned. virtual void prepare_for_queue_i(); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl index 1ff0407d6fd..0a28b4cba66 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl @@ -24,7 +24,7 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::TP_Collocated_Synch_With_Serv ACE_INLINE bool -TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(void) { return this->synch_helper_.wait_while_pending(); } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h index 2e0a6c7996f..bcf4b289d33 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h @@ -68,7 +68,7 @@ namespace TAO void do_clone(); /// Delegate to the FW_Server_Request_Wrapper dispatch() method. - void do_dispatch(ACE_ENV_SINGLE_ARG_DECL); + void do_dispatch(void); /// Delegate to the FW_Server_Request_Wrapper cancel() method. void do_cancel(); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl index 18d273c34a5..4334a281140 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl @@ -29,10 +29,9 @@ TAO::CSD::TP_Corba_Request::do_clone() ACE_INLINE void -TAO::CSD::TP_Corba_Request::do_dispatch(ACE_ENV_SINGLE_ARG_DECL) +TAO::CSD::TP_Corba_Request::do_dispatch(void) { - this->server_request_.dispatch(this->servant() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->server_request_.dispatch(this->servant()); } ACE_INLINE diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp index 6765f02eff6..56637eeb6ac 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp @@ -20,27 +20,22 @@ TAO::CSD::TP_Custom_Asynch_Request::~TP_Custom_Asynch_Request() void TAO::CSD::TP_Custom_Asynch_Request::dispatch_i() { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->execute_op(); - ACE_TRY_CHECK; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or // doing anything with it. } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or // doing anything with it. } -#endif - ACE_ENDTRY; } void diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl index 6a05c5df7ee..52bca678d8c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl @@ -9,19 +9,17 @@ TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation (PortableServer::Servant servant) : servant_ (servant) { - // This try-catch block is not really necessary for current implementation - // since the _add_ref does not throw exception, but we have to add it to - // satisfy the non-exception builds. If _add_ref really throws an exception + // This try-catch block is not really necessary for current implementation + // since the _add_ref does not throw exception, but we have to add it to + // satisfy the non-exception builds. If _add_ref really throws an exception // then this constructor needs deal with the exception. - ACE_TRY_NEW_ENV + try { - this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->servant_->_add_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp index 45529af5802..44d405d7fc3 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp @@ -27,27 +27,22 @@ TAO::CSD::TP_Remote_Request::prepare_for_queue_i() void TAO::CSD::TP_Remote_Request::dispatch_i() { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->do_dispatch(); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or // doing anything with it. } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or // doing anything with it. } -#endif - ACE_ENDTRY; } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl index 341a449091e..0d7335ae9a0 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl @@ -12,19 +12,17 @@ TAO::CSD::TP_Request::TP_Request(PortableServer::Servant servant, servant_ (servant), servant_state_(servant_state, false) { - // This try-catch block is not really necessary for current implementation - // since the _add_ref does not throw exception, but we have to add it to - // satisfy the non-exception builds. If _add_ref really throws an exception + // This try-catch block is not really necessary for current implementation + // since the _add_ref does not throw exception, but we have to add it to + // satisfy the non-exception builds. If _add_ref really throws an exception // then this constructor needs deal with the exception. - ACE_TRY_NEW_ENV + try { - this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->servant_->_add_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -84,7 +82,7 @@ TAO::CSD::TP_Request::mark_as_ready() ACE_INLINE -bool +bool TAO::CSD::TP_Request::is_target(PortableServer::Servant servant) { // Compare pointers. Return true only if these are the exact same object. @@ -97,7 +95,7 @@ void TAO::CSD::TP_Request::dispatch() { this->dispatch_i(); - + } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h index e6726098b72..ccbec859ea4 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h @@ -56,15 +56,15 @@ namespace TAO /// Accessor for the servant busy flag. TP_Servant_State* find(PortableServer::Servant servant - ACE_ENV_ARG_DECL); + ); /// Insert the servant to map. void insert(PortableServer::Servant servant - ACE_ENV_ARG_DECL); + ); /// Remove the servant from map. void remove(PortableServer::Servant servant - ACE_ENV_ARG_DECL); + ); private: diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl index 1faeb7ad536..ca2810ee2ba 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl @@ -19,7 +19,7 @@ TAO::CSD::TP_Servant_State_Map::~TP_Servant_State_Map() ACE_INLINE TAO::CSD::TP_Servant_State* TAO::CSD::TP_Servant_State_Map::find(PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { void* key = servant; @@ -37,7 +37,7 @@ TAO::CSD::TP_Servant_State_Map::find(PortableServer::Servant servant ACE_INLINE void TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { void* key = servant; @@ -47,9 +47,9 @@ TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant if (result == 1) { - ACE_THROW (PortableServer::POA::ServantAlreadyActive ()); + throw (PortableServer::POA::ServantAlreadyActive ()); } - + ACE_ASSERT (result == 0); } @@ -57,13 +57,13 @@ TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant ACE_INLINE void TAO::CSD::TP_Servant_State_Map::remove(PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { void* key = servant; if (this->map_.unbind(key) == -1) { - ACE_THROW (PortableServer::POA::ServantNotActive ()); + throw (PortableServer::POA::ServantNotActive ()); } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp index 1a9c86ec8da..4ac811786ac 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp @@ -27,12 +27,11 @@ TAO::CSD::TP_Strategy::~TP_Strategy() TAO::CSD::TP_Strategy::CustomRequestOutcome TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op - ACE_ENV_ARG_DECL) + ) { TP_Servant_State::HandleType servant_state = - this->get_servant_state(op->servant() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (REQUEST_REJECTED); + this->get_servant_state(op->servant() + ); TP_Custom_Synch_Request_Handle request = new TP_Custom_Synch_Request(op, servant_state.in()); @@ -50,12 +49,11 @@ TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op TAO::CSD::TP_Strategy::CustomRequestOutcome TAO::CSD::TP_Strategy::custom_asynch_request(TP_Custom_Request_Operation* op - ACE_ENV_ARG_DECL) + ) { TP_Servant_State::HandleType servant_state = - this->get_servant_state(op->servant() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (REQUEST_REJECTED); + this->get_servant_state(op->servant() + ); TP_Custom_Asynch_Request_Handle request = new TP_Custom_Asynch_Request(op, servant_state.in()); @@ -92,12 +90,11 @@ TAO::CSD::TP_Strategy::dispatch_remote_request_i PortableServer::POA_ptr poa, const char* operation, PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { TP_Servant_State::HandleType servant_state = this->get_servant_state(servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DISPATCH_REJECTED); + ); // Now we can create the TP_Remote_Request object, and then add it to our // task_'s "request queue". @@ -133,12 +130,11 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i PortableServer::POA_ptr poa, const char* operation, PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { TP_Servant_State::HandleType servant_state = this->get_servant_state(servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DISPATCH_REJECTED); + ); bool is_sync_with_server = server_request.sync_with_server(); bool is_synchronous = server_request.response_expected(); @@ -146,7 +142,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i TP_Collocated_Synch_Request_Handle synch_request; TP_Collocated_Synch_With_Server_Request_Handle synch_with_server_request; TP_Request_Handle request; - + // Create the request object using the appropriate concrete type. if (is_sync_with_server) { @@ -177,7 +173,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i request = synch_request.in(); } else - { + { // Just use the (base) request handle to hold the request object. request = new TP_Collocated_Asynch_Request(server_request, object_id, @@ -201,8 +197,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i // synchronous request. if (!synch_request.is_nil()) { - int srw = synch_request->wait(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DISPATCH_REJECTED); + int srw = synch_request->wait(); if (srw == false) { // Raise exception when request was cancelled. @@ -211,8 +206,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i } else if (!synch_with_server_request.is_nil()) { - bool swsr = synch_with_server_request->wait(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DISPATCH_REJECTED); + bool swsr = synch_with_server_request->wait(); if (swsr == false) { // Raise exception when request was cancelled. @@ -224,64 +218,60 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i } -void +void TAO::CSD::TP_Strategy::servant_activated_event_i - (PortableServer::Servant servant, + (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) + ) { ACE_UNUSED_ARG(oid); if (this->serialize_servants_) { // Add the servant to the servant state map. - this->servant_state_map_.insert(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->servant_state_map_.insert(servant); } } -void +void TAO::CSD::TP_Strategy::servant_deactivated_event_i - (PortableServer::Servant servant, + (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) + ) { ACE_UNUSED_ARG(oid); // Cancel all requests stuck in the queue for the specified servant. - this->task_.cancel_servant(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->task_.cancel_servant(servant); if (this->serialize_servants_) { // Remove the servant from the servant state map. - this->servant_state_map_.remove(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->servant_state_map_.remove(servant); } } -void +void TAO::CSD::TP_Strategy::cancel_requests(PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { // Cancel all requests stuck in the queue for the specified servant. - this->task_.cancel_servant(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->task_.cancel_servant(servant); } TAO::CSD::TP_Servant_State::HandleType TAO::CSD::TP_Strategy::get_servant_state(PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { TP_Servant_State::HandleType servant_state; if (this->serialize_servants_) { servant_state = this->servant_state_map_.find(servant - ACE_ENV_ARG_PARAMETER); + ); } return servant_state; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h index 2e069caeb6d..0b927f9d0cd 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h @@ -91,7 +91,7 @@ namespace TAO /// Will return REQUEST_EXECUTED, REQUEST_CANCELLED, or REQUEST_REJECTED. CustomRequestOutcome custom_synch_request (TP_Custom_Request_Operation* op - ACE_ENV_ARG_DECL); + ); /// Inject an asynchronous, custom request into the request queue. /// This will return control to the calling thread once the request @@ -99,12 +99,12 @@ namespace TAO /// Will return REQUEST_DISPATCHED or REQUEST_REJECTED. CustomRequestOutcome custom_asynch_request (TP_Custom_Request_Operation* op - ACE_ENV_ARG_DECL); + ); /// Cancel all requests that are targeted for the provided servant. /// This is requested on the user application level. void cancel_requests(PortableServer::Servant servant - ACE_ENV_ARG_DECL); + ); protected: @@ -119,7 +119,7 @@ namespace TAO PortableServer::POA_ptr poa, const char* operation, PortableServer::Servant servant - ACE_ENV_ARG_DECL); + ); /// Handle the dispatching of a collocated request. /// @@ -132,7 +132,7 @@ namespace TAO PortableServer::POA_ptr poa, const char* operation, PortableServer::Servant servant - ACE_ENV_ARG_DECL); + ); /// Event - The POA has been activated. /// This will activate the worker thread(s). @@ -148,13 +148,13 @@ namespace TAO virtual void servant_activated_event_i (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); /// Event - A servant has been deactivated virtual void servant_deactivated_event_i (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); private: @@ -175,7 +175,7 @@ namespace TAO */ TP_Servant_State::HandleType get_servant_state (PortableServer::Servant servant - ACE_ENV_ARG_DECL); + ); /// This is the active object used by the worker threads. diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp index a196ea9583d..b38514d6ce7 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp @@ -136,14 +136,14 @@ TAO::CSD::TP_Task::svc() // execution of this svc() method. { GuardType guard(this->lock_); - // Put the thread id into a collection which is used to check whether + // Put the thread id into a collection which is used to check whether // the orb shutdown is called by one of the threads in the pool. ACE_thread_t thr_id = ACE_OS::thr_self (); if (this->activated_threads_.set(thr_id, this->num_threads_) == -1) { ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("(%P|%t)TP_Task::svc: number of threads is out of range \n")), - 0); + 0); } ++this->num_threads_; this->active_workers_.signal(); @@ -268,10 +268,10 @@ TAO::CSD::TP_Task::close(u_long flag) ACE_thread_t my_thr_id = ACE_OS::thr_self (); - // Check whether the calling thread(calling orb shutdown) is one of the + // Check whether the calling thread(calling orb shutdown) is one of the // threads in the pool. If it is then it should not wait itself. size_t size = this->activated_threads_.size (); - + for (size_t i = 0; i < size; i ++) { ACE_thread_t thr_id = 0; @@ -300,7 +300,7 @@ TAO::CSD::TP_Task::close(u_long flag) void TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { GuardType guard(this->lock_); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h index 65839aeb3b7..e1d85cedf01 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h @@ -102,7 +102,7 @@ namespace TAO /// Cancel all requests that are targeted for the provided servant. void cancel_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL); + ); private: @@ -145,9 +145,9 @@ namespace TAO TP_Queue queue_; typedef ACE_Array <ACE_thread_t> Thread_Ids; - + /// The list of ids for the threads launched by this task. - Thread_Ids activated_threads_; + Thread_Ids activated_threads_; }; } diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h index 45edce1884e..c3b86edf0a2 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter.h @@ -78,35 +78,35 @@ namespace TAO /// This method implements one of the "starting" client side /// interception points. virtual void send_request (Invocation_Base &invocation - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// This method implements one of the "ending" client side /// interception point. virtual void receive_reply (Invocation_Base &invocation - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// This method implements one of the "ending" client side /// interception point. virtual void receive_exception (Invocation_Base &invocation - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// This method implements one of the "ending" client side /// interception point. virtual void receive_other (Invocation_Base &invocation - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Register an interceptor. virtual void add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Register an interceptor with policies. virtual void add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) = 0; + ) = 0; - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void destroy_interceptors (void) = 0; /// Convert TAO Invocation status to a PI status virtual PortableInterceptor::ReplyStatus reply_status ( diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp index f9db6518360..f5752180e27 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp @@ -44,13 +44,12 @@ TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void) CORBA::OctetSeq * TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::InvalidTypeForEncoding)) { this->check_type_for_encoding (data - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // ---------------------------------------------------------------- @@ -84,7 +83,6 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); CORBA::OctetSeq_var safe_octet_seq = octet_seq; @@ -108,7 +106,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data CORBA::Any * TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::FormatMismatch)) { @@ -159,7 +157,6 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_any = any; @@ -173,13 +170,12 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data CORBA::OctetSeq * TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::InvalidTypeForEncoding)) { this->check_type_for_encoding (data - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // ---------------------------------------------------------------- TAO_OutputCDR cdr ((size_t) 0, // size @@ -216,8 +212,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data TAO_Marshal_Object::perform_append (data._tao_get_typecode (), &for_reading, &cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } else { @@ -237,7 +232,6 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data ), CORBA::COMPLETED_NO )); - ACE_CHECK_RETURN (0); CORBA::OctetSeq_var safe_octet_seq = octet_seq; @@ -265,7 +259,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data CORBA::Any * TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::FormatMismatch, IOP::Codec::TypeMismatch)) @@ -333,7 +327,6 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, ), CORBA::COMPLETED_NO )); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_any = any; @@ -353,7 +346,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, void TAO_CDR_Encaps_Codec::check_type_for_encoding ( const CORBA::Any & data - ACE_ENV_ARG_DECL + ) { // @@ TODO: Are there any other conditions we need to check? @@ -361,8 +354,8 @@ TAO_CDR_Encaps_Codec::check_type_for_encoding ( CORBA::TypeCode_var typecode = data.type (); if (this->major_ == 1 && this->minor_ == 0 - && typecode->equivalent (CORBA::_tc_wstring ACE_ENV_ARG_PARAMETER)) - ACE_THROW (IOP::Codec::InvalidTypeForEncoding ()); + && typecode->equivalent (CORBA::_tc_wstring)) + throw (IOP::Codec::InvalidTypeForEncoding ()); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h index 37672c1e4de..5d051df1f75 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h @@ -59,21 +59,21 @@ public: /// Encode the given data, including the TypeCode, into an octet /// sequence. virtual CORBA::OctetSeq * encode (const CORBA::Any & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::InvalidTypeForEncoding)); /// Extract the TypeCode and the value from the octet sequence and /// place them into an Any. virtual CORBA::Any * decode (const CORBA::OctetSeq & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::FormatMismatch)); /// Encode the given data, excluding the TypeCode, into an octet /// sequence. virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::InvalidTypeForEncoding)); @@ -81,7 +81,7 @@ public: /// TypeCode, and place it into an Any. virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::FormatMismatch, IOP::Codec::TypeMismatch)); @@ -103,7 +103,7 @@ protected: * Codec. */ void check_type_for_encoding (const CORBA::Any & data - ACE_ENV_ARG_DECL); + ); private: diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp index f532539a4fd..454a4e11df0 100644 --- a/TAO/tao/CodecFactory/CodecFactory.cpp +++ b/TAO/tao/CodecFactory/CodecFactory.cpp @@ -25,7 +25,7 @@ TAO_CodecFactory_Loader::create_object ( CORBA::ORB_ptr orb, int, ACE_TCHAR *[] - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = CORBA::Object::_nil (); diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 230914bbbac..2c49a66f1ea 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -39,7 +39,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to force the initialization of the ORB code. diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp index 2b1462c9693..f771c9f2d2c 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp +++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp @@ -23,7 +23,7 @@ TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core) IOP::Codec_ptr TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding, IOP::CodecFactory::UnsupportedCodeset)) @@ -71,12 +71,12 @@ TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc enc.format, char_trans, wchar_trans - ACE_ENV_ARG_PARAMETER); + ); } IOP::Codec_ptr TAO_CodecFactory::create_codec (const IOP::Encoding & enc - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)) { @@ -85,7 +85,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc enc.format, 0, 0 - ACE_ENV_ARG_PARAMETER); + ); } IOP::Codec_ptr @@ -94,7 +94,7 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major, IOP::EncodingFormat encoding_format, TAO_Codeset_Translator_Base * char_trans, TAO_Codeset_Translator_Base * wchar_trans - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)) { @@ -136,7 +136,6 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major, 0, ENOMEM), CORBA::COMPLETED_MAYBE)); - ACE_CHECK_RETURN (IOP::Codec::_nil ()); break; default: diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h index ba0859f667b..1aa638deb0f 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.h +++ b/TAO/tao/CodecFactory/CodecFactory_impl.h @@ -53,13 +53,13 @@ public: /// Create a Coder/Decoder for the given type of encoding. virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)); /// Create a Coder/Decoder for the given type of encoding and codesets. virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding, IOP::CodecFactory::UnsupportedCodeset)); @@ -75,7 +75,7 @@ private: IOP::EncodingFormat encoding_format, TAO_Codeset_Translator_Base * char_trans, TAO_Codeset_Translator_Base * wchar_trans - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)); private: diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp index 98664b6f60e..01363024a40 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -327,7 +327,6 @@ TAO_Codeset_Manager_i::computeTCS (CONV_FRAME::CodeSetComponent &remote, } else { - ACE_DECLARE_NEW_CORBA_ENV; ACE_THROW_RETURN(CORBA::CODESET_INCOMPATIBLE (), 0); } } diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp index 80b2efca949..a00bbe9afed 100644 --- a/TAO/tao/Collocated_Invocation.cpp +++ b/TAO/tao/Collocated_Invocation.cpp @@ -36,21 +36,20 @@ namespace TAO Invocation_Status Collocated_Invocation::invoke (Collocation_Proxy_Broker *cpb, Collocation_Strategy strat - ACE_ENV_ARG_DECL) + ) { Invocation_Status s = TAO_INVOKE_FAILURE; /// Start the interception point #if TAO_HAS_INTERCEPTORS == 1 s = - this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + this->send_request_interception (); if (s != TAO_INVOKE_SUCCESS) return s; #endif /*TAO_HAS_INTERCEPTORS */ - ACE_TRY + try { if (strat == TAO_CS_THRU_POA_STRATEGY) { @@ -76,8 +75,7 @@ namespace TAO dispatcher->dispatch (orb_core, request, this->forwarded_to_.out () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { @@ -88,8 +86,7 @@ namespace TAO this->details_.opname (), this->details_.opname_len (), strat - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } // Invocation completed succesfully @@ -103,8 +100,7 @@ namespace TAO this->reply_received (TAO_INVOKE_RESTART); s = - this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_other_interception (); } // NOTE: Any other condition that needs handling? else if (this->response_expected ()) @@ -112,14 +108,13 @@ namespace TAO this->reply_received (TAO_INVOKE_SUCCESS); s = - this->receive_reply_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_reply_interception (); } if (s != TAO_INVOKE_SUCCESS) return s; #endif /*TAO_HAS_INTERCEPTORS */ } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // Ignore exceptions for oneways if (this->response_expected_ == false) @@ -127,39 +122,16 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ReplyStatus const status = - this->handle_any_exception (&ACE_ANY_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->handle_any_exception (&ex + ); if (status == PortableInterceptor::LOCATION_FORWARD || status == PortableInterceptor::TRANSPORT_RETRY) s = TAO_INVOKE_RESTART; else #endif /*TAO_HAS_INTERCEPTORS*/ - ACE_RE_THROW; + throw; } -# if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL - { - if (this->response_expected () == false) - return TAO_INVOKE_SUCCESS; -#if TAO_HAS_INTERCEPTORS == 1 - PortableInterceptor::ReplyStatus const st = - this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (st == PortableInterceptor::LOCATION_FORWARD || - st == PortableInterceptor::TRANSPORT_RETRY) - s = TAO_INVOKE_RESTART; - else -#endif /*TAO_HAS_INTERCEPTORS == 1*/ - ACE_RE_THROW; - } -# endif /* ACE_HAS_EXCEPTIONS && - ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */ - ACE_ENDTRY; - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); if (this->forwarded_to_.in () != 0) s = TAO_INVOKE_RESTART; diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h index 02f3cfd7c43..9643b564b47 100644 --- a/TAO/tao/Collocated_Invocation.h +++ b/TAO/tao/Collocated_Invocation.h @@ -85,7 +85,7 @@ namespace TAO */ Invocation_Status invoke (Collocation_Proxy_Broker *cpb, Collocation_Strategy strat - ACE_ENV_ARG_DECL); + ); private: diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h index 6e51a6cabb5..3a058663906 100644 --- a/TAO/tao/Collocation_Proxy_Broker.h +++ b/TAO/tao/Collocation_Proxy_Broker.h @@ -39,7 +39,6 @@ namespace CORBA typedef Object *Object_ptr; typedef TAO_Pseudo_Var_T<Object> Object_var; typedef TAO_Pseudo_Out_T<Object> Object_out; - class Environment; } namespace TAO @@ -57,7 +56,7 @@ namespace TAO virtual ~Collocation_Proxy_Broker (void); virtual Collocation_Strategy get_strategy (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void dispatch (CORBA::Object_ptr obj, CORBA::Object_out forward_obj, @@ -66,7 +65,7 @@ namespace TAO const char * op, size_t op_len, Collocation_Strategy strategy - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h index cf626e2b090..129cfd8f7f1 100644 --- a/TAO/tao/Collocation_Resolver.h +++ b/TAO/tao/Collocation_Resolver.h @@ -32,8 +32,6 @@ namespace CORBA { class Object; typedef Object *Object_ptr; - - class Environment; } /** @@ -54,7 +52,7 @@ public: /// Is @a object collocated? virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object - ACE_ENV_ARG_DECL) const = 0; + ) const = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Compression/Compression.cpp b/TAO/tao/Compression/Compression.cpp index fc25beff65d..b5ead7ee850 100644 --- a/TAO/tao/Compression/Compression.cpp +++ b/TAO/tao/Compression/Compression.cpp @@ -12,8 +12,7 @@ CORBA::Object_ptr TAO_Compression_Loader::create_object ( CORBA::ORB_ptr, int, - ACE_TCHAR *[] - ACE_ENV_ARG_DECL_NOT_USED) + ACE_TCHAR *[]) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = CORBA::Object::_nil (); diff --git a/TAO/tao/Compression/Compression.h b/TAO/tao/Compression/Compression.h index ac579fb9c72..1e6036571aa 100644 --- a/TAO/tao/Compression/Compression.h +++ b/TAO/tao/Compression/Compression.h @@ -41,8 +41,7 @@ public: /// Creates a Compression Manager and returns it. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL) + ACE_TCHAR *argv []) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to force the initialization of the ORB code. diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp index e4052b730d0..c204d67837e 100644 --- a/TAO/tao/Compression/Compression_Manager.cpp +++ b/TAO/tao/Compression/Compression_Manager.cpp @@ -15,8 +15,7 @@ void CompressionManager::register_factory ( ::Compression::CompressorFactory_ptr compressor_factory) ACE_THROW_SPEC (( ::CORBA::SystemException, - ::Compression::FactoryAlreadyRegistered - )) + ::Compression::FactoryAlreadyRegistered)) { if (!::CORBA::is_nil (compressor_factory)) { @@ -31,7 +30,7 @@ void CompressionManager::register_factory ( if (compressor_factory->compressor_id () == current) { - ACE_THROW (::Compression::FactoryAlreadyRegistered ()); + throw (::Compression::FactoryAlreadyRegistered ()); } } factories_.length (length + 1); @@ -40,7 +39,7 @@ void CompressionManager::register_factory ( else { // @todo Standardize this minor code - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 44, + throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 44, CORBA::COMPLETED_YES)); } } @@ -74,7 +73,7 @@ CompressionManager::unregister_factory ( } // todo exception - ACE_THROW (::Compression::UnknownCompressorId ()); + throw (::Compression::UnknownCompressorId ()); } ::Compression::CompressorFactory_ptr @@ -92,8 +91,7 @@ CompressionManager::get_factory ( for (CORBA::ULong i = 0; i < length; ++i) { ::Compression::CompressorId const current = - this->factories_[i]->compressor_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->factories_[i]->compressor_id (); if (current != compressor_id) { @@ -103,7 +101,7 @@ CompressionManager::get_factory ( return ::Compression::CompressorFactory::_duplicate (this->factories_[i]); } - ACE_THROW (::Compression::UnknownCompressorId ()); + throw (::Compression::UnknownCompressorId ()); ACE_NOTREACHED (return ::Compression::CompressorFactory::_nil ()); } diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h index 67ef3c1c596..fa81e71d0dd 100644 --- a/TAO/tao/Compression/Compressor_Factory.h +++ b/TAO/tao/Compression/Compressor_Factory.h @@ -37,9 +37,7 @@ namespace TAO CompressorFactory (::Compression::CompressorId compressor_id); virtual ::Compression::CompressorId compressor_id (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ACE_THROW_SPEC (( ::CORBA::SystemException)); virtual ::CORBA::ULongLong compressed_bytes (void) ACE_THROW_SPEC (( diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.cpp b/TAO/tao/Compression/zlib/ZlibCompressor.cpp index 4af3ab9ed72..9a095c8d58c 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor.cpp +++ b/TAO/tao/Compression/zlib/ZlibCompressor.cpp @@ -38,7 +38,7 @@ ZlibCompressor::compress ( if (retval != Z_OK) { - ACE_THROW (::Compression::CompressionException ()); + throw (::Compression::CompressionException ()); } else { @@ -63,7 +63,7 @@ ZlibCompressor::decompress ( if (retval != Z_OK) { - ACE_THROW (::Compression::CompressionException ()); + throw (::Compression::CompressionException ()); } else { diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 1de294f0b1f..835f64d9264 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -121,7 +121,7 @@ TAO_Connector_Registry::close_all (void) int TAO_Connector_Registry::make_mprofile (const char *ior, TAO_MProfile &mprofile - ACE_ENV_ARG_DECL) + ) { if (!ior) // Failure: Null IOR string pointer @@ -144,8 +144,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior, const int mp_result = (*connector)->make_mprofile (ior, mprofile - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (mp_result); + ); if (mp_result == 0) return 0; // Success diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 05b4e9cd89a..cc333df6749 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -35,11 +35,6 @@ class TAO_MProfile; class TAO_Profile; class TAO_InputCDR; -namespace CORBA -{ - class Environment; -} - typedef TAO_Connector** TAO_ConnectorSetIterator; /** @@ -77,7 +72,7 @@ public: /// MProfile. int make_mprofile (const char *ior, TAO_MProfile &mprofile - ACE_ENV_ARG_DECL); + ); /// Create a profile based on the contents of @a cdr TAO_Profile* create_profile (TAO_InputCDR& cdr); diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index cbd0cd1d0f2..66d2564c879 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -3,7 +3,6 @@ #include "tao/DLL_Parser.h" #include "tao/Object_Loader.h" #include "tao/Object.h" -#include "tao/Environment.h" #include "tao/ORB_Constants.h" #include "tao/SystemException.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp index 78ccc5c4b5c..ec5a993d8d7 100644 --- a/TAO/tao/Default_Collocation_Resolver.cpp +++ b/TAO/tao/Default_Collocation_Resolver.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { return object->_is_collocated (); } diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h index c98aefae6d5..31394883da1 100644 --- a/TAO/tao/Default_Collocation_Resolver.h +++ b/TAO/tao/Default_Collocation_Resolver.h @@ -24,10 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace CORBA -{ - class Environment; -} /** * @class TAO_Default_Collocation_Resolver * @@ -44,7 +40,7 @@ public: /// Is @a object collocated? virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object - ACE_ENV_ARG_DECL) const; + ) const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp index 64fb8f94608..031eec86c95 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp @@ -26,7 +26,7 @@ TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (v TAO_Invocation_Endpoint_Selector * -TAO_Default_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Default_Endpoint_Selector_Factory::get_selector (void) { // Trivial endpoint selector. Just return the default selector. return this->default_endpoint_selector_; diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h index b521cab81dd..ac5f7c46e83 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.h +++ b/TAO/tao/Default_Endpoint_Selector_Factory.h @@ -62,7 +62,7 @@ public: /// Get an Invocation's endpoint selection strategy and /// initialize the endpoint selection state instance. virtual TAO_Invocation_Endpoint_Selector *get_selector ( - ACE_ENV_SINGLE_ARG_DECL); + void); private: diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp index a06a1307aba..53fcb61f6ce 100644 --- a/TAO/tao/Default_Protocols_Hooks.cpp +++ b/TAO/tao/Default_Protocols_Hooks.cpp @@ -15,7 +15,7 @@ TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void) void TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core * - ACE_ENV_ARG_DECL_NOT_USED) + ) { } @@ -23,7 +23,7 @@ void TAO_Default_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &, CORBA::Policy *, CORBA::Short & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } @@ -39,20 +39,18 @@ TAO_Default_Protocols_Hooks::get_selector_bands_policy_hook (CORBA::Policy *, CORBA::Short, CORBA::Short &, CORBA::Short &, - int &) + bool &) { } int -TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short & - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &) { return 0; } int -TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short & - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &) { return 0; } @@ -60,21 +58,19 @@ TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short & int TAO_Default_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &, CORBA::Short & - ACE_ENV_ARG_DECL_NOT_USED) + ) { return 0; } int -TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short) { return 0; } int -TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short) { return 0; } @@ -83,14 +79,13 @@ void TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *, TAO_Service_Context &, CORBA::Boolean - ACE_ENV_ARG_DECL_NOT_USED) + ) { } CORBA::Boolean TAO_Default_Protocols_Hooks::set_client_network_priority (IOP::ProfileId, - TAO_Stub * - ACE_ENV_ARG_DECL_NOT_USED) + TAO_Stub *) { return false; } @@ -98,68 +93,68 @@ TAO_Default_Protocols_Hooks::set_client_network_priority (IOP::ProfileId, CORBA::Boolean TAO_Default_Protocols_Hooks::set_server_network_priority (IOP::ProfileId, CORBA::Policy * - ACE_ENV_ARG_DECL_NOT_USED) + ) { return false; } void TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } void TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } void TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } void TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } void TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } void TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } void TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } void TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } void TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } void TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h index 540ed7b70fb..4b84cedd7a1 100644 --- a/TAO/tao/Default_Protocols_Hooks.h +++ b/TAO/tao/Default_Protocols_Hooks.h @@ -34,57 +34,57 @@ public: virtual ~TAO_Default_Protocols_Hooks (void); void init_hooks (TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL); + ); CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag, TAO_Stub *stub - ACE_ENV_ARG_DECL); + ); CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag, CORBA::Policy *policy - ACE_ENV_ARG_DECL); + ); void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); CORBA::Long get_dscp_codepoint (void); void rt_service_context (TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean restart - ACE_ENV_ARG_DECL); + ); void add_rt_service_context_hook (TAO_Service_Context &service_context, CORBA::Policy *model_policy, CORBA::Short &client_priority - ACE_ENV_ARG_DECL); + ); void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean @@ -95,23 +95,23 @@ public: CORBA::Short p, CORBA::Short &min_priority, CORBA::Short &max_priority, - int &in_range); + bool &in_range); int get_thread_CORBA_priority (CORBA::Short & - ACE_ENV_ARG_DECL); + ); int get_thread_native_priority (CORBA::Short & - ACE_ENV_ARG_DECL); + ); int get_thread_CORBA_and_native_priority (CORBA::Short &, CORBA::Short & - ACE_ENV_ARG_DECL); + ); int set_thread_CORBA_priority (CORBA::Short - ACE_ENV_ARG_DECL); + ); int set_thread_native_priority (CORBA::Short - ACE_ENV_ARG_DECL); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index 180a81b60e4..66d4ecf653f 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -22,7 +22,7 @@ TAO_Stub * TAO_Default_Stub_Factory::create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL) + ) { TAO_Stub *retval = 0; @@ -30,7 +30,6 @@ TAO_Default_Stub_Factory::create_stub (const char *repository_id, TAO_Stub (repository_id, profiles, orb_core), CORBA::NO_MEMORY (0, CORBA::COMPLETED_MAYBE)); - ACE_CHECK_RETURN (retval); return retval; } diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h index e0a4c60c5ec..710f5c41c8b 100644 --- a/TAO/tao/Default_Stub_Factory.h +++ b/TAO/tao/Default_Stub_Factory.h @@ -51,7 +51,7 @@ public: virtual TAO_Stub *create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL); + ); }; diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp index 4c6f322ec02..f3e03b9f15f 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp @@ -3,7 +3,6 @@ #include "tao/Default_Thread_Lane_Resources_Manager.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Exception.h" -#include "tao/Environment.h" #include "tao/ORB_Core.h" #include "ace/Log_Msg.h" @@ -28,7 +27,7 @@ TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Ma } int -TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL) +TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (void) { TAO_ORB_Parameters * const params = this->orb_core_->orb_params (); @@ -43,8 +42,7 @@ TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGL int const result = this->lane_resources_->open_acceptor_registry (endpoint_set, ignore_address - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); return result; } diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h index 89f94829417..cbeb44fd9df 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h @@ -48,7 +48,7 @@ public: void finalize (void); /// Open default resources. - int open_default_resources (ACE_ENV_SINGLE_ARG_DECL); + int open_default_resources (void); /// Shutdown reactor. void shutdown_reactor (void); diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index cb4c792f819..b27461c2904 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -301,13 +301,12 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Stra TAO::Collocation_Strategy POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::get_strategy ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Collocation_Strategy strategy = - TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY); + TAO_ORB_Core::collocation_strategy (obj); return strategy; } @@ -321,7 +320,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch ( const char * op, size_t op_len, TAO::Collocation_Strategy strategy - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::Exception)) { @@ -334,7 +333,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch ( op, op_len, strategy - ACE_ENV_ARG_PARAMETER); + ); } // @@ -383,7 +382,7 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -394,9 +393,8 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy ( (servant) ->get_domain_policy ( ((TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val *) args[1])->arg () - ACE_ENV_ARG_PARAMETER + ); - ACE_CHECK; } @@ -443,7 +441,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< CORBA::Policy> ( @@ -460,7 +458,7 @@ namespace POA_CORBA retval = this->servant_->get_domain_policy ( arg_1 - ACE_ENV_ARG_PARAMETER); + ); } @@ -480,7 +478,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -519,8 +517,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -548,7 +545,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -565,7 +562,7 @@ namespace POA_CORBA retval = this->servant_-> _is_a ( arg_1 - ACE_ENV_ARG_PARAMETER); + ); } @@ -580,7 +577,7 @@ void POA_CORBA::DomainManager::_is_a_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -619,8 +616,7 @@ void POA_CORBA::DomainManager::_is_a_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -645,7 +641,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -655,7 +651,7 @@ namespace POA_CORBA retval = this->servant_-> _non_existent ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); } @@ -670,7 +666,7 @@ void POA_CORBA::DomainManager::_non_existent_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -707,8 +703,7 @@ void POA_CORBA::DomainManager::_non_existent_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -723,7 +718,7 @@ void POA_CORBA::DomainManager::_interface_skel ( TAO_ServerRequest & server_request, void * /* servant_upcall */, void * servant - ACE_ENV_ARG_DECL + ) { TAO_IFR_Client_Adapter *_tao_adapter = @@ -733,15 +728,14 @@ void POA_CORBA::DomainManager::_interface_skel ( if (_tao_adapter == 0) { - ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, + throw ( ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); } POA_CORBA::DomainManager * const impl = static_cast<POA_CORBA::DomainManager *> (servant); CORBA::InterfaceDef_ptr _tao_retval = - impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + impl->_get_interface (); server_request.init_reply (); TAO_OutputCDR &_tao_out = *server_request.outgoing (); @@ -756,7 +750,7 @@ void POA_CORBA::DomainManager::_interface_skel ( if (_tao_result == 0) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } @@ -781,7 +775,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( @@ -791,7 +785,7 @@ namespace POA_CORBA retval = this->servant_-> _get_component ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); } @@ -806,7 +800,7 @@ void POA_CORBA::DomainManager::_component_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -843,14 +837,13 @@ void POA_CORBA::DomainManager::_component_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } CORBA::Boolean POA_CORBA::DomainManager::_is_a ( const char* value - ACE_ENV_ARG_DECL_NOT_USED + ) { return @@ -877,23 +870,22 @@ const char* POA_CORBA::DomainManager::_interface_repository_id (void) const void POA_CORBA::DomainManager::_dispatch ( TAO_ServerRequest & req, void * servant_upcall - ACE_ENV_ARG_DECL + ) { this->synchronous_upcall_dispatch (req, servant_upcall, this - ACE_ENV_ARG_PARAMETER); + ); } // TAO_IDL - Generated from // be\be_visitor_interface/interface_ss.cpp:891 CORBA::DomainManager * -POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::DomainManager::_this (void) { - TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_Stub *stub = this->_create_stub (); TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); @@ -1062,13 +1054,12 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionP TAO::Collocation_Strategy POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::get_strategy ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Collocation_Strategy strategy = - TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY); + TAO_ORB_Core::collocation_strategy (obj); return strategy; } @@ -1082,7 +1073,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch ( const char * op, size_t op_len, TAO::Collocation_Strategy strategy - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::Exception)) { @@ -1095,7 +1086,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch ( op, op_len, strategy - ACE_ENV_ARG_PARAMETER); + ); } // @@ -1144,7 +1135,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1155,9 +1146,8 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager ( ->make_domain_manager ( ((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[1])->arg (), ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg () - ACE_ENV_ARG_PARAMETER + ); - ACE_CHECK; } @@ -1205,7 +1195,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_1 = TAO::Portable_Server::get_in_arg< CORBA::InterfaceDef> ( @@ -1222,7 +1212,7 @@ namespace POA_CORBA this->servant_->make_domain_manager ( arg_1 , arg_2 - ACE_ENV_ARG_PARAMETER); + ); } @@ -1242,7 +1232,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -1283,8 +1273,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -1312,7 +1301,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -1329,7 +1318,7 @@ namespace POA_CORBA retval = this->servant_-> _is_a ( arg_1 - ACE_ENV_ARG_PARAMETER); + ); } @@ -1344,7 +1333,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -1383,8 +1372,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -1409,7 +1397,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -1419,7 +1407,7 @@ namespace POA_CORBA retval = this->servant_-> _non_existent ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); } @@ -1434,7 +1422,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -1471,8 +1459,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -1487,7 +1474,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel ( TAO_ServerRequest & server_request, void * /* servant_upcall */, void * servant - ACE_ENV_ARG_DECL + ) { TAO_IFR_Client_Adapter *_tao_adapter = @@ -1497,15 +1484,14 @@ void POA_CORBA::ConstructionPolicy::_interface_skel ( if (_tao_adapter == 0) { - ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, + throw ( ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); } POA_CORBA::ConstructionPolicy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant); CORBA::InterfaceDef_ptr _tao_retval = - impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + impl->_get_interface (); server_request.init_reply (); TAO_OutputCDR &_tao_out = *server_request.outgoing (); @@ -1520,7 +1506,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel ( if (_tao_result == 0) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } @@ -1545,7 +1531,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( @@ -1555,7 +1541,7 @@ namespace POA_CORBA retval = this->servant_-> _get_component ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); } @@ -1570,7 +1556,7 @@ void POA_CORBA::ConstructionPolicy::_component_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -1607,14 +1593,13 @@ void POA_CORBA::ConstructionPolicy::_component_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a ( const char* value - ACE_ENV_ARG_DECL_NOT_USED + ) { return @@ -1645,23 +1630,22 @@ const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const void POA_CORBA::ConstructionPolicy::_dispatch ( TAO_ServerRequest & req, void * servant_upcall - ACE_ENV_ARG_DECL + ) { this->synchronous_upcall_dispatch (req, servant_upcall, this - ACE_ENV_ARG_PARAMETER); + ); } // TAO_IDL - Generated from // be\be_visitor_interface/interface_ss.cpp:891 CORBA::ConstructionPolicy * -POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::ConstructionPolicy::_this (void) { - TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_Stub *stub = this->_create_stub (); TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h index 0983a05f4fd..f8810004498 100644 --- a/TAO/tao/Domain/DomainS.h +++ b/TAO/tao/Domain/DomainS.h @@ -68,118 +68,110 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace POA_CORBA { - - + + // TAO_IDL - Generated from // be\be_visitor_interface/interface_sh.cpp:87 - + class DomainManager; typedef DomainManager *DomainManager_ptr; - + class _TAO_DomainManager_Direct_Proxy_Impl; class _TAO_DomainManager_Strategized_Proxy_Broker; - + class TAO_Domain_Export DomainManager : public virtual PortableServer::ServantBase { protected: DomainManager (void); - + public: // Useful for template programming. typedef ::CORBA::DomainManager _stub_type; typedef ::CORBA::DomainManager_ptr _stub_ptr_type; typedef ::CORBA::DomainManager_var _stub_var_type; - + DomainManager (const DomainManager& rhs); virtual ~DomainManager (void); - + virtual CORBA::Boolean _is_a ( const char* logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static void _is_a_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL ); - + static void _non_existent_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL ); - + static void _interface_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL ); - + static void _component_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL ); - + virtual void _dispatch ( TAO_ServerRequest & req, void * servant_upcall - ACE_ENV_ARG_DECL ); - + ::CORBA::DomainManager *_this ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); - + virtual const char* _interface_repository_id (void) const; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 - + virtual ::CORBA::Policy_ptr get_domain_policy ( ::CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void get_domain_policy_skel ( TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL ); }; - + /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration + // Strategized Proxy Broker Declaration // - + // TAO_IDL - Generated from // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36 - + class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual TAO::Collocation_Proxy_Broker { - public: + public: _TAO_DomainManager_Strategized_Proxy_Broker (void); - + virtual ~_TAO_DomainManager_Strategized_Proxy_Broker (void); - + TAO::Collocation_Strategy get_strategy ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + void dispatch ( CORBA::Object_ptr obj, @@ -189,196 +181,195 @@ namespace POA_CORBA const char * op, size_t op_len, TAO::Collocation_Strategy strategy - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::Exception)); - + static _TAO_DomainManager_Strategized_Proxy_Broker * the_TAO_DomainManager_Strategized_Proxy_Broker (void); }; - + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - - - // TAO_IDL - Generated from + + + + // TAO_IDL - Generated from // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31 - + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // - + class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl { public: _TAO_DomainManager_Direct_Proxy_Impl (void); - + virtual ~_TAO_DomainManager_Direct_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void get_domain_policy ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException )); }; - + // // Direct Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - - + + + // TAO_IDL - Generated from // be\be_visitor_interface/interface_sh.cpp:87 - + class ConstructionPolicy; typedef ConstructionPolicy *ConstructionPolicy_ptr; - + class _TAO_ConstructionPolicy_Direct_Proxy_Impl; class _TAO_ConstructionPolicy_Strategized_Proxy_Broker; - + class TAO_Domain_Export ConstructionPolicy : public virtual POA_CORBA::Policy { protected: ConstructionPolicy (void); - + public: // Useful for template programming. typedef ::CORBA::ConstructionPolicy _stub_type; typedef ::CORBA::ConstructionPolicy_ptr _stub_ptr_type; typedef ::CORBA::ConstructionPolicy_var _stub_var_type; - + ConstructionPolicy (const ConstructionPolicy& rhs); virtual ~ConstructionPolicy (void); - + virtual CORBA::Boolean _is_a ( const char* logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); - + static void _is_a_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); - + static void _non_existent_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); - + static void _interface_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); - + static void _component_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); - + virtual void _dispatch ( TAO_ServerRequest & req, void * servant_upcall - ACE_ENV_ARG_DECL + ); - + ::CORBA::ConstructionPolicy *_this ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); - + virtual const char* _interface_repository_id (void) const; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 - + virtual void make_domain_manager ( ::CORBA::InterfaceDef_ptr object_type, ::CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void make_domain_manager_skel ( TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); - + static void _get_policy_type_skel ( TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); - + // TAO_IDL - Generated from // be\be_interface.cpp:1859 - + static void copy_skel ( - TAO_ServerRequest & server_request, + TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); - + // TAO_IDL - Generated from // be\be_interface.cpp:1859 - + static void destroy_skel ( - TAO_ServerRequest & server_request, + TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); }; - + /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration + // Strategized Proxy Broker Declaration // - + // TAO_IDL - Generated from // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36 - + class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual TAO::Collocation_Proxy_Broker { - public: + public: _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); - + virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); - + TAO::Collocation_Strategy get_strategy ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + void dispatch ( CORBA::Object_ptr obj, @@ -388,99 +379,99 @@ namespace POA_CORBA const char * op, size_t op_len, TAO::Collocation_Strategy strategy - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::Exception)); - + static _TAO_ConstructionPolicy_Strategized_Proxy_Broker * the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); }; - + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - - - // TAO_IDL - Generated from + + + + // TAO_IDL - Generated from // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31 - + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // - + class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl : public virtual ::POA_CORBA::_TAO_Policy_Direct_Proxy_Impl { public: _TAO_ConstructionPolicy_Direct_Proxy_Impl (void); - + virtual ~_TAO_ConstructionPolicy_Direct_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void make_domain_manager ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException ));static void _get_policy_type ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_interface.cpp:2050 - + static void copy ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_interface.cpp:2050 - + static void destroy ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); }; - + // // Direct Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - + + // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:80 } // module CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_codegen.cpp:995 TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl index 5e1b77f1084..ac024975dee 100644 --- a/TAO/tao/Domain/DomainS.inl +++ b/TAO/tao/Domain/DomainS.inl @@ -33,7 +33,7 @@ POA_CORBA::ConstructionPolicy::_get_policy_type_skel ( TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ) { POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant); @@ -41,7 +41,7 @@ POA_CORBA::ConstructionPolicy::_get_policy_type_skel ( server_request, servant_upcall, impl - ACE_ENV_ARG_PARAMETER + ); } @@ -54,7 +54,7 @@ POA_CORBA::ConstructionPolicy::copy_skel ( TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ) { POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant); @@ -62,7 +62,7 @@ POA_CORBA::ConstructionPolicy::copy_skel ( server_request, servant_upcall, impl - ACE_ENV_ARG_PARAMETER + ); } @@ -75,7 +75,7 @@ POA_CORBA::ConstructionPolicy::destroy_skel ( TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ) { POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant); @@ -83,7 +83,7 @@ POA_CORBA::ConstructionPolicy::destroy_skel ( server_request, servant_upcall, impl - ACE_ENV_ARG_PARAMETER + ); } @@ -95,7 +95,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -105,7 +105,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type ( servant, args, num_args - ACE_ENV_ARG_PARAMETER + ); } @@ -118,7 +118,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -128,7 +128,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy ( servant, args, num_args - ACE_ENV_ARG_PARAMETER + ); } @@ -141,7 +141,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -151,7 +151,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy ( servant, args, num_args - ACE_ENV_ARG_PARAMETER + ); } diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h index 253698af938..02cdc148bbf 100644 --- a/TAO/tao/Domain/DomainS_T.h +++ b/TAO/tao/Domain/DomainS_T.h @@ -40,15 +40,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 namespace POA_CORBA { - + // TAO_IDL - Generated from // be\be_visitor_interface/tie_sh.cpp:87 - + // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> class DomainManager_tie : public DomainManager @@ -68,7 +68,7 @@ namespace POA_CORBA // ctor with T*, ownership flag and a POA ~DomainManager_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -80,36 +80,36 @@ namespace POA_CORBA // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); - + // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 - + ::CORBA::Policy_ptr get_domain_policy ( ::CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed DomainManager_tie (const DomainManager_tie &); void operator= (const DomainManager_tie &); }; - + // TAO_IDL - Generated from // be\be_visitor_interface/tie_sh.cpp:87 - + // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> class ConstructionPolicy_tie : public ConstructionPolicy @@ -129,7 +129,7 @@ namespace POA_CORBA // ctor with T*, ownership flag and a POA ~ConstructionPolicy_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -141,66 +141,66 @@ namespace POA_CORBA // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); - + // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 - + CORBA::PolicyType policy_type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 - + ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 - + void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 - + void make_domain_manager ( ::CORBA::InterfaceDef_ptr object_type, ::CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed ConstructionPolicy_tie (const ConstructionPolicy_tie &); void operator= (const ConstructionPolicy_tie &); }; } // module CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_codegen.cpp:1096 TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl index 2287aa6ba7e..937efa3ed1a 100644 --- a/TAO/tao/Domain/DomainS_T.inl +++ b/TAO/tao/Domain/DomainS_T.inl @@ -81,7 +81,7 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj) { delete this->ptr_; } - + this->ptr_ = &obj; this->rel_ = 0; } @@ -93,7 +93,7 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release) { delete this->ptr_; } - + this->ptr_ = obj; this->rel_ = release; } @@ -111,23 +111,23 @@ POA_CORBA::DomainManager_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA::DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::DomainManager_tie<T>::_default_POA (void) { if (!CORBA::is_nil (this->poa_.in ())) { return PortableServer::POA::_duplicate (this->poa_.in ()); } - - return this->DomainManager::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); + + return this->DomainManager::_default_POA (); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_operation/tie_si.cpp:68 template <class T> ACE_INLINE ::CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy ( ::CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -135,7 +135,7 @@ template <class T> ACE_INLINE { return this->ptr_->get_domain_policy ( policy_type - ACE_ENV_ARG_PARAMETER + ); } @@ -192,7 +192,7 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj) { delete this->ptr_; } - + this->ptr_ = &obj; this->rel_ = 0; } @@ -204,7 +204,7 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean relea { delete this->ptr_; } - + this->ptr_ = obj; this->rel_ = release; } @@ -222,72 +222,72 @@ POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (void) { if (!CORBA::is_nil (this->poa_.in ())) { return PortableServer::POA::_duplicate (this->poa_.in ()); } - - return this->ConstructionPolicy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); + + return this->ConstructionPolicy::_default_POA (); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_operation/tie_si.cpp:68 template <class T> ACE_INLINE CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->policy_type ( - ACE_ENV_SINGLE_ARG_PARAMETER + ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_operation/tie_si.cpp:68 template <class T> ACE_INLINE ::CORBA::Policy_ptr POA_CORBA::ConstructionPolicy_tie<T>::copy ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->copy ( - ACE_ENV_SINGLE_ARG_PARAMETER + ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_operation/tie_si.cpp:68 template <class T> ACE_INLINE void POA_CORBA::ConstructionPolicy_tie<T>::destroy ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - ACE_ENV_SINGLE_ARG_PARAMETER + ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_operation/tie_si.cpp:68 template <class T> ACE_INLINE void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager ( ::CORBA::InterfaceDef_ptr object_type, ::CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -296,7 +296,7 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager ( this->ptr_->make_domain_manager ( object_type, constr_policy - ACE_ENV_ARG_PARAMETER + ); } diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index cd48cc1d9f4..c9c216b82fa 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -175,7 +175,7 @@ TAO::Collocation_Proxy_Broker * ::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy ( ::CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -209,8 +209,7 @@ TAO::Collocation_Proxy_Broker * this->the_TAO_DomainManager_Proxy_Broker_ ); - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval.excp ()); + _tao_call.invoke (0, 0); return _tao_retval.retn (); } @@ -245,7 +244,7 @@ CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer) CORBA::DomainManager_ptr CORBA::DomainManager::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL + ) { return @@ -253,14 +252,14 @@ CORBA::DomainManager::_narrow ( _tao_objref, "IDL:omg.org/CORBA/DomainManager:1.0", CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer - ACE_ENV_ARG_PARAMETER + ); } CORBA::DomainManager_ptr CORBA::DomainManager::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL + ) { return @@ -268,7 +267,7 @@ CORBA::DomainManager::_unchecked_narrow ( _tao_objref, "IDL:omg.org/CORBA/DomainManager:1.0", CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer - ACE_ENV_ARG_PARAMETER + ); } @@ -292,7 +291,7 @@ CORBA::DomainManager::_tao_release (DomainManager_ptr obj) CORBA::Boolean CORBA::DomainManager::_is_a ( const char *value - ACE_ENV_ARG_DECL + ) { if ( @@ -312,7 +311,7 @@ CORBA::DomainManager::_is_a ( { return this->::CORBA::Object::_is_a ( value - ACE_ENV_ARG_PARAMETER + ); } } @@ -376,7 +375,7 @@ TAO::Collocation_Proxy_Broker * void CORBA::ConstructionPolicy::make_domain_manager ( ::CORBA::InterfaceDef_ptr object_type, ::CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -412,8 +411,7 @@ void CORBA::ConstructionPolicy::make_domain_manager ( this->the_TAO_ConstructionPolicy_Proxy_Broker_ ); - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + _tao_call.invoke (0, 0); } CORBA::ConstructionPolicy::ConstructionPolicy (void) @@ -448,7 +446,7 @@ CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer) CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL + ) { return @@ -456,14 +454,14 @@ CORBA::ConstructionPolicy::_narrow ( _tao_objref, "IDL:omg.org/CORBA/ConstructionPolicy:1.0", CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer - ACE_ENV_ARG_PARAMETER + ); } CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL + ) { return @@ -471,7 +469,7 @@ CORBA::ConstructionPolicy::_unchecked_narrow ( _tao_objref, "IDL:omg.org/CORBA/ConstructionPolicy:1.0", CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer - ACE_ENV_ARG_PARAMETER + ); } @@ -495,7 +493,7 @@ CORBA::ConstructionPolicy::_tao_release (ConstructionPolicy_ptr obj) CORBA::Boolean CORBA::ConstructionPolicy::_is_a ( const char *value - ACE_ENV_ARG_DECL + ) { if ( @@ -519,7 +517,7 @@ CORBA::ConstructionPolicy::_is_a ( { return this->::CORBA::Object::_is_a ( value - ACE_ENV_ARG_PARAMETER + ); } } diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 95d26092808..d2545586694 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -43,7 +43,6 @@ #include /**/ "tao/TAO_Export.h" #include "tao/ORB.h" #include "tao/SystemException.h" -#include "tao/Environment.h" #include "tao/Object.h" #include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" @@ -127,12 +126,10 @@ namespace CORBA static DomainManager_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static DomainManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static DomainManager_ptr _nil (void) @@ -147,7 +144,6 @@ namespace CORBA virtual ::CORBA::Policy_ptr get_domain_policy ( ::CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -158,7 +154,7 @@ namespace CORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -248,12 +244,12 @@ namespace CORBA static ConstructionPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ConstructionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ConstructionPolicy_ptr _nil (void) @@ -269,7 +265,7 @@ namespace CORBA virtual void make_domain_manager ( ::CORBA::InterfaceDef_ptr object_type, ::CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -280,7 +276,7 @@ namespace CORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp index f9003b54193..71ac22beb08 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.cpp +++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp @@ -37,7 +37,7 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void) DynamicAny::DynAny_ptr TAO_DynAnyFactory::create_dyn_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -53,7 +53,7 @@ TAO_DynAnyFactory::create_dyn_any ( DynamicAny::DynAny_ptr TAO_DynAnyFactory::create_dyn_any_from_type_code ( CORBA::TypeCode_ptr type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -71,7 +71,7 @@ TAO_DynAnyFactory::create_dyn_any_from_type_code ( DynamicAny::DynAny_ptr TAO_DynAnyFactory::create_dyn_any_without_truncation ( const CORBA::Any & /* value */ - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -87,7 +87,7 @@ DynamicAny::DynAnySeq * TAO_DynAnyFactory::create_multiple_dyn_anys ( const DynamicAny::AnySeq & /* values */, ::CORBA::Boolean /* allow_truncate */ - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -101,7 +101,7 @@ TAO_DynAnyFactory::create_multiple_dyn_anys ( DynamicAny::AnySeq * TAO_DynAnyFactory::create_multiple_anys ( const DynamicAny::DynAnySeq & /* values */ - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -109,25 +109,22 @@ TAO_DynAnyFactory::create_multiple_anys ( { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } - + // Utility function called by all the DynAny classes // to extract the TCKind of possibly aliased types. CORBA::TCKind TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { - CORBA::TCKind tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + CORBA::TCKind tck = tc->kind (); while (tck == CORBA::tk_alias) { CORBA::TypeCode_var temp = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + tc->content_type (); tck = TAO_DynAnyFactory::unalias (temp.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + ); } return tck; @@ -136,19 +133,16 @@ TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc // Same as above, but returns the type code. CORBA::TypeCode_ptr TAO_DynAnyFactory::strip_alias (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var retval = CORBA::TypeCode::_duplicate (tc); - CORBA::TCKind tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + CORBA::TCKind tck = retval->kind (); while (tck == CORBA::tk_alias) { - retval = retval->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + retval = retval->content_type (); - tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + tck = retval->kind (); } return retval._retn (); diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h index 69fc9a1b05d..e480a94162a 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.h +++ b/TAO/tao/DynamicAny/DynAnyFactory.h @@ -49,8 +49,7 @@ public: // = The DynamicAnyFactory methods. virtual DynamicAny::DynAny_ptr create_dyn_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAnyFactory::InconsistentTypeCode @@ -58,7 +57,7 @@ public: virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code ( CORBA::TypeCode_ptr type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -67,43 +66,43 @@ public: virtual DynamicAny::DynAny_ptr create_dyn_any_without_truncation ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAnyFactory::InconsistentTypeCode, DynamicAny::MustTruncate )); - + virtual DynamicAny::DynAnySeq * create_multiple_dyn_anys ( const DynamicAny::AnySeq & values, ::CORBA::Boolean allow_truncate - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAnyFactory::InconsistentTypeCode, DynamicAny::MustTruncate )); - + virtual DynamicAny::AnySeq * create_multiple_anys ( const DynamicAny::DynAnySeq & values - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + /// TAO-specific methods. - + /// Obtain the kind of object, after all aliasing has been removed. static CORBA::TCKind unalias (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Same as above, but returns type code instead of TCKind. Caller /// must release the return value. static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); private: // Not allowed. diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp index df513ce1f13..f11b5b34b49 100644 --- a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp +++ b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp @@ -42,7 +42,7 @@ namespace TAO { if (the_dynany->destroyed ()) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (the_dynany->has_components ()) diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index f37152f87ed..62f2007f539 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -27,12 +27,11 @@ TAO_DynAny_i::~TAO_DynAny_i (void) } void -TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) +TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc) { // Check to see if it's a simple type. - CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc); + switch (tk) { case CORBA::tk_null: @@ -74,16 +73,15 @@ TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc break; } default: - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } } void -TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) +TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc) { - CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc); + switch (tk) { case CORBA::tk_null: @@ -174,16 +172,11 @@ TAO_DynAny_i::init_common (void) } void -TAO_DynAny_i::init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) +TAO_DynAny_i::init (CORBA::TypeCode_ptr tc) { - this->check_typecode (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->check_typecode (tc); - this->set_to_default_value (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->set_to_default_value (tc); this->init_common (); @@ -191,13 +184,10 @@ TAO_DynAny_i::init (CORBA::TypeCode_ptr tc } void -TAO_DynAny_i::init (const CORBA::Any& any - ACE_ENV_ARG_DECL) +TAO_DynAny_i::init (const CORBA::Any& any) { this->type_ = any.type (); - this->check_typecode (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->check_typecode (this->type_.in ()); this->init_common (); @@ -207,8 +197,7 @@ TAO_DynAny_i::init (const CORBA::Any& any // **************************************************************** TAO_DynAny_i * -TAO_DynAny_i::_narrow (CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED) +TAO_DynAny_i::_narrow (CORBA::Object_ptr _tao_objref) { if (CORBA::is_nil (_tao_objref)) { @@ -221,8 +210,7 @@ TAO_DynAny_i::_narrow (CORBA::Object_ptr _tao_objref // **************************************************************** void -TAO_DynAny_i::from_any (const CORBA::Any &any - ACE_ENV_ARG_DECL) +TAO_DynAny_i::from_any (const CORBA::Any &any) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -231,19 +219,18 @@ TAO_DynAny_i::from_any (const CORBA::Any &any { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::TypeCode_var any_tc = any.type (); CORBA::Boolean equiv = this->type_->equivalent (any_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!equiv) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } // @@@ (JP) Spec also says we should check for illegal Any @@ -254,10 +241,8 @@ TAO_DynAny_i::from_any (const CORBA::Any &any } CORBA::Any_ptr -TAO_DynAny_i::to_any (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +TAO_DynAny_i::to_any (void) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->destroyed_) { @@ -270,17 +255,13 @@ TAO_DynAny_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retval, CORBA::Any (this->any_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return retval; } CORBA::Boolean -TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->destroyed_) { @@ -288,33 +269,27 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs 0); } - TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs); if (rhs_n == 0) { - return 0; + return false; } - CORBA::Boolean equiv = this->type_->equivalent (rhs_n->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::Boolean const equiv = this->type_->equivalent (rhs_n->type_.in ()); if (!equiv) { - return 0; + return false; } - CORBA::TCKind tk = TAO_DynAnyFactory::unalias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TCKind tk = TAO_DynAnyFactory::unalias (this->type_.in ()); switch (tk) { case CORBA::tk_null: case CORBA::tk_void: - return 1; + return true; case CORBA::tk_short: { CORBA::Short rhs_v; @@ -428,15 +403,11 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs lhs_v->_tao_get_typecode (), *lhs_v); - CORBA::Boolean b = rhs_dyn->equal (lhs_dyn.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::Boolean const b = rhs_dyn->equal (lhs_dyn.in ()); - rhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + rhs_dyn->destroy (); - lhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + lhs_dyn->destroy (); return b; } @@ -448,7 +419,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs this->any_ >>= lhs_v; // See CORBA 2.4.2 - must use equal() here. return lhs_v->equal (lhs_v - ACE_ENV_ARG_PARAMETER); + ); } case CORBA::tk_objref: { @@ -457,18 +428,15 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs CORBA::Object_ptr lhs_v; this->any_ >>= CORBA::Any::to_object (lhs_v); return lhs_v->_is_equivalent (lhs_v - ACE_ENV_ARG_PARAMETER); + ); } case CORBA::tk_string: { CORBA::TypeCode_var unaliased_tc = - TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_DynAnyFactory::strip_alias (this->type_.in ()); CORBA::ULong bound = - unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + unaliased_tc->length (); const char *rhs_v, *lhs_v; CORBA::Boolean rstatus, lstatus; @@ -502,12 +470,10 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs { CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::ULong bound = - unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + unaliased_tc->length (); const CORBA::WChar *rhs_v, *lhs_v; CORBA::Boolean rstatus, lstatus; @@ -545,14 +511,14 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynAny_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynAny_i::destroy (void) ACE_THROW_SPEC (( CORBA::SystemException )) { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (!this->ref_to_component_ || this->container_is_destroying_) @@ -563,7 +529,7 @@ TAO_DynAny_i::destroy (ACE_ENV_SINGLE_ARG_DECL) DynamicAny::DynAny_ptr -TAO_DynAny_i::current_component (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynAny_i::current_component (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h index 89c96f90350..a02b03b5077 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -52,22 +52,22 @@ public: /// Initialize using just a TypeCode void init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Initialize using an Any. void init (const CORBA::Any& any - ACE_ENV_ARG_DECL); + ); // = LocalObject methods. static TAO_DynAny_i *_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // = DynAny common functions not implemented in class TAO_DynCommon. virtual void from_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -76,7 +76,7 @@ public: )); virtual CORBA::Any * to_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -84,21 +84,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -108,11 +108,11 @@ public: private: /// Check if the typecode is acceptable. void check_typecode (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Used when we are created from a typecode. void set_to_default_value (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Called by both versions of init(). void init_common (void); diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index e4883a8443f..3a39db4ac4e 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -37,24 +37,22 @@ TAO_DynArray_i::init_common (void) void TAO_DynArray_i::init (const CORBA::Any & any - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind != CORBA::tk_array) { - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } this->type_ = tc; CORBA::ULong numfields = this->get_tc_length (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Resize the array. this->da_members_.size (numfields); @@ -80,8 +78,7 @@ TAO_DynArray_i::init (const CORBA::Any & any } CORBA::TypeCode_var field_tc = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_element_type (); for (CORBA::ULong i = 0; i < numfields; ++i) { @@ -103,29 +100,26 @@ TAO_DynArray_i::init (const CORBA::Any & any // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } void TAO_DynArray_i::init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind != CORBA::tk_array) { - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } this->type_ = CORBA::TypeCode::_duplicate (tc); CORBA::ULong numfields = this->get_tc_length (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Resize the array. this->da_members_.size (numfields); @@ -133,8 +127,7 @@ TAO_DynArray_i::init (CORBA::TypeCode_ptr tc this->init_common (); CORBA::TypeCode_var elemtype = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_element_type (); for (CORBA::ULong i = 0; i < numfields; ++i) { @@ -147,29 +140,25 @@ TAO_DynArray_i::init (CORBA::TypeCode_ptr tc } CORBA::TypeCode_ptr -TAO_DynArray_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::get_element_type (void) { CORBA::TypeCode_var element_type = CORBA::TypeCode::_duplicate (this->type_.in ()); // Strip away aliases (if any) on top of the outer type - CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + CORBA::TCKind kind = element_type->kind (); while (kind != CORBA::tk_array) { element_type = - element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + element_type->content_type (); - kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + kind = element_type->kind (); } // Return the content type. CORBA::TypeCode_ptr retval = - element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + element_type->content_type (); return retval; } @@ -177,22 +166,18 @@ TAO_DynArray_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL) // Get the length from the (possibly aliased) typecode. CORBA::ULong TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var tctmp = CORBA::TypeCode::_duplicate (tc); - CORBA::TCKind kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TCKind kind = tctmp->kind (); while (kind == CORBA::tk_alias) { - tctmp = tctmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tctmp = tctmp->content_type (); + kind = tctmp->kind (); } - CORBA::ULong retval = tctmp->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong retval = tctmp->length (); return retval; } @@ -201,7 +186,7 @@ TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc TAO_DynArray_i * TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED) + ) { if (CORBA::is_nil (_tao_objref)) { @@ -214,7 +199,7 @@ TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref // **************************************************************** DynamicAny::AnySeq * -TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::get_elements (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -231,7 +216,6 @@ TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (elements, DynamicAny::AnySeq (length), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); elements->length (length); DynamicAny::AnySeq_var safe_retval (elements); @@ -241,8 +225,7 @@ TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) // Initialize each Any. for (CORBA::ULong i = 0; i < length; i++) { - tmp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tmp = this->da_members_[i]->to_any (); safe_retval[i] = tmp.in (); } @@ -252,7 +235,7 @@ TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) void TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -261,20 +244,19 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::ULong length = value.length (); if (length != this->da_members_.size ()) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } CORBA::TypeCode_var value_tc; CORBA::TypeCode_var element_type = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_element_type (); for (CORBA::ULong i = 0; i < length; i++) { @@ -282,13 +264,11 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value value_tc = value[i].type (); CORBA::Boolean equivalent = value_tc->equivalent (element_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (equivalent) { - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); this->da_members_[i] = TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> ( @@ -297,13 +277,13 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } } DynamicAny::DynAnySeq * -TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::get_elements_as_dyn_any (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -318,7 +298,6 @@ TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retval, DynamicAny::DynAnySeq (this->component_count_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); retval->length (this->component_count_); DynamicAny::DynAnySeq_var safe_retval (retval); @@ -329,12 +308,10 @@ TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) // Set the flag so the caller can't destroy. this->set_flag (this->da_members_[i].in (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); safe_retval[i] = DynamicAny::DynAny::_duplicate (this->da_members_[i].in ()); - ACE_CHECK_RETURN (0); } return safe_retval._retn (); @@ -343,7 +320,7 @@ TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) void TAO_DynArray_i::set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & values - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -353,42 +330,38 @@ TAO_DynArray_i::set_elements_as_dyn_any ( { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ()); if (values.length () != length) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } CORBA::TypeCode_var element_type = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_element_type (); CORBA::TypeCode_var val_type; CORBA::Boolean equivalent; for (CORBA::ULong i = 0; i < length; ++i) { - val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + val_type = values[i]->type (); equivalent = val_type->equivalent (element_type.in () - ACE_ENV_ARG_PARAMETER); + ); - ACE_CHECK; if (equivalent) { this->da_members_[i] = - values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + values[i]->copy (); } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } } @@ -397,7 +370,7 @@ TAO_DynArray_i::set_elements_as_dyn_any ( void TAO_DynArray_i::from_any (const CORBA::Any& any - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -406,14 +379,13 @@ TAO_DynArray_i::from_any (const CORBA::Any& any { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::TypeCode_var tc = any.type (); CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (equivalent) { @@ -438,17 +410,15 @@ TAO_DynArray_i::from_any (const CORBA::Any& any CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ()); CORBA::ULong arg_length = this->get_tc_length (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (length != arg_length) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } CORBA::TypeCode_var field_tc = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_element_type (); for (CORBA::ULong i = 0; i < arg_length; ++i) { @@ -460,8 +430,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any unk_in)); field_any.replace (field_unk); - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); this->da_members_[i] = TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> ( @@ -471,20 +440,19 @@ TAO_DynArray_i::from_any (const CORBA::Any& any // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } this->current_position_ = arg_length ? 0 : -1; } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } CORBA::Any_ptr -TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::to_any (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -496,8 +464,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_var field_tc = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->get_element_type (); TAO_OutputCDR out_cdr; CORBA::Any_var field_any; @@ -507,8 +474,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL) { // Recursive step. field_any = - this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->da_members_[i]->to_any (); TAO::Any_Impl *field_impl = field_any->impl (); TAO_OutputCDR field_out; @@ -531,8 +497,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (field_tc.in (), &field_cdr, &out_cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } TAO_InputCDR in_cdr (out_cdr); @@ -541,14 +506,12 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retval, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); TAO::Unknown_IDL_Type *unk = 0; ACE_NEW_THROW_EX (unk, TAO::Unknown_IDL_Type (this->type_.in (), in_cdr), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); retval->replace (unk); return retval; @@ -556,7 +519,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -567,12 +530,10 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs 0); } - CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TypeCode_var tc = rhs->type (); CORBA::Boolean equivalent = tc->equivalent (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!equivalent) { @@ -585,16 +546,13 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs for (CORBA::ULong i = 0; i < this->component_count_; ++i) { rhs->seek (static_cast<CORBA::Long> (i) - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); - tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tmp = rhs->current_component (); // Recursive step. member_equal = tmp->equal (this->da_members_[i].in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!member_equal) { @@ -606,14 +564,14 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynArray_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::destroy (void) ACE_THROW_SPEC (( CORBA::SystemException )) { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (!this->ref_to_component_ || this->container_is_destroying_) @@ -623,11 +581,9 @@ TAO_DynArray_i::destroy (ACE_ENV_SINGLE_ARG_DECL) { this->set_flag (da_members_[i].in (), 1 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); } this->destroyed_ = 1; @@ -635,7 +591,7 @@ TAO_DynArray_i::destroy (ACE_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::current_component (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -656,8 +612,7 @@ TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL) this->set_flag (this->da_members_[index].in (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + ); return DynamicAny::DynAny::_duplicate ( this->da_members_[index].in () diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h index 8e28d989cae..17742413936 100644 --- a/TAO/tao/DynamicAny/DynArray_i.h +++ b/TAO/tao/DynamicAny/DynArray_i.h @@ -53,21 +53,21 @@ public: /// Initialize using just a TypeCode. void init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Initialize using an Any. void init (const CORBA::Any& any - ACE_ENV_ARG_DECL); + ); // = LocalObject methods static TAO_DynArray_i *_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // = Functions specific to DynArray. virtual DynamicAny::AnySeq * get_elements ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -75,7 +75,7 @@ public: virtual void set_elements ( const DynamicAny::AnySeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -84,7 +84,7 @@ public: )); virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -92,7 +92,7 @@ public: virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -104,7 +104,7 @@ public: virtual void from_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -113,7 +113,7 @@ public: )); virtual CORBA::Any * to_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -121,21 +121,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -144,11 +144,11 @@ public: private: /// Returns the type of elements contained in the array. - CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::TypeCode_ptr get_element_type (void); /// Gets the length of the array from the typecode. CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Called by both versions of init(). void init_common (void); diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index 9f4cb8055bf..fe17113c1b5 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -34,7 +34,7 @@ TAO_DynCommon::~TAO_DynCommon (void) } CORBA::TypeCode_ptr -TAO_DynCommon::type (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::type (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -50,7 +50,7 @@ TAO_DynCommon::type (ACE_ENV_SINGLE_ARG_DECL) void TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -58,35 +58,31 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } - CORBA::TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::TypeCode_var tc = dyn_any->type (); CORBA::Boolean const equivalent = this->type_.in ()->equivalent (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (equivalent) { - CORBA::Any_var any = dyn_any->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = dyn_any->to_any (); this->from_any (any.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } void TAO_DynCommon::insert_boolean (CORBA::Boolean value - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -99,7 +95,7 @@ TAO_DynCommon::insert_boolean (CORBA::Boolean value void TAO_DynCommon::insert_octet (CORBA::Octet value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -112,7 +108,7 @@ TAO_DynCommon::insert_octet (CORBA::Octet value void TAO_DynCommon::insert_char (CORBA::Char value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -125,7 +121,7 @@ TAO_DynCommon::insert_char (CORBA::Char value void TAO_DynCommon::insert_short (CORBA::Short value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -138,7 +134,7 @@ TAO_DynCommon::insert_short (CORBA::Short value void TAO_DynCommon::insert_ushort (CORBA::UShort value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -151,7 +147,7 @@ TAO_DynCommon::insert_ushort (CORBA::UShort value void TAO_DynCommon::insert_long (CORBA::Long value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -164,7 +160,7 @@ TAO_DynCommon::insert_long (CORBA::Long value void TAO_DynCommon::insert_ulong (CORBA::ULong value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -177,7 +173,7 @@ TAO_DynCommon::insert_ulong (CORBA::ULong value void TAO_DynCommon::insert_float (CORBA::Float value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -190,7 +186,7 @@ TAO_DynCommon::insert_float (CORBA::Float value void TAO_DynCommon::insert_double (CORBA::Double value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -203,7 +199,7 @@ TAO_DynCommon::insert_double (CORBA::Double value void TAO_DynCommon::insert_string (const char * value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -212,42 +208,37 @@ TAO_DynCommon::insert_string (const char * value { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_component (); cc->insert_string (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::TCKind const kind = - unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + unaliased_tc->kind (); if (kind != CORBA::tk_string) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } CORBA::ULong const bound = - unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + unaliased_tc->length (); if (bound > 0 && bound < ACE_OS::strlen (value)) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } this->any_ <<= CORBA::Any::from_string (const_cast<char *> (value), @@ -257,7 +248,7 @@ TAO_DynCommon::insert_string (const char * value void TAO_DynCommon::insert_reference (CORBA::Object_ptr value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -266,26 +257,23 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_component (); cc->insert_reference (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { CORBA::Boolean good_type = true; CORBA::TCKind const kind = TAO_DynAnyFactory::unalias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind != CORBA::tk_objref) { @@ -298,14 +286,12 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value if (ACE_OS::strcmp (value_id, "IDL:omg.org/CORBA/Object:1.0") != 0) { const char *my_id = - this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->type_->id (); if (ACE_OS::strcmp (value_id, my_id) != 0) { good_type = value->_is_a (my_id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } } @@ -325,7 +311,7 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value { if (!value->marshal (cdr)) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } } @@ -338,14 +324,14 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } } void TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -358,7 +344,7 @@ TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value void TAO_DynCommon::insert_longlong (CORBA::LongLong value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -371,7 +357,7 @@ TAO_DynCommon::insert_longlong (CORBA::LongLong value void TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -384,7 +370,7 @@ TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value void TAO_DynCommon::insert_longdouble (CORBA::LongDouble value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -397,7 +383,7 @@ TAO_DynCommon::insert_longdouble (CORBA::LongDouble value void TAO_DynCommon::insert_wchar (CORBA::WChar value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -410,7 +396,7 @@ TAO_DynCommon::insert_wchar (CORBA::WChar value void TAO_DynCommon::insert_wstring (const CORBA::WChar * value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -419,32 +405,28 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_component (); cc->insert_wstring (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { CORBA::TypeCode_var unaliased_tc = this->check_type_and_unalias (CORBA::_tc_wstring - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - CORBA::ULong const bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::ULong const bound = unaliased_tc->length (); if (bound > 0 && bound < ACE_OS::wslen (value)) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } this->any_ <<= CORBA::Any::from_wstring (const_cast<CORBA::WChar *> (value), @@ -454,7 +436,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value void TAO_DynCommon::insert_any (const CORBA::Any &value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -469,7 +451,7 @@ TAO_DynCommon::insert_any (const CORBA::Any &value // have fewer Any/DynAny conversions than insert_any, not more. void TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -478,20 +460,18 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } - CORBA::Any_var any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = value->to_any (); this->insert_any (any.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_DynCommon::insert_val (CORBA::ValueBase *value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -500,29 +480,26 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_component (); cc->insert_val (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind != CORBA::tk_value) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } // If the arg is 0 we can't do this kind of type checking, @@ -532,8 +509,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value { const char *value_id = value->_tao_obv_repository_id (); const char *my_id = - this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->type_->id (); // Valuetypes, unlike interfaces, don't have a virtual // method to check for a more derived type when the @@ -542,7 +518,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value // here, so if the repo ids don't match, we're hosed. if (ACE_OS::strcmp (value_id, my_id) != 0) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } @@ -554,7 +530,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value if (!good_insert) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } TAO_InputCDR in (out); @@ -569,7 +545,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value // **************************************************************** CORBA::Boolean -TAO_DynCommon::get_boolean (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_boolean (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -580,7 +556,7 @@ TAO_DynCommon::get_boolean (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Octet -TAO_DynCommon::get_octet (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_octet (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -591,7 +567,7 @@ TAO_DynCommon::get_octet (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Char -TAO_DynCommon::get_char (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_char (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -602,7 +578,7 @@ TAO_DynCommon::get_char (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Short -TAO_DynCommon::get_short (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_short (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -613,7 +589,7 @@ TAO_DynCommon::get_short (ACE_ENV_SINGLE_ARG_DECL) } CORBA::UShort -TAO_DynCommon::get_ushort (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_ushort (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -624,7 +600,7 @@ TAO_DynCommon::get_ushort (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Long -TAO_DynCommon::get_long (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_long (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -635,7 +611,7 @@ TAO_DynCommon::get_long (ACE_ENV_SINGLE_ARG_DECL) } CORBA::ULong -TAO_DynCommon::get_ulong (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_ulong (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -646,7 +622,7 @@ TAO_DynCommon::get_ulong (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Float -TAO_DynCommon::get_float (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_float (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -657,7 +633,7 @@ TAO_DynCommon::get_float (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Double -TAO_DynCommon::get_double (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_double (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -668,7 +644,7 @@ TAO_DynCommon::get_double (ACE_ENV_SINGLE_ARG_DECL) } char * -TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_string (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -684,21 +660,18 @@ TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL) if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_component (); - return cc->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); + return cc->get_string (); } else { CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::TCKind kind = - unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + unaliased_tc->kind (); if (kind != CORBA::tk_string) { @@ -709,8 +682,7 @@ TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL) char *retval = 0; CORBA::ULong const bound = - unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + unaliased_tc->length (); // We will have caught a type mismatch above, so if this fails, // it must be for some other reason. @@ -725,7 +697,7 @@ TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Object_ptr -TAO_DynCommon::get_reference (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_reference (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -741,10 +713,9 @@ TAO_DynCommon::get_reference (ACE_ENV_SINGLE_ARG_DECL) if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->check_component (); - return cc->get_reference (ACE_ENV_SINGLE_ARG_PARAMETER); + return cc->get_reference (); } else { @@ -761,7 +732,7 @@ TAO_DynCommon::get_reference (ACE_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_DynCommon::get_typecode (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_typecode (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -777,10 +748,9 @@ TAO_DynCommon::get_typecode (ACE_ENV_SINGLE_ARG_DECL) if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_component (); - return cc->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); + return cc->get_typecode (); } else { @@ -797,7 +767,7 @@ TAO_DynCommon::get_typecode (ACE_ENV_SINGLE_ARG_DECL) } CORBA::LongLong -TAO_DynCommon::get_longlong (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_longlong (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -808,7 +778,7 @@ TAO_DynCommon::get_longlong (ACE_ENV_SINGLE_ARG_DECL) } CORBA::ULongLong -TAO_DynCommon::get_ulonglong (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_ulonglong (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -819,7 +789,7 @@ TAO_DynCommon::get_ulonglong (ACE_ENV_SINGLE_ARG_DECL) } CORBA::LongDouble -TAO_DynCommon::get_longdouble (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_longdouble (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -830,7 +800,7 @@ TAO_DynCommon::get_longdouble (ACE_ENV_SINGLE_ARG_DECL) } CORBA::WChar -TAO_DynCommon::get_wchar (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_wchar (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -846,10 +816,9 @@ TAO_DynCommon::get_wchar (ACE_ENV_SINGLE_ARG_DECL) if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_component (); - return cc->get_wchar (ACE_ENV_SINGLE_ARG_PARAMETER); + return cc->get_wchar (); } else { @@ -866,7 +835,7 @@ TAO_DynCommon::get_wchar (ACE_ENV_SINGLE_ARG_DECL) } CORBA::WChar * -TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_wstring (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -882,10 +851,9 @@ TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL) if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_component (); - return cc->get_wstring (ACE_ENV_SINGLE_ARG_PARAMETER); + return cc->get_wstring (); } else { @@ -894,14 +862,12 @@ TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL) // BadKind. CORBA::TypeCode_var unaliased_tc = this->check_type_and_unalias (CORBA::_tc_wstring - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::WChar *retval = 0; CORBA::ULong bound = - unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + unaliased_tc->length (); (void) (this->any_ >>= CORBA::Any::to_wstring (retval, bound)); @@ -911,7 +877,7 @@ TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Any_ptr -TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_any (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -927,10 +893,9 @@ TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL) if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_component (); - return cc->get_any (ACE_ENV_SINGLE_ARG_PARAMETER); + return cc->get_any (); } else { @@ -953,7 +918,7 @@ TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL) // @@@ (JP) TODO - optimize - this version was intended by the OMG to // have fewer Any/DynAny conversions than get_any, not more. DynamicAny::DynAny_ptr -TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_dyn_any (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -966,8 +931,7 @@ TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL) 0); } - CORBA::Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::Any_var any = this->get_any (); return TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> ( @@ -976,7 +940,7 @@ TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL) } CORBA::ValueBase * -TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_val (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -991,17 +955,15 @@ TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL) if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_component (); - return cc->get_val (ACE_ENV_SINGLE_ARG_PARAMETER); + return cc->get_val (); } else { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind != CORBA::tk_value) { @@ -1040,7 +1002,7 @@ TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynCommon::seek (CORBA::Long slot - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -1070,23 +1032,22 @@ TAO_DynCommon::seek (CORBA::Long slot } void -TAO_DynCommon::rewind (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::rewind (void) ACE_THROW_SPEC (( CORBA::SystemException )) { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } (void) this->seek (0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } CORBA::Boolean -TAO_DynCommon::next (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::next (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -1112,7 +1073,7 @@ TAO_DynCommon::next (ACE_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::copy (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -1123,8 +1084,7 @@ TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL) DynamicAny::DynAny::_nil ()); } - CORBA::Any_var any = this->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + CORBA::Any_var any = this->to_any (); DynamicAny::DynAny_ptr retval = TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> ( @@ -1135,7 +1095,7 @@ TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL) } CORBA::ULong -TAO_DynCommon::component_count (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::component_count (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -1153,7 +1113,7 @@ TAO_DynCommon::component_count (ACE_ENV_SINGLE_ARG_DECL) void TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1162,26 +1122,21 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_component (); - cc->insert_abstract (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + cc->insert_abstract (value); } else { CORBA::Boolean good_type = true; CORBA::TCKind kind = - TAO_DynAnyFactory::unalias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + TAO_DynAnyFactory::unalias (this->type_.in ()); if (kind != CORBA::tk_abstract_interface) { @@ -1196,8 +1151,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value if (cmp != 0) { const char *my_id = - this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->type_->id (); if (ACE_OS::strcmp (value_id, my_id) != 0) { @@ -1208,8 +1162,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value // is no way to check for derived valuetypes w/o // type knowledge at compile time. good_type = value->_is_a (my_id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } } @@ -1222,7 +1175,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value // all cases - nil, objref and valuetype - polymorphically. if (!(out << value)) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } TAO_InputCDR in (out); @@ -1234,13 +1187,13 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } } CORBA::AbstractBase_ptr -TAO_DynCommon::get_abstract (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_abstract (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1256,17 +1209,15 @@ TAO_DynCommon::get_abstract (ACE_ENV_SINGLE_ARG_DECL) if (this->has_components_) { DynamicAny::DynAny_var cc = - this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::AbstractBase::_nil ()); + this->check_component (); - return cc->get_abstract (ACE_ENV_SINGLE_ARG_PARAMETER); + return cc->get_abstract (); } else { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind != CORBA::tk_abstract_interface) { @@ -1304,7 +1255,7 @@ TAO_DynCommon::get_abstract (ACE_ENV_SINGLE_ARG_DECL) void TAO_DynCommon::insert_boolean_seq ( const CORBA::BooleanSeq &value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1316,9 +1267,7 @@ TAO_DynCommon::insert_boolean_seq ( } void -TAO_DynCommon::insert_octet_seq ( - const CORBA::OctetSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_octet_seq (const CORBA::OctetSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1330,9 +1279,7 @@ TAO_DynCommon::insert_octet_seq ( } void -TAO_DynCommon::insert_char_seq ( - const CORBA::CharSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_char_seq (const CORBA::CharSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1344,9 +1291,7 @@ TAO_DynCommon::insert_char_seq ( } void -TAO_DynCommon::insert_short_seq ( - const CORBA::ShortSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_short_seq (const CORBA::ShortSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1358,9 +1303,7 @@ TAO_DynCommon::insert_short_seq ( } void -TAO_DynCommon::insert_ushort_seq ( - const CORBA::UShortSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_ushort_seq (const CORBA::UShortSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1372,9 +1315,7 @@ TAO_DynCommon::insert_ushort_seq ( } void -TAO_DynCommon::insert_long_seq ( - const CORBA::LongSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_long_seq (const CORBA::LongSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1386,9 +1327,7 @@ TAO_DynCommon::insert_long_seq ( } void -TAO_DynCommon::insert_ulong_seq ( - const CORBA::ULongSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_ulong_seq (const CORBA::ULongSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1400,9 +1339,7 @@ TAO_DynCommon::insert_ulong_seq ( } void -TAO_DynCommon::insert_float_seq ( - const CORBA::FloatSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_float_seq (const CORBA::FloatSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1414,9 +1351,7 @@ TAO_DynCommon::insert_float_seq ( } void -TAO_DynCommon::insert_double_seq ( - const CORBA::DoubleSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_double_seq (const CORBA::DoubleSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1428,9 +1363,7 @@ TAO_DynCommon::insert_double_seq ( } void -TAO_DynCommon::insert_longlong_seq ( - const CORBA::LongLongSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_longlong_seq (const CORBA::LongLongSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1442,9 +1375,7 @@ TAO_DynCommon::insert_longlong_seq ( } void -TAO_DynCommon::insert_ulonglong_seq ( - const CORBA::ULongLongSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_ulonglong_seq (const CORBA::ULongLongSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1456,9 +1387,7 @@ TAO_DynCommon::insert_ulonglong_seq ( } void -TAO_DynCommon::insert_longdouble_seq ( - const CORBA::LongDoubleSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_longdouble_seq (const CORBA::LongDoubleSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1470,9 +1399,7 @@ TAO_DynCommon::insert_longdouble_seq ( } void -TAO_DynCommon::insert_wchar_seq ( - const CORBA::WCharSeq &value - ACE_ENV_ARG_DECL) +TAO_DynCommon::insert_wchar_seq (const CORBA::WCharSeq &value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1486,8 +1413,7 @@ TAO_DynCommon::insert_wchar_seq ( // **************************************************************** CORBA::BooleanSeq * -TAO_DynCommon::get_boolean_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_boolean_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1500,8 +1426,7 @@ TAO_DynCommon::get_boolean_seq ( } CORBA::OctetSeq * -TAO_DynCommon::get_octet_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_octet_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1514,8 +1439,7 @@ TAO_DynCommon::get_octet_seq ( } CORBA::CharSeq * -TAO_DynCommon::get_char_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_char_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1528,8 +1452,7 @@ TAO_DynCommon::get_char_seq ( } CORBA::ShortSeq * -TAO_DynCommon::get_short_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_short_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1542,8 +1465,7 @@ TAO_DynCommon::get_short_seq ( } CORBA::UShortSeq * -TAO_DynCommon::get_ushort_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_ushort_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1556,8 +1478,7 @@ TAO_DynCommon::get_ushort_seq ( } CORBA::LongSeq * -TAO_DynCommon::get_long_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_long_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1570,8 +1491,7 @@ TAO_DynCommon::get_long_seq ( } CORBA::ULongSeq * -TAO_DynCommon::get_ulong_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_ulong_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1584,8 +1504,7 @@ TAO_DynCommon::get_ulong_seq ( } CORBA::FloatSeq * -TAO_DynCommon::get_float_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_float_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1598,8 +1517,7 @@ TAO_DynCommon::get_float_seq ( } CORBA::DoubleSeq * -TAO_DynCommon::get_double_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_double_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1612,8 +1530,7 @@ TAO_DynCommon::get_double_seq ( } CORBA::LongLongSeq * -TAO_DynCommon::get_longlong_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_longlong_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1626,8 +1543,7 @@ TAO_DynCommon::get_longlong_seq ( } CORBA::ULongLongSeq * -TAO_DynCommon::get_ulonglong_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_ulonglong_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1640,8 +1556,7 @@ TAO_DynCommon::get_ulonglong_seq ( } CORBA::LongDoubleSeq * -TAO_DynCommon::get_longdouble_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_longdouble_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1654,8 +1569,7 @@ TAO_DynCommon::get_longdouble_seq ( } CORBA::WCharSeq * -TAO_DynCommon::get_wchar_seq ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_wchar_seq (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1671,18 +1585,14 @@ TAO_DynCommon::get_wchar_seq ( void TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, - CORBA::Boolean destroying - ACE_ENV_ARG_DECL) + CORBA::Boolean destroying) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA::TypeCode_var tc = component->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::TypeCode_var tc = component->type (); - CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc.in ()); switch (tk) { @@ -1717,7 +1627,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, case CORBA::tk_fixed: case CORBA::tk_value: case CORBA::tk_value_box: - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); default: TAO::DynAnyFlagUtils<TAO_DynAny_i>::set_flag_t (component, destroying); @@ -1726,7 +1636,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, } DynamicAny::DynAny_ptr -TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::check_component (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1740,15 +1650,11 @@ TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_var cc = - this->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + this->current_component (); - CORBA::TypeCode_var tc = cc->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + CORBA::TypeCode_var tc = cc->type (); - CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()); // We are here because we are a component that is the target of // an insert_*() call on our container. It is @@ -1778,21 +1684,18 @@ TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) +TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch )) { - CORBA::Boolean equivalent = - this->type_->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::Boolean const equivalent = + this->type_->equivalent (tc); if (!equivalent) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } @@ -1846,18 +1749,15 @@ TAO_DynCommon::ref_to_component (CORBA::Boolean val) CORBA::TypeCode_ptr TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch )) { - this->check_type (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + this->check_type (tc); - return TAO_DynAnyFactory::strip_alias (tc - ACE_ENV_ARG_PARAMETER); + return TAO_DynAnyFactory::strip_alias (tc); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h index 9e07090e260..a4093d39233 100644 --- a/TAO/tao/DynamicAny/DynCommon.h +++ b/TAO/tao/DynamicAny/DynCommon.h @@ -42,14 +42,14 @@ public: // = Some functions common to all Dynamic Any types. virtual CORBA::TypeCode_ptr type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void assign ( DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -57,7 +57,7 @@ public: virtual void insert_boolean ( CORBA::Boolean value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -66,7 +66,7 @@ public: virtual void insert_octet ( CORBA::Octet value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -75,7 +75,7 @@ public: virtual void insert_char ( CORBA::Char value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -83,7 +83,7 @@ public: )); virtual void insert_short ( CORBA::Short value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -92,7 +92,7 @@ public: )); virtual void insert_ushort ( CORBA::UShort value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -102,7 +102,7 @@ public: virtual void insert_long ( CORBA::Long value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -111,7 +111,7 @@ public: virtual void insert_ulong ( CORBA::ULong value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -120,7 +120,7 @@ public: virtual void insert_float ( CORBA::Float value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -129,7 +129,7 @@ public: virtual void insert_double ( CORBA::Double value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -138,7 +138,7 @@ public: virtual void insert_string ( const char * value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -147,7 +147,7 @@ public: virtual void insert_reference ( CORBA::Object_ptr value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -156,7 +156,7 @@ public: virtual void insert_typecode ( CORBA::TypeCode_ptr value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -165,7 +165,7 @@ public: virtual void insert_longlong ( CORBA::LongLong value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -174,7 +174,7 @@ public: virtual void insert_ulonglong ( CORBA::ULongLong value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -183,7 +183,7 @@ public: virtual void insert_longdouble ( CORBA::LongDouble value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -192,7 +192,7 @@ public: virtual void insert_wchar ( CORBA::WChar value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -201,7 +201,7 @@ public: virtual void insert_wstring ( const CORBA::WChar * value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -210,7 +210,7 @@ public: virtual void insert_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -219,7 +219,7 @@ public: virtual void insert_dyn_any ( DynamicAny::DynAny_ptr value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -228,7 +228,7 @@ public: virtual void insert_val ( CORBA::ValueBase * value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -236,7 +236,7 @@ public: )); virtual CORBA::Boolean get_boolean ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -244,7 +244,7 @@ public: )); virtual CORBA::Octet get_octet ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -252,7 +252,7 @@ public: )); virtual CORBA::Char get_char ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -260,7 +260,7 @@ public: )); virtual CORBA::Short get_short ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -268,7 +268,7 @@ public: )); virtual CORBA::UShort get_ushort ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -276,7 +276,7 @@ public: )); virtual CORBA::Long get_long ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -284,7 +284,7 @@ public: )); virtual CORBA::ULong get_ulong ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -292,7 +292,7 @@ public: )); virtual CORBA::Float get_float ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -300,7 +300,7 @@ public: )); virtual CORBA::Double get_double ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -308,7 +308,7 @@ public: )); virtual char * get_string ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -316,7 +316,7 @@ public: )); virtual CORBA::Object_ptr get_reference ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -324,7 +324,7 @@ public: )); virtual CORBA::TypeCode_ptr get_typecode ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -332,7 +332,7 @@ public: )); virtual CORBA::LongLong get_longlong ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -340,7 +340,7 @@ public: )); virtual CORBA::ULongLong get_ulonglong ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -348,7 +348,7 @@ public: )); virtual CORBA::LongDouble get_longdouble ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -356,7 +356,7 @@ public: )); virtual CORBA::WChar get_wchar ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -364,7 +364,7 @@ public: )); virtual CORBA::WChar * get_wstring ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -372,7 +372,7 @@ public: )); virtual CORBA::Any * get_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -380,7 +380,7 @@ public: )); virtual DynamicAny::DynAny_ptr get_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -388,7 +388,7 @@ public: )); virtual CORBA::ValueBase * get_val ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -397,38 +397,38 @@ public: virtual CORBA::Boolean seek ( CORBA::Long index - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void rewind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean next ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::ULong component_count ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void insert_abstract ( CORBA::AbstractBase_ptr value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -436,7 +436,7 @@ public: )); virtual CORBA::AbstractBase_ptr get_abstract ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -445,7 +445,7 @@ public: virtual void insert_boolean_seq ( const CORBA::BooleanSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -454,7 +454,7 @@ public: virtual void insert_octet_seq ( const CORBA::OctetSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -463,7 +463,7 @@ public: virtual void insert_char_seq ( const CORBA::CharSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -472,7 +472,7 @@ public: virtual void insert_short_seq ( const CORBA::ShortSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -481,7 +481,7 @@ public: virtual void insert_ushort_seq ( const CORBA::UShortSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -490,7 +490,7 @@ public: virtual void insert_long_seq ( const CORBA::LongSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -499,7 +499,7 @@ public: virtual void insert_ulong_seq ( const CORBA::ULongSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -508,7 +508,7 @@ public: virtual void insert_float_seq ( const CORBA::FloatSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -517,7 +517,7 @@ public: virtual void insert_double_seq ( const CORBA::DoubleSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -526,7 +526,7 @@ public: virtual void insert_longlong_seq ( const CORBA::LongLongSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -535,7 +535,7 @@ public: virtual void insert_ulonglong_seq ( const CORBA::ULongLongSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -544,7 +544,7 @@ public: virtual void insert_longdouble_seq ( const CORBA::LongDoubleSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -553,7 +553,7 @@ public: virtual void insert_wchar_seq ( const CORBA::WCharSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -561,7 +561,7 @@ public: )); virtual CORBA::BooleanSeq * get_boolean_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -569,7 +569,7 @@ public: )); virtual CORBA::OctetSeq * get_octet_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -577,7 +577,7 @@ public: )); virtual CORBA::CharSeq * get_char_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -585,7 +585,7 @@ public: )); virtual CORBA::ShortSeq * get_short_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -593,7 +593,7 @@ public: )); virtual CORBA::UShortSeq * get_ushort_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -601,7 +601,7 @@ public: )); virtual CORBA::LongSeq * get_long_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -609,7 +609,7 @@ public: )); virtual CORBA::ULongSeq * get_ulong_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -617,7 +617,7 @@ public: )); virtual CORBA::FloatSeq * get_float_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -625,7 +625,7 @@ public: )); virtual CORBA::DoubleSeq * get_double_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -633,7 +633,7 @@ public: )); virtual CORBA::LongLongSeq * get_longlong_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -641,7 +641,7 @@ public: )); virtual CORBA::ULongLongSeq * get_ulonglong_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -649,7 +649,7 @@ public: )); virtual CORBA::LongDoubleSeq * get_longdouble_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -657,7 +657,7 @@ public: )); virtual CORBA::WCharSeq * get_wchar_seq ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -676,7 +676,7 @@ public: void set_flag ( DynamicAny::DynAny_ptr component, CORBA::Boolean destroying - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -684,7 +684,7 @@ public: // Utility functions. - DynamicAny::DynAny_ptr check_component (ACE_ENV_SINGLE_ARG_DECL) + DynamicAny::DynAny_ptr check_component (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -692,7 +692,7 @@ public: )); void check_type (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -741,7 +741,7 @@ private: // Utility functions used by insert_* and get_*. CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index 6ce0a7dcedc..8bb2f8886be 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -35,19 +35,16 @@ TAO_DynEnum_i::init_common (void) } void -TAO_DynEnum_i::init (const CORBA::Any &any - ACE_ENV_ARG_DECL) +TAO_DynEnum_i::init (const CORBA::Any &any) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = - TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + TAO_DynAnyFactory::unalias (tc.in ()); if (kind != CORBA::tk_enum) { - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } this->type_ = tc; @@ -76,16 +73,13 @@ TAO_DynEnum_i::init (const CORBA::Any &any } void -TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) +TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc) { - CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc); if (kind != CORBA::tk_enum) { - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } this->type_ = CORBA::TypeCode::_duplicate (tc); @@ -98,8 +92,7 @@ TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc // **************************************************************** TAO_DynEnum_i * -TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED) +TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref) { if (CORBA::is_nil (_tao_objref)) { @@ -112,30 +105,25 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref // **************************************************************** char * -TAO_DynEnum_i::get_as_string (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +TAO_DynEnum_i::get_as_string (void) + ACE_THROW_SPEC ((CORBA::SystemException)) { const char *retval = - this->type_.in ()->member_name (this->value_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->type_.in ()->member_name (this->value_); return CORBA::string_dup (retval); } void TAO_DynEnum_i::set_as_string (const char *value_as_string - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue )) { CORBA::ULong count = - this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->type_.in ()->member_count (); CORBA::ULong i; const char *temp = 0; @@ -143,8 +131,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string for (i = 0; i < count; ++i) { temp = this->type_.in ()->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!ACE_OS::strcmp (value_as_string, temp)) @@ -159,12 +146,12 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string } else { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } } CORBA::ULong -TAO_DynEnum_i::get_as_ulong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_DynEnum_i::get_as_ulong (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -174,15 +161,14 @@ TAO_DynEnum_i::get_as_ulong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue )) { CORBA::ULong max = - this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->type_.in ()->member_count (); if (value_as_ulong < max) { @@ -190,7 +176,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong } else { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } } @@ -198,7 +184,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong void TAO_DynEnum_i::from_any (const CORBA::Any& any - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -206,9 +192,7 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any )) { CORBA::TypeCode_var tc = any.type (); - CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()); if (kind == CORBA::tk_enum) { @@ -235,12 +219,12 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } CORBA::Any_ptr -TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::to_any (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -253,7 +237,6 @@ TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retval, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); TAO_InputCDR in_cdr (out_cdr); TAO::Unknown_IDL_Type *unk = 0; @@ -261,33 +244,27 @@ TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL) TAO::Unknown_IDL_Type (this->type_.in (), in_cdr), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); retval->replace (unk); return retval; } CORBA::Boolean -TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs - ACE_ENV_ARG_DECL) +TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TypeCode_var tc = rhs->type (); - CORBA::Boolean equivalent = tc->equivalent (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()); if (!equivalent) { - return 0; + return false; } - CORBA::Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::Any_var any = rhs->to_any (); TAO::Any_Impl *impl = any->impl (); CORBA::ULong value; @@ -314,24 +291,24 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynEnum_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::destroy (void) ACE_THROW_SPEC (( CORBA::SystemException )) { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (!this->ref_to_component_ || this->container_is_destroying_) { - this->destroyed_ = 1; + this->destroyed_ = true; } } DynamicAny::DynAny_ptr -TAO_DynEnum_i::current_component (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::current_component (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h index 6732653721e..506844d4543 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.h +++ b/TAO/tao/DynamicAny/DynEnum_i.h @@ -53,21 +53,21 @@ public: /// Initialize using just a TypeCode. void init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Initialize using an Any. void init (const CORBA::Any& any - ACE_ENV_ARG_DECL); + ); // = LocalObject methods. static TAO_DynEnum_i *_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // = Functions specific to DynEnum. virtual char * get_as_string ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -75,7 +75,7 @@ public: virtual void set_as_string ( const char * value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -83,7 +83,7 @@ public: )); virtual CORBA::ULong get_as_ulong ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -91,7 +91,7 @@ public: virtual void set_as_ulong ( CORBA::ULong value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -102,7 +102,7 @@ public: virtual void from_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -111,7 +111,7 @@ public: )); virtual CORBA::Any * to_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -119,21 +119,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 7d2dff85503..5af2826dcfc 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -36,19 +36,16 @@ TAO_DynSequence_i::init_common (void) } void -TAO_DynSequence_i::init (const CORBA::Any& any - ACE_ENV_ARG_DECL) +TAO_DynSequence_i::init (const CORBA::Any& any) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = - TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + TAO_DynAnyFactory::unalias (tc.in ()); if (kind != CORBA::tk_sequence) { - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } this->type_ = tc; @@ -84,8 +81,7 @@ TAO_DynSequence_i::init (const CORBA::Any& any // Get the type of the sequence elments. CORBA::TypeCode_var field_tc = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_element_type (); for (CORBA::ULong i = 0; i < length; ++i) { @@ -107,22 +103,20 @@ TAO_DynSequence_i::init (const CORBA::Any& any // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } void TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind != CORBA::tk_sequence) { - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } // Empty sequence. @@ -137,7 +131,7 @@ TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc TAO_DynSequence_i * TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED) + ) { if (CORBA::is_nil (_tao_objref)) { @@ -150,28 +144,24 @@ TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref // **************************************************************** CORBA::TypeCode_ptr -TAO_DynSequence_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::get_element_type (void) { CORBA::TypeCode_var element_type = CORBA::TypeCode::_duplicate (this->type_.in ()); // Strip away aliases (if any) on top of the outer type. - CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + CORBA::TCKind kind = element_type->kind (); while (kind != CORBA::tk_sequence) { - element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + element_type = element_type->content_type (); - kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + kind = element_type->kind (); } // Return the content type. CORBA::TypeCode_ptr retval = - element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + element_type->content_type (); return retval; } @@ -179,7 +169,7 @@ TAO_DynSequence_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL) // = Functions specific to DynSequence. CORBA::ULong -TAO_DynSequence_i::get_length (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::get_length (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -194,8 +184,7 @@ TAO_DynSequence_i::get_length (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_DynSequence_i::set_length (CORBA::ULong length - ACE_ENV_ARG_DECL) +TAO_DynSequence_i::set_length (CORBA::ULong length) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue @@ -203,21 +192,19 @@ TAO_DynSequence_i::set_length (CORBA::ULong length { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } // CORBA::TypeCode::length() does not accept aliased type codes. CORBA::TypeCode_var stripped_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::ULong bound = stripped_tc->length (); if (bound > 0 && length > bound) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } // CORBA 2.3.1 has several explicit rules about resetting the @@ -250,8 +237,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length this->da_members_.size (length); CORBA::TypeCode_var elemtype = - stripped_tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + stripped_tc->content_type (); for (CORBA::ULong i = this->component_count_; i < length; ++i) { @@ -266,8 +252,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length // Destroy any dangling members first, then shrink array. for (CORBA::ULong j = length; j < this->component_count_; ++j) { - this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[j]->destroy (); } this->da_members_.size (length); @@ -278,7 +263,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length } DynamicAny::AnySeq * -TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::get_elements (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -295,7 +280,6 @@ TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (elements, DynamicAny::AnySeq (length), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); elements->length (length); DynamicAny::AnySeq_var safe_retval = elements; @@ -304,9 +288,8 @@ TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < length; ++i) { CORBA::Any_var tmp = - this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->to_any (); - ACE_CHECK_RETURN (0); safe_retval[i] = tmp.in (); } @@ -315,8 +298,7 @@ TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value - ACE_ENV_ARG_DECL) +TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -325,21 +307,19 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::TypeCode_var stripped_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::ULong length = value.length (); - CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::ULong bound = stripped_tc->length (); if (bound > 0 && length > bound) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } // CORBA 2.4.2. @@ -359,8 +339,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value } CORBA::TypeCode_var element_type = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_element_type (); CORBA::TypeCode_var value_tc; @@ -370,16 +349,14 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value value_tc = value[i].type (); CORBA::Boolean equivalent = value_tc->equivalent (element_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (equivalent) { // Destroy any existing members. if (i < this->component_count_) { - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); } this->da_members_[i] = @@ -389,15 +366,14 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } // Destroy any dangling members. for (CORBA::ULong j = length; j < this->component_count_; ++j) { - this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[j]->destroy (); } // If the array shrinks, we must wait until now to do it. @@ -411,7 +387,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value } DynamicAny::DynAnySeq * -TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::get_elements_as_dyn_any (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -426,7 +402,6 @@ TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retval, DynamicAny::DynAnySeq (this->component_count_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); retval->length (this->component_count_); DynamicAny::DynAnySeq_var safe_retval (retval); @@ -437,12 +412,10 @@ TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) // Set the flag so the caller can't destroy. this->set_flag (this->da_members_[i].in (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); safe_retval[i] = DynamicAny::DynAny::_duplicate (this->da_members_[i].in ()); - ACE_CHECK_RETURN (0); } return safe_retval._retn (); @@ -450,9 +423,7 @@ TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) void TAO_DynSequence_i::set_elements_as_dyn_any ( - const DynamicAny::DynAnySeq & values - ACE_ENV_ARG_DECL - ) + const DynamicAny::DynAnySeq & values) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -461,21 +432,19 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::TypeCode_var stripped_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::ULong length = values.length (); - CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::ULong bound = stripped_tc->length (); if (bound > 0 && length > bound) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } // If the array grows, we must do it now. @@ -485,46 +454,40 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( } CORBA::TypeCode_var element_type = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_element_type (); CORBA::TypeCode_var val_type; CORBA::Boolean equivalent; for (CORBA::ULong i = 0; i < length; ++i) { - val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + val_type = values[i]->type (); equivalent = val_type->equivalent (element_type.in () - ACE_ENV_ARG_PARAMETER); + ); - ACE_CHECK; if (equivalent) { // Destroy any existing members. if (i < this->component_count_) { - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); } this->da_members_[i] = - values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + values[i]->copy (); } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } // Destroy any dangling members. for (CORBA::ULong j = length; j < this->component_count_; ++j) { - this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[j]->destroy (); } // If the array shrinks, we must wait until now to do it. @@ -540,8 +503,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( // **************************************************************** void -TAO_DynSequence_i::from_any (const CORBA::Any & any - ACE_ENV_ARG_DECL) +TAO_DynSequence_i::from_any (const CORBA::Any & any) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -550,14 +512,13 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::TypeCode_var tc = any.type (); CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (equivalent) { @@ -594,8 +555,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any } CORBA::TypeCode_var field_tc = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_element_type (); for (CORBA::ULong i = 0; i < arg_length; ++i) { @@ -609,8 +569,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any if (i < this->component_count_) { - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); } this->da_members_[i] = @@ -621,15 +580,13 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } // Destroy any dangling members. for (CORBA::ULong j = arg_length; j < this->component_count_; ++j) { - this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[j]->destroy (); } // If the array shrinks, we must wait until now to do it. @@ -645,12 +602,12 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } CORBA::Any_ptr -TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::to_any (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -665,15 +622,13 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL) out_cdr.write_ulong (this->component_count_); CORBA::TypeCode_var field_tc = - this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->get_element_type (); for (CORBA::ULong i = 0; i < this->component_count_; ++i) { // Recursive step CORBA::Any_var field_any = - this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->da_members_[i]->to_any (); TAO::Any_Impl *field_impl = field_any->impl (); TAO_OutputCDR field_out; @@ -696,8 +651,7 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (field_tc.in (), &field_cdr, &out_cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } TAO_InputCDR in_cdr (out_cdr); @@ -706,22 +660,19 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retval, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); TAO::Unknown_IDL_Type *unk = 0; ACE_NEW_THROW_EX (unk, TAO::Unknown_IDL_Type (this->type_.in (), in_cdr), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); retval->replace (unk); return retval; } CORBA::Boolean -TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs - ACE_ENV_ARG_DECL) +TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -732,12 +683,10 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs 0); } - CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TypeCode_var tc = rhs->type (); CORBA::Boolean equivalent = tc->equivalent (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!equivalent) { @@ -755,16 +704,13 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs for (CORBA::ULong i = 0; i < this->component_count_; ++i) { rhs->seek (static_cast<CORBA::Long> (i) - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); - tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tmp = rhs->current_component (); // Recursive step. member_equal = tmp->equal (this->da_members_[i].in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!member_equal) { @@ -776,14 +722,14 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynSequence_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::destroy (void) ACE_THROW_SPEC (( CORBA::SystemException )) { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (!this->ref_to_component_ || this->container_is_destroying_) @@ -793,11 +739,9 @@ TAO_DynSequence_i::destroy (ACE_ENV_SINGLE_ARG_DECL) { this->set_flag (da_members_[i].in (), 1 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); } this->destroyed_ = 1; @@ -805,7 +749,7 @@ TAO_DynSequence_i::destroy (ACE_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::current_component (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -826,8 +770,7 @@ TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL) this->set_flag (this->da_members_[index].in (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + ); return DynamicAny::DynAny::_duplicate ( this->da_members_[index].in () diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h index e9763e95e5f..440dd3b3c33 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.h +++ b/TAO/tao/DynamicAny/DynSequence_i.h @@ -53,21 +53,21 @@ public: /// Initialize using just a TypeCode. void init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Initialize using an Any. void init (const CORBA::Any& any - ACE_ENV_ARG_DECL); + ); // = LocalObject methods. static TAO_DynSequence_i *_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // = Functions specific to DynSequence. virtual CORBA::ULong get_length ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -75,7 +75,7 @@ public: virtual void set_length ( CORBA::ULong len - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -83,7 +83,7 @@ public: )); virtual DynamicAny::AnySeq * get_elements ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -91,7 +91,7 @@ public: virtual void set_elements ( const DynamicAny::AnySeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -100,7 +100,7 @@ public: )); virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -108,7 +108,7 @@ public: virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -121,7 +121,7 @@ public: virtual void from_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -130,7 +130,7 @@ public: )); virtual CORBA::Any * to_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -138,21 +138,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -161,7 +161,7 @@ public: private: // Utility, turns the type of elements contained in the sequence. - CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::TypeCode_ptr get_element_type (void); // Called by both versions of init(). void init_common (void); diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp index 017ae3c8797..f6fd98af762 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -25,19 +25,16 @@ TAO_DynStruct_i::~TAO_DynStruct_i (void) } void -TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) +TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc) { - CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc); if (kind == CORBA::tk_struct || kind == CORBA::tk_except) { return; } - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } void @@ -52,37 +49,31 @@ TAO_DynStruct_i::init_common (void) } void -TAO_DynStruct_i::init (const CORBA::Any& any - ACE_ENV_ARG_DECL) +TAO_DynStruct_i::init (const CORBA::Any& any) { CORBA::TypeCode_ptr tc = any._tao_get_typecode (); this->check_typecode (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); this->type_ = CORBA::TypeCode::_duplicate (tc); this->set_from_any (any - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } // This code is common to from_any() and the init() overload that takes // an Any argument. void -TAO_DynStruct_i::set_from_any (const CORBA::Any & any - ACE_ENV_ARG_DECL) +TAO_DynStruct_i::set_from_any (const CORBA::Any & any) { // member_type() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (any._tao_get_typecode () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::ULong numfields = - unaliased_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + unaliased_tc->member_count (); // Resize the array. this->da_members_.size (numfields); @@ -109,9 +100,7 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any } // If we have an exception type, unmarshal the repository ID. - CORBA::TCKind kind = TAO_DynAnyFactory::unalias (any._tao_get_typecode () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind kind = TAO_DynAnyFactory::unalias (any._tao_get_typecode ()); if (kind == CORBA::tk_except) { @@ -123,8 +112,7 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any { CORBA::TypeCode_var field_tc = unaliased_tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Any field_any; TAO_InputCDR unk_in (in); @@ -143,30 +131,24 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &in - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } void -TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) +TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc) { - this->check_typecode (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->check_typecode (tc); this->type_ = CORBA::TypeCode::_duplicate (tc); // member_type() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); this->component_count_ = - unaliased_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + unaliased_tc->member_count (); // Resize the array. this->da_members_.size (this->component_count_); @@ -178,8 +160,7 @@ TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc for (CORBA::ULong i = 0; i < this->component_count_; ++i) { mtype = unaliased_tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Recursively initialize each member. this->da_members_[i] = @@ -192,8 +173,7 @@ TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc // **************************************************************** TAO_DynStruct_i * -TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED) +TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref) { if (CORBA::is_nil (_tao_objref)) { @@ -206,7 +186,7 @@ TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref // **************************************************************** DynamicAny::FieldName -TAO_DynStruct_i::current_member_name (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::current_member_name (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -235,19 +215,17 @@ TAO_DynStruct_i::current_member_name (ACE_ENV_SINGLE_ARG_DECL) // member_name() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); const char *name = unaliased_tc->member_name (this->current_position_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); return CORBA::string_dup (name); } // Returns the unaliased TCKind. CORBA::TCKind -TAO_DynStruct_i::current_member_kind (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::current_member_kind (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -276,22 +254,19 @@ TAO_DynStruct_i::current_member_kind (ACE_ENV_SINGLE_ARG_DECL) // member_type() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + ); CORBA::TypeCode_var tc = unaliased_tc->member_type (this->current_position_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + ); CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + ); return retval; } DynamicAny::NameValuePairSeq * -TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::get_members (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -306,7 +281,6 @@ TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (members, DynamicAny::NameValuePairSeq (this->component_count_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); // We must do this explicitly. members->length (this->component_count_); @@ -316,15 +290,13 @@ TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL) CORBA::TypeCode_var unaliased_tc; CORBA::TCKind const tc_kind = - this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->type_->kind (); if (tc_kind == CORBA::tk_alias) { unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } else { @@ -336,11 +308,9 @@ TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL) { safe_retval[i].id = CORBA::string_dup (unaliased_tc->member_name (i - ACE_ENV_ARG_PARAMETER)); - ACE_CHECK_RETURN (0); + )); - temp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + temp = this->da_members_[i]->to_any (); safe_retval[i].value = temp.in (); } @@ -349,8 +319,7 @@ TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values - ACE_ENV_ARG_DECL) +TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -359,7 +328,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::ULong length = values.length (); @@ -367,7 +336,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values // Check for length match. if (length != this->component_count_) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } CORBA::TypeCode_var value_tc; @@ -377,29 +346,25 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values // member_type() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); for (CORBA::ULong i = 0; i < length; ++i) { // Check for type and name match. my_tc = unaliased_tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); value_tc = values[i].value.type (); equivalent = my_tc->equivalent (value_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!equivalent) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); this->da_members_[i] = TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> ( @@ -411,7 +376,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values } DynamicAny::NameDynAnyPairSeq * -TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::get_members_as_dyn_any (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -426,7 +391,6 @@ TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (members, DynamicAny::NameDynAnyPairSeq (this->component_count_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); // We must do this explicitly. members->length (this->component_count_); @@ -436,27 +400,23 @@ TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) // member_name() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // Assign name and value to each pearl on the string. for (CORBA::ULong i = 0; i < this->component_count_; ++i) { safe_retval[i].id = CORBA::string_dup (unaliased_tc->member_name (i - ACE_ENV_ARG_PARAMETER)); - ACE_CHECK_RETURN (0); + )); // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6). // Set the flag so the caller can't destroy. this->set_flag (this->da_members_[i].in (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); safe_retval[i].value = DynamicAny::DynAny::_duplicate (this->da_members_[i].in ()); - ACE_CHECK_RETURN (0); } return safe_retval._retn (); @@ -465,7 +425,7 @@ TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) void TAO_DynStruct_i::set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & values - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -475,7 +435,7 @@ TAO_DynStruct_i::set_members_as_dyn_any ( { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::ULong length = values.length (); @@ -483,7 +443,7 @@ TAO_DynStruct_i::set_members_as_dyn_any ( // Check for length match. if (length != this->component_count_) { - ACE_THROW (DynamicAny::DynAny::InvalidValue ()); + throw DynamicAny::DynAny::InvalidValue (); } CORBA::TypeCode_var value_tc; @@ -493,34 +453,28 @@ TAO_DynStruct_i::set_members_as_dyn_any ( // member_type() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); for (CORBA::ULong i = 0; i < length; ++i) { // Check for type and name match. my_tc = unaliased_tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - value_tc = values[i].value->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + value_tc = values[i].value->type (); equivalent = my_tc->equivalent (value_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!equivalent) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); this->da_members_[i] = - values[i].value->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + values[i].value->copy (); } this->current_position_ = length ? 0 : -1; @@ -529,8 +483,7 @@ TAO_DynStruct_i::set_members_as_dyn_any ( // **************************************************************** void -TAO_DynStruct_i::from_any (const CORBA::Any & any - ACE_ENV_ARG_DECL) +TAO_DynStruct_i::from_any (const CORBA::Any & any) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -539,14 +492,13 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::TypeCode_var tc = any.type (); CORBA::Boolean equivalent = this->type_->equivalent (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (equivalent) { @@ -572,8 +524,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any // If we have an exception type, unmarshal the repository ID. CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind == CORBA::tk_except) { @@ -584,14 +535,12 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any CORBA::TypeCode_var field_tc; CORBA::TypeCode_var unaliased = TAO::unaliased_typecode (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); for (CORBA::ULong i = 0; i < this->component_count_; ++i) { field_tc = unaliased->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Any field_any; TAO_InputCDR unk_in (in); @@ -601,8 +550,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any unk_in)); field_any.replace (unk); - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); this->da_members_[i] = TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> ( @@ -612,20 +560,19 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &in - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } this->current_position_ = this->component_count_ ? 0 : -1; } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } CORBA::Any_ptr -TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::to_any (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -640,13 +587,11 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL) // If we have an exception type, marshal the repository ID. CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (kind == CORBA::tk_except) { - out_cdr << this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + out_cdr << this->type_->id (); } TAO::Any_Impl *field_impl = 0; @@ -656,13 +601,11 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < this->component_count_; ++i) { CORBA::TypeCode_var field_tc = - this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->da_members_[i]->type (); // Recursive step. CORBA::Any_var field_any = - this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->da_members_[i]->to_any (); TAO_OutputCDR field_out_cdr; field_impl = field_any->impl (); @@ -684,8 +627,7 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (field_tc.in (), &field_in_cdr, &out_cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } TAO_InputCDR in_cdr (out_cdr); @@ -694,22 +636,19 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retval, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); TAO::Unknown_IDL_Type *unk = 0; ACE_NEW_THROW_EX (unk, TAO::Unknown_IDL_Type (this->type_.in (), in_cdr), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); retval->replace (unk); return retval; } CORBA::Boolean -TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs - ACE_ENV_ARG_DECL) +TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -720,12 +659,10 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs 0); } - CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TypeCode_var tc = rhs->type (); CORBA::Boolean equivalent = tc->equivalent (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!equivalent) { @@ -738,16 +675,13 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs for (CORBA::ULong i = 0; i < this->component_count_; ++i) { rhs->seek (static_cast <CORBA::Long> (i) - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); - tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tmp = rhs->current_component (); // Recursive step. member_equal = tmp->equal (this->da_members_[i].in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!member_equal) { @@ -759,14 +693,14 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynStruct_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::destroy (void) ACE_THROW_SPEC (( CORBA::SystemException )) { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (!this->ref_to_component_ || this->container_is_destroying_) @@ -776,11 +710,9 @@ TAO_DynStruct_i::destroy (ACE_ENV_SINGLE_ARG_DECL) { this->set_flag (da_members_[i].in (), 1 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->da_members_[i]->destroy (); } this->destroyed_ = 1; @@ -788,7 +720,7 @@ TAO_DynStruct_i::destroy (ACE_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::current_component (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -816,8 +748,7 @@ TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL) this->set_flag (this->da_members_[index].in (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + ); return DynamicAny::DynAny::_duplicate ( this->da_members_[index].in () diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h index 62e9ecf7e1f..0733c23c2dd 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.h +++ b/TAO/tao/DynamicAny/DynStruct_i.h @@ -53,21 +53,21 @@ public: /// Initialize using just a TypeCode. void init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Initialize using an Any. void init (const CORBA::Any& any - ACE_ENV_ARG_DECL); + ); // = LocalObject methods. static TAO_DynStruct_i *_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // = Functions specific to DynStruct. virtual DynamicAny::FieldName current_member_name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -76,7 +76,7 @@ public: )); virtual CORBA::TCKind current_member_kind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -85,7 +85,7 @@ public: )); virtual DynamicAny::NameValuePairSeq *get_members ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -93,7 +93,7 @@ public: virtual void set_members ( const DynamicAny::NameValuePairSeq& value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -102,7 +102,7 @@ public: )); virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -110,7 +110,7 @@ public: virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -122,7 +122,7 @@ public: virtual void from_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -131,7 +131,7 @@ public: )); virtual CORBA::Any * to_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -139,21 +139,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -163,12 +163,12 @@ public: private: /// Check if the typecode is acceptable. void check_typecode (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Code common to the constructor from an Any arg and the member /// function from_any(). void set_from_any (const CORBA::Any &any - ACE_ENV_ARG_DECL); + ); /// Called by both versions of init(). void init_common (void); diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index 9f649f62e11..54a0af008d1 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -37,18 +37,16 @@ TAO_DynUnion_i::init_common (void) } void -TAO_DynUnion_i::init (const CORBA::Any& any - ACE_ENV_ARG_DECL) +TAO_DynUnion_i::init (const CORBA::Any& any) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind != CORBA::tk_union) { - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } // Initialize the typecode holder. @@ -59,21 +57,18 @@ TAO_DynUnion_i::init (const CORBA::Any& any // Set the from_factory arg to TRUE, so any problems will throw // InconsistentTypeCode. this->set_from_any (any - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void -TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) +TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc) { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind != CORBA::tk_union) { - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } // Initialize the typecode holder and current index. @@ -84,13 +79,11 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc // member_type()/member_label() do not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Any_var first_label = unaliased_tc->member_label (this->current_position_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Initialize the discriminator to the label value of the first member. this->discriminator_ = @@ -100,8 +93,7 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc CORBA::TypeCode_var first_type = unaliased_tc->member_type (this->current_position_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Recursively initialize the member to its default value. this->member_ = @@ -113,8 +105,7 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc // **************************************************************** TAO_DynUnion_i * -TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED) +TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref) { if (CORBA::is_nil (_tao_objref)) { @@ -127,8 +118,7 @@ TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref // This code is common to from_any() and the init() overload that takes // an Any argument. void -TAO_DynUnion_i::set_from_any (const CORBA::Any & any - ACE_ENV_ARG_DECL) +TAO_DynUnion_i::set_from_any (const CORBA::Any & any) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -140,12 +130,10 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any // CORBA::TypeCode_var tc = TAO_DynAnyFactory::strip_alias (any._tao_get_typecode () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::TypeCode_var disc_tc = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + tc->discriminator_type (); CORBA::Any disc_any; TAO::Unknown_IDL_Type *unk = 0; @@ -179,8 +167,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any // Need this here because we might have been called from init(). if (!CORBA::is_nil (this->discriminator_.in ())) { - this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->discriminator_->destroy (); } // Set the discriminator. @@ -192,17 +179,14 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (disc_tc.in (), &in - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::TypeCode_var unaliased = TAO_DynAnyFactory::strip_alias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::ULong const count = - unaliased->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + unaliased->member_count (); CORBA::Boolean match = false; CORBA::ULong i; @@ -211,13 +195,11 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any for (i = 0; i < count; ++i) { CORBA::Any_var label_any = tc->member_label (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); match = this->label_match (label_any.in (), disc_any - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (match) { @@ -228,16 +210,14 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any // Need this here because we might have been called from init(). if (!CORBA::is_nil (this->member_.in ())) { - this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->member_->destroy (); } if (match) { CORBA::TypeCode_var member_tc = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Any member_any; TAO::Unknown_IDL_Type *unk = 0; @@ -261,17 +241,14 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any // default_index() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Long default_index = - unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + unaliased_tc->default_index (); if (default_index == -1) { - set_to_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + set_to_no_active_member (); } else { @@ -279,8 +256,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any CORBA::TypeCode_var default_tc = tc->member_type (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Any default_any; TAO::Unknown_IDL_Type *unk = 0; @@ -302,7 +278,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any // **************************************************************** DynamicAny::DynAny_ptr -TAO_DynUnion_i::get_discriminator (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::get_discriminator (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -317,14 +293,13 @@ TAO_DynUnion_i::get_discriminator (ACE_ENV_SINGLE_ARG_DECL) // Set the flag so the caller can't destroy. this->set_flag (this->discriminator_.in (), 0 - ACE_ENV_ARG_PARAMETER); + ); return DynamicAny::DynAny::_duplicate (this->discriminator_.in ()); } void -TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value - ACE_ENV_ARG_DECL) +TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -332,31 +307,26 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } - CORBA::TypeCode_var tc = value->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::TypeCode_var tc = value->type (); CORBA::TypeCode_var disc_tc = - this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->discriminator_->type (); CORBA::Boolean equivalent = disc_tc->equivalent (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!equivalent) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } - CORBA::Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var value_any = value->to_any (); CORBA::ULong length = - this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->type_->member_count (); CORBA::Any_var label_any; CORBA::ULong i; @@ -364,21 +334,18 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value // member_label() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Boolean match = 0; for (i = 0; i < length; ++i) { label_any = unaliased_tc->member_label (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); match = this->label_match (label_any.in (), value_any.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (match) { @@ -397,17 +364,14 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value // If we got a match, a named member will be active. this->discriminator_->from_any (label_any.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // member_type() does not work with aliased type codes. CORBA::TypeCode_var member_tc = unaliased_tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->member_->destroy (); // Initialize member to default value. this->member_ = @@ -426,25 +390,21 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value // default_index() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // If no match, either the default member or no member is active. CORBA::Long default_index = - unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + unaliased_tc->default_index (); if (default_index == -1) { // This can't throw InvalidValue - if there's no default case // and all possible labels are used, we'd have had a match above. - this->set_to_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->set_to_no_active_member (); } else { - this->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->set_to_default_member (); this->member_slot_ = static_cast<CORBA::ULong> (default_index); } @@ -452,15 +412,13 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value // If we get here, we update the discriminator no matter what. // Any value will correspond to one of the three cases above. - this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->discriminator_->destroy (); - this->discriminator_ = value->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->discriminator_ = value->copy (); } void -TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::set_to_default_member (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -468,23 +426,21 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL) { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } // default_index() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Long default_index = - unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + unaliased_tc->default_index (); if (default_index == -1) { // No explicit default case. - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } else { @@ -492,11 +448,9 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL) CORBA::TypeCode_var default_tc = unaliased_tc->member_type (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->member_->destroy (); this->member_ = TAO::MakeDynAnyUtils::make_dyn_any_t<CORBA::TypeCode_ptr> ( @@ -512,7 +466,7 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::set_to_no_active_member (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -520,49 +474,43 @@ TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL) { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } // default_index() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Long default_index = - unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + unaliased_tc->default_index (); // Throw an exception is there is an explicit default case or if all // possible case label values are used. if (default_index != -1) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } else { CORBA::TypeCode_var disc_tc = - this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->discriminator_->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (disc_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (kind == CORBA::tk_enum) { CORBA::ULong const member_count = - this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->type_->member_count (); CORBA::ULong const label_count = - disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + disc_tc->member_count (); if (member_count == label_count) { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } } @@ -573,7 +521,7 @@ TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Boolean -TAO_DynUnion_i::has_no_active_member (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::has_no_active_member (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -590,7 +538,7 @@ TAO_DynUnion_i::has_no_active_member (ACE_ENV_SINGLE_ARG_DECL) } CORBA::TCKind -TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::discriminator_kind (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -602,18 +550,16 @@ TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_var tc = - this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + this->discriminator_->type (); CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + ); return retval; } DynamicAny::DynAny_ptr -TAO_DynUnion_i::member (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::member (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue @@ -626,8 +572,7 @@ TAO_DynUnion_i::member (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Boolean has_no_active_member = - this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + this->has_no_active_member (); if (has_no_active_member) { @@ -639,14 +584,13 @@ TAO_DynUnion_i::member (ACE_ENV_SINGLE_ARG_DECL) // Set the flag so the caller can't destroy. this->set_flag (this->member_.in (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + ); return DynamicAny::DynAny::_duplicate (this->member_.in ()); } char * -TAO_DynUnion_i::member_name (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::member_name (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue @@ -659,8 +603,7 @@ TAO_DynUnion_i::member_name (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Boolean has_no_active_member = - this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->has_no_active_member (); if (has_no_active_member) { @@ -669,14 +612,13 @@ TAO_DynUnion_i::member_name (ACE_ENV_SINGLE_ARG_DECL) } const char *retval = this->type_->member_name (this->member_slot_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); return CORBA::string_dup (retval); } CORBA::TCKind -TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::member_kind (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue @@ -689,8 +631,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Boolean has_no_active_member = - this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + this->has_no_active_member (); if (has_no_active_member) { @@ -699,12 +640,10 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_var tc = - this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + this->member_->type (); CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::tk_null); + ); return retval; } @@ -712,8 +651,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL) // **************************************************************** void -TAO_DynUnion_i::from_any (const CORBA::Any& any - ACE_ENV_ARG_DECL) +TAO_DynUnion_i::from_any (const CORBA::Any& any) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -722,14 +660,13 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } CORBA::TypeCode_var tc = any.type (); CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (equivalent) { @@ -742,17 +679,16 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any // Set the from_factory arg to FALSE, so any problems will throw // TypeMismatch. this->set_from_any (any - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { - ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); + throw (DynamicAny::DynAny::TypeMismatch ()); } } CORBA::Any_ptr -TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::to_any (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -768,12 +704,10 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL) // Add the discriminator to the CDR stream. CORBA::TypeCode_var disc_tc = - this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->discriminator_->type (); CORBA::Any_var disc_any = - this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->discriminator_->to_any (); TAO::Any_Impl *disc_any_impl = disc_any->impl (); TAO_OutputCDR disc_out_cdr; @@ -796,19 +730,16 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (disc_tc.in (), &disc_in_cdr, &out_cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // Add the member to the CDR stream unless it has no active member. if (this->has_no_active_member () == 0) { CORBA::TypeCode_var member_tc = - this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->member_->type (); CORBA::Any_var member_any = - this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->member_->to_any (); TAO::Any_Impl *member_any_impl = member_any->impl (); TAO_OutputCDR member_out_cdr; @@ -831,8 +762,7 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (member_tc.in (), &member_in_cdr, &out_cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } // Make the Any. @@ -842,22 +772,19 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retval, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); TAO::Unknown_IDL_Type *unk = 0; ACE_NEW_THROW_EX (unk, TAO::Unknown_IDL_Type (this->type_.in (), in_cdr), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); retval->replace (unk); return retval; } CORBA::Boolean -TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs - ACE_ENV_ARG_DECL) +TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -869,8 +796,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs } TAO_DynUnion_i *impl = TAO_DynUnion_i::_narrow (rhs - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (impl == 0) { @@ -878,9 +804,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs } CORBA::Boolean equivalent = - this->type_->equivalent (impl->type_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->type_->equivalent (impl->type_.in ()); if (!equivalent) { @@ -888,14 +812,10 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs } CORBA::Boolean member_equal = - this->member_->equal (impl->member_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->member_->equal (impl->member_.in ()); CORBA::Boolean disc_equal = - this->discriminator_->equal (impl->discriminator_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->discriminator_->equal (impl->discriminator_.in ()); impl->_remove_ref (); @@ -903,14 +823,14 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynUnion_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::destroy (void) ACE_THROW_SPEC (( CORBA::SystemException )) { if (this->destroyed_) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw ::CORBA::OBJECT_NOT_EXIST (); } if (!this->ref_to_component_ || this->container_is_destroying_) @@ -919,26 +839,22 @@ TAO_DynUnion_i::destroy (ACE_ENV_SINGLE_ARG_DECL) this->set_flag (this->member_.in (), 1 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->member_->destroy (); this->set_flag (this->discriminator_.in (), 1 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->discriminator_->destroy (); this->destroyed_ = 1; } } DynamicAny::DynAny_ptr -TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::current_component (void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -954,8 +870,7 @@ TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL) { this->set_flag (this->member_.in (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + ); return DynamicAny::DynAny::_duplicate (this->member_.in ()); } @@ -963,8 +878,7 @@ TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL) { this->set_flag (this->discriminator_.in (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); + ); return DynamicAny::DynAny::_duplicate (this->discriminator_.in ()); } @@ -975,7 +889,7 @@ TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynUnion_i::label_match (const CORBA::Any &my_any, const CORBA::Any &other_any - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -986,8 +900,7 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any, CORBA::TypeCode_var tc = my_any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // No need to do any type checking - it was done before this // call was made. diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h index e3498b65ef9..28ac989dd3b 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.h +++ b/TAO/tao/DynamicAny/DynUnion_i.h @@ -51,20 +51,20 @@ public: ~TAO_DynUnion_i (void); /// Constructor taking an Any argument. - void init (const CORBA::Any& any ACE_ENV_ARG_DECL); + void init (const CORBA::Any& any); /// Constructor taking a typecode argument. - void init (CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL); + void init (CORBA::TypeCode_ptr tc); // = LocalObject methods. static TAO_DynUnion_i *_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // = Functions specific to DynUnion. virtual DynamicAny::DynAny_ptr get_discriminator ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -72,7 +72,7 @@ public: virtual void set_discriminator ( DynamicAny::DynAny_ptr d - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -80,7 +80,7 @@ public: )); virtual void set_to_default_member ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -88,7 +88,7 @@ public: )); virtual void set_to_no_active_member ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -96,21 +96,21 @@ public: )); virtual CORBA::Boolean has_no_active_member ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::TCKind discriminator_kind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr member ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -118,7 +118,7 @@ public: )); virtual char * member_name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -126,7 +126,7 @@ public: )); virtual CORBA::TCKind member_kind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -137,7 +137,7 @@ public: virtual void from_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -146,7 +146,7 @@ public: )); virtual CORBA::Any * to_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException @@ -154,21 +154,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, @@ -179,7 +179,7 @@ private: /// Code common to the constructor from an Any arg and the member /// function from_any(). void set_from_any (const CORBA::Any &any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -192,7 +192,7 @@ private: /// Iterative check for label value match. CORBA::Boolean label_match (const CORBA::Any &my_any, const CORBA::Any &other_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp index d11b799ccde..b5183908461 100644 --- a/TAO/tao/DynamicAny/DynValueBox_i.cpp +++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp @@ -18,7 +18,7 @@ TAO_DynValueBox_i::~TAO_DynValueBox_i (void) CORBA::Any * TAO_DynValueBox_i::get_boxed_value ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -31,7 +31,7 @@ TAO_DynValueBox_i::get_boxed_value ( void TAO_DynValueBox_i::set_boxed_value ( const CORBA::Any & /* boxed */ - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -39,12 +39,12 @@ TAO_DynValueBox_i::set_boxed_value ( DynamicAny::DynAny::InvalidValue )) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } DynamicAny::DynAny_ptr TAO_DynValueBox_i::get_boxed_value_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -58,14 +58,14 @@ TAO_DynValueBox_i::get_boxed_value_as_dyn_any ( void TAO_DynValueBox_i::set_boxed_value_as_dyn_any ( DynamicAny::DynAny_ptr /* boxed */ - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch )) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynValueBox_i.h b/TAO/tao/DynamicAny/DynValueBox_i.h index b2ca46aec92..4a8bd9c6895 100644 --- a/TAO/tao/DynamicAny/DynValueBox_i.h +++ b/TAO/tao/DynamicAny/DynValueBox_i.h @@ -45,34 +45,34 @@ public: ~TAO_DynValueBox_i (void); virtual CORBA::Any * get_boxed_value ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue )); - + virtual void set_boxed_value ( const CORBA::Any & boxed - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, DynamicAny::DynAny::InvalidValue )); - + virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue )); - + virtual void set_boxed_value_as_dyn_any ( DynamicAny::DynAny_ptr boxed - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp index ba824c12188..6f0aabaaccc 100644 --- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp +++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp @@ -18,32 +18,32 @@ TAO_DynValueCommon_i::~TAO_DynValueCommon_i (void) CORBA::Boolean TAO_DynValueCommon_i::is_null ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false); } - + void TAO_DynValueCommon_i::set_to_null ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC (( CORBA::SystemException )) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } - + void TAO_DynValueCommon_i::set_to_value ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC (( CORBA::SystemException )) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.h b/TAO/tao/DynamicAny/DynValueCommon_i.h index 67fb719f242..654619bcc04 100644 --- a/TAO/tao/DynamicAny/DynValueCommon_i.h +++ b/TAO/tao/DynamicAny/DynValueCommon_i.h @@ -43,21 +43,21 @@ public: TAO_DynValueCommon_i (void); ~TAO_DynValueCommon_i (void); - + virtual CORBA::Boolean is_null ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void set_to_null ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void set_to_value ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp index 60bcd9dd209..2db1ded4b65 100644 --- a/TAO/tao/DynamicAny/DynValue_i.cpp +++ b/TAO/tao/DynamicAny/DynValue_i.cpp @@ -18,7 +18,7 @@ TAO_DynValue_i::~TAO_DynValue_i (void) char * TAO_DynValue_i::current_member_name ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -30,7 +30,7 @@ TAO_DynValue_i::current_member_name ( CORBA::TCKind TAO_DynValue_i::current_member_kind ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -43,7 +43,7 @@ TAO_DynValue_i::current_member_kind ( DynamicAny::NameValuePairSeq * TAO_DynValue_i::get_members ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -54,19 +54,19 @@ TAO_DynValue_i::get_members ( void TAO_DynValue_i::set_members ( const DynamicAny::NameValuePairSeq & /* value */ - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, DynamicAny::DynAny::InvalidValue )) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } DynamicAny::NameDynAnyPairSeq * TAO_DynValue_i::get_members_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -77,14 +77,14 @@ TAO_DynValue_i::get_members_as_dyn_any ( void TAO_DynValue_i::set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & /* value */ - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, DynamicAny::DynAny::InvalidValue )) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynValue_i.h b/TAO/tao/DynamicAny/DynValue_i.h index ebcba525df5..205073b735c 100644 --- a/TAO/tao/DynamicAny/DynValue_i.h +++ b/TAO/tao/DynamicAny/DynValue_i.h @@ -45,45 +45,45 @@ public: ~TAO_DynValue_i (void); virtual char * current_member_name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, DynamicAny::DynAny::InvalidValue )); - + virtual CORBA::TCKind current_member_kind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, DynamicAny::DynAny::InvalidValue )); - + virtual DynamicAny::NameValuePairSeq * get_members ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void set_members ( const DynamicAny::NameValuePairSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, DynamicAny::DynAny::InvalidValue )); - + virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp index 2bf234a3a27..99c4133f520 100644 --- a/TAO/tao/DynamicAny/DynamicAny.cpp +++ b/TAO/tao/DynamicAny/DynamicAny.cpp @@ -23,8 +23,7 @@ TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void) CORBA::Object_ptr TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr, int, - ACE_TCHAR *[] - ACE_ENV_ARG_DECL_NOT_USED) + ACE_TCHAR *[]) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h index 652f52939f9..cf5aa46991c 100644 --- a/TAO/tao/DynamicAny/DynamicAny.h +++ b/TAO/tao/DynamicAny/DynamicAny.h @@ -39,8 +39,7 @@ public: /// Creates a DynamicAny factory and returns it. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL_NOT_USED) + ACE_TCHAR *argv []) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to force the initialization of the ORB code. diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index f437ba7fb80..dde0661c6fe 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -44,7 +44,7 @@ CORBA::Context::_decr_refcnt (void) } const char * -CORBA::Context::context_name (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::Context::context_name (void) const { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO), @@ -52,7 +52,7 @@ CORBA::Context::context_name (ACE_ENV_SINGLE_ARG_DECL) const } CORBA::Context_ptr -CORBA::Context::parent (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::Context::parent (void) const { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO), @@ -61,47 +61,37 @@ CORBA::Context::parent (ACE_ENV_SINGLE_ARG_DECL) const void CORBA::Context::create_child (const char * /* child_ctx_name */, - CORBA::Context_out /* child_ctx */ - ACE_ENV_ARG_DECL) + CORBA::Context_out /* child_ctx */) { - ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID, - CORBA::COMPLETED_NO)); + throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO); } void CORBA::Context::set_one_value (const char * /* propname */, - const CORBA::Any & /* propvalue */ - ACE_ENV_ARG_DECL) + const CORBA::Any & /* propvalue */) { - ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID, - CORBA::COMPLETED_NO)); + throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO); } void -CORBA::Context::set_values (CORBA::NVList_ptr - ACE_ENV_ARG_DECL) +CORBA::Context::set_values (CORBA::NVList_ptr) { - ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID, - CORBA::COMPLETED_NO)); + throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO); } void -CORBA::Context::delete_values (const char * /* propname */ - ACE_ENV_ARG_DECL) +CORBA::Context::delete_values (const char * /* propname */) { - ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID, - CORBA::COMPLETED_NO)); + throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO); } void CORBA::Context::get_values (const char * /* start_scope */, CORBA::Flags /* op_flags */, const char * /* pattern */, - CORBA::NVList_ptr & /* values */ - ACE_ENV_ARG_DECL) + CORBA::NVList_ptr & /* values */) { - ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID, - CORBA::COMPLETED_NO)); + throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO); } CORBA::ContextList::ContextList (CORBA::ULong len, @@ -142,8 +132,7 @@ CORBA::ContextList::add_consume (char *ctx) } char * -CORBA::ContextList::item (CORBA::ULong slot - ACE_ENV_ARG_DECL) +CORBA::ContextList::item (CORBA::ULong slot) { char **ctx = 0; @@ -159,10 +148,9 @@ CORBA::ContextList::item (CORBA::ULong slot } void -CORBA::ContextList::remove (CORBA::ULong - ACE_ENV_ARG_DECL) +CORBA::ContextList::remove (CORBA::ULong) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } CORBA::ContextList_ptr diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 7ad9c97795d..8be691e8c81 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -53,8 +53,6 @@ namespace CORBA class NVList; typedef NVList *NVList_ptr; - class Environment; - typedef TAO_Pseudo_Var_T<Context> Context_var; typedef TAO_Pseudo_Out_T<Context> Context_out; @@ -92,29 +90,29 @@ namespace CORBA // = All the spec-required functions below will just throw a // CORBA::NO_IMPLEMENT exception and do nothing else. - const char *context_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + const char *context_name (void) const; - CORBA::Context_ptr parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::Context_ptr parent (void) const; void create_child (const char *child_ctx_name, CORBA::Context_out child_ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void set_one_value (const char *propname, const CORBA::Any &propvalue - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void set_values (CORBA::NVList_ptr values - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void delete_values (const char *propname - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void get_values (const char *start_scope, CORBA::Flags op_flags, const char *pattern, CORBA::NVList_ptr &values - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // Useful for template programming. typedef CORBA::Context_ptr _ptr_type; @@ -170,11 +168,11 @@ namespace CORBA /// Return the typecode at slot i. Raises the "Bounds" exception. char *item (CORBA::ULong slot - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Remove the typecode at slot i. Raises the "Bounds" exception. void remove (CORBA::ULong slot - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Increment and decrement ref counts. void _incr_refcnt (void); diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp index 3118f59a81d..3ecfa63d85b 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp @@ -24,26 +24,22 @@ namespace TAO CORBA::Boolean NamedValue_Argument::demarshal (TAO_InputCDR &cdr) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (this->x_ !=0 && this->x_->value ()->impl ()) { this->x_->value ()->impl ()->_tao_decode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - return 0; + return false; } - ACE_ENDTRY; - ACE_CHECK_RETURN (false); this->byte_order_ = cdr.byte_order (); - return 1; + return true; } void @@ -57,30 +53,25 @@ namespace TAO CORBA::Boolean NVList_Argument::marshal (TAO_OutputCDR &cdr) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->x_->_tao_encode (cdr, CORBA::ARG_IN | CORBA::ARG_INOUT - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - return 0; + return false; } - ACE_ENDTRY; - ACE_CHECK_RETURN (false); - return 1; + return true; } CORBA::Boolean NVList_Argument::demarshal (TAO_InputCDR &cdr) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Now, get all the "return", "out", and "inout" parameters // from the response message body ... return parameter is @@ -92,17 +83,14 @@ namespace TAO cdr, CORBA::ARG_OUT | CORBA::ARG_INOUT, this->lazy_evaluation_ - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - return 0; + return false; } - ACE_ENDTRY; - ACE_CHECK_RETURN (false); - return 1; + return true; } void diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp index ec8e6788bef..c0a8fca220d 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp @@ -16,9 +16,7 @@ void TAO_DII_Arguments_Converter_Impl::convert ( TAO_ServerRequest & server_request, TAO::Argument * const args[], - size_t nargs - ACE_ENV_ARG_DECL - ) + size_t nargs) { // The DII requests on client side always have two arguments // - one is the return argument and the other is NVList_Argument. @@ -34,14 +32,14 @@ TAO_DII_Arguments_Converter_Impl::convert ( // get_in_arg () from the oneway operation with multiple "IN" // parameters. CORBA::NVList_ptr lst - = static_cast<TAO::NVList_Argument *> (server_request.operation_details ()->args()[1])->arg (); + = static_cast<TAO::NVList_Argument *> ( + server_request.operation_details ()->args()[1])->arg (); - CORBA::ULong const sz = lst->count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::ULong const sz = lst->count (); if (sz != nargs - 1) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); } // To avoid the use of extraction operators on CORBA::Any, we will @@ -50,12 +48,11 @@ TAO_DII_Arguments_Converter_Impl::convert ( TAO_OutputCDR output; for (CORBA::ULong i = 0; i < sz; ++i) { - CORBA::NamedValue_ptr theitem = lst->item (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::NamedValue_ptr theitem = lst->item (i); if (!(theitem->value ()->impl ()->marshal_value (output))) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw ::CORBA::BAD_PARAM (); } } @@ -64,7 +61,7 @@ TAO_DII_Arguments_Converter_Impl::convert ( { if (!(args[j + 1]->demarshal (input))) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw ::CORBA::BAD_PARAM (); } } diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h index 682c636b9dd..9d9f9e360e8 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h +++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h @@ -34,19 +34,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief DII_Arguments_Converter_Impl. * - * This class provides the implementation to expand the DII arguments in NVList - * to the list of arguments. + * This class provides the implementation to expand the DII arguments in NVList + * to the list of arguments. */ class TAO_DynamicInterface_Export TAO_DII_Arguments_Converter_Impl : public TAO_DII_Arguments_Converter { public: - virtual void convert ( TAO_ServerRequest & server_request, - TAO::Argument * const args[], - size_t nargs - ACE_ENV_ARG_DECL ); - + virtual void convert (TAO_ServerRequest & server_request, + TAO::Argument * const args[], + size_t nargs); + // Used to force the initialization of the ORB code. static int Initializer (void); }; diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index 9e7d14808c8..0035b79a946 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -48,13 +48,12 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 Dynamic::ParameterList * - DII_Invocation::arguments (ACE_ENV_SINGLE_ARG_DECL) + DII_Invocation::arguments (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_RequestInfo_Util::make_parameter_list (); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -75,17 +74,14 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ Invocation_Status - DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time) ACE_THROW_SPEC ((CORBA::Exception)) { - return Synch_Twoway_Invocation::remote_twoway (max_wait_time - ACE_ENV_ARG_PARAMETER); + return Synch_Twoway_Invocation::remote_twoway (max_wait_time); } Invocation_Status - DII_Invocation::handle_user_exception (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + DII_Invocation::handle_user_exception (TAO_InputCDR &cdr) ACE_THROW_SPEC ((CORBA::Exception)) { Reply_Guard mon (this, @@ -121,11 +117,9 @@ namespace TAO { CORBA::TypeCode_var tc = this->excp_list_->item (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); - const char *xid = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + const char *xid = tc->id (); if (ACE_OS::strcmp (buf.in (), xid) != 0) { @@ -156,7 +150,6 @@ namespace TAO // are being used in a TAO gateway. this->host_->raw_user_exception (cdr); - mon.set_status (TAO_INVOKE_USER_EXCEPTION); // @@ It would seem that if the remote exception is a @@ -184,19 +177,17 @@ namespace TAO response_expected) , host_ (req) { - } #if TAO_HAS_INTERCEPTORS == 1 //@NOTE: Need to figure a way to share this code Dynamic::ParameterList * - DII_Deferred_Invocation::arguments (ACE_ENV_SINGLE_ARG_DECL) + DII_Deferred_Invocation::arguments (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_RequestInfo_Util::make_parameter_list (); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -217,17 +208,12 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1*/ Invocation_Status - DII_Deferred_Invocation::remote_invocation ( - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL - ) + DII_Deferred_Invocation::remote_invocation (ACE_Time_Value *max_wait_time) ACE_THROW_SPEC ((CORBA::Exception)) { this->safe_rd_->transport (this->resolver_.transport ()); - return Asynch_Remote_Invocation::remote_invocation ( - max_wait_time - ACE_ENV_ARG_PARAMETER); + return Asynch_Remote_Invocation::remote_invocation (max_wait_time); } } diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h index ba3a5a6be66..11bb74a18dc 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.h +++ b/TAO/tao/DynamicInterface/DII_Invocation.h @@ -39,8 +39,6 @@ namespace Dynamic namespace TAO { - /** - */ class TAO_DynamicInterface_Export DII_Invocation: public Synch_Twoway_Invocation { @@ -55,20 +53,14 @@ namespace TAO bool response_expected = true); #if TAO_HAS_INTERCEPTORS ==1 - virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL) + virtual Dynamic::ParameterList *arguments (void) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /*TAO_HAS_INTERCEPTORS == 1*/ - Invocation_Status remote_invocation ( - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL - ) + Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time) ACE_THROW_SPEC ((CORBA::Exception)); - virtual Invocation_Status handle_user_exception ( - TAO_InputCDR &cdr - ACE_ENV_ARG_DECL - ) + virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr) ACE_THROW_SPEC ((CORBA::Exception)); private: @@ -79,10 +71,6 @@ namespace TAO }; - - /* - * - */ class TAO_DynamicInterface_Export DII_Deferred_Invocation : public Asynch_Remote_Invocation { @@ -97,14 +85,11 @@ namespace TAO bool response_expected = true); #if TAO_HAS_INTERCEPTORS ==1 - virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL) + virtual Dynamic::ParameterList *arguments (void) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /*TAO_HAS_INTERCEPTORS == 1*/ - Invocation_Status remote_invocation ( - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL - ) + Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time) ACE_THROW_SPEC ((CORBA::Exception)); private: diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index 441c1df2f92..81fcbd730fe 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -51,7 +51,7 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL) + ) { // Simple sanity check if (this->mode_ != TAO_DII_INVOCATION || @@ -76,8 +76,7 @@ namespace TAO Invocation_Status status = synch.remote_invocation (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); if (status == TAO_INVOKE_RESTART && @@ -95,8 +94,7 @@ namespace TAO this->object_forwarded (effective_target, r.stub (), permanent_forward - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); } return status; } @@ -131,7 +129,7 @@ namespace TAO DII_Deferred_Invocation_Adapter::invoke ( TAO::Exception_Data *ex, unsigned long ex_count - ACE_ENV_ARG_DECL) + ) { // New reply dispatcher on the heap, because we will go out of // scope and hand over the reply dispatcher to the ORB. @@ -144,8 +142,7 @@ namespace TAO Invocation_Adapter::invoke (ex, ex_count - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } Invocation_Status @@ -154,7 +151,7 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL) + ) { // Simple sanity check if (this->mode_ != TAO_DII_DEFERRED_INVOCATION || @@ -180,8 +177,7 @@ namespace TAO Invocation_Status status = synch.remote_invocation (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); if (status == TAO_INVOKE_RESTART) { diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index ac5b8e9dfd7..88a1df41668 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -35,7 +35,6 @@ class TAO_DII_Deferred_Reply_Dispatcher; namespace CORBA { class Object; - class Environment; class SystemException; class ExceptionList; class Request; @@ -98,7 +97,7 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL); + ); private: @@ -135,7 +134,7 @@ namespace TAO /// Invoke the target virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count - ACE_ENV_ARG_DECL); + ); protected: @@ -144,7 +143,7 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL); + ); private: CORBA::Request *request_; diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index 877570d611a..c7697dc7c15 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -79,15 +79,14 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( ACE_TEXT ("(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n"))); } - ACE_TRY_NEW_ENV + try { // Call the Request back and send the reply data. this->req_->handle_response (this->reply_cdr_, this->reply_status_ - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) { @@ -95,7 +94,6 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( "Exception during reply handler"); } } - ACE_ENDTRY; // This was dynamically allocated. Now the job is done. (void) this->decr_refcount (); @@ -106,9 +104,8 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( void TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Generate a fake exception.... CORBA::COMM_FAILURE comm_failure (0, @@ -117,18 +114,16 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) TAO_OutputCDR out_cdr; comm_failure._tao_encode (out_cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // Turn into an output CDR TAO_InputCDR cdr (out_cdr); this->req_->handle_response (cdr, TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) { @@ -138,8 +133,6 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) ); } } - ACE_ENDTRY; - ACE_CHECK; (void) this->decr_refcount (); } diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h index cb450106c5d..920915558cb 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h @@ -57,9 +57,7 @@ public: /// The following methods are not needed for this class.. virtual void reply_timed_out (void) {} - virtual long schedule_timer (CORBA::ULong , - const ACE_Time_Value & - ACE_ENV_ARG_DECL_NOT_USED) + virtual long schedule_timer (CORBA::ULong , const ACE_Time_Value &) { return 0; } diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index a23c6c4e06e..fba11751451 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -29,7 +29,7 @@ TAO_Dynamic_Adapter_Impl::create_request ( CORBA::ExceptionList_ptr exceptions, CORBA::Request_ptr &request, CORBA::Flags req_flags - ACE_ENV_ARG_DECL + ) { ACE_NEW_THROW_EX (request, @@ -40,7 +40,7 @@ TAO_Dynamic_Adapter_Impl::create_request ( result, req_flags, exceptions - ACE_ENV_ARG_PARAMETER), + ), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, @@ -54,14 +54,14 @@ CORBA::Request_ptr TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const char *operation - ACE_ENV_ARG_DECL) + ) { CORBA::Request_ptr req = CORBA::Request::_nil (); ACE_NEW_THROW_EX (req, CORBA::Request (obj, orb, operation - ACE_ENV_ARG_PARAMETER), + ), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, @@ -69,7 +69,6 @@ TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj, ), CORBA::COMPLETED_MAYBE )); - ACE_CHECK_RETURN (CORBA::Request::_nil ()); return req; } @@ -122,7 +121,7 @@ TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req) void TAO_Dynamic_Adapter_Impl::create_exception_list ( CORBA::ExceptionList_ptr &list - ACE_ENV_ARG_DECL + ) { ACE_NEW_THROW_EX (list, diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h index 9537488f66c..96e66e9dafc 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h @@ -58,12 +58,12 @@ public: CORBA::ExceptionList_ptr exceptions, CORBA::Request_ptr &request, CORBA::Flags req_flags - ACE_ENV_ARG_DECL); + ); virtual CORBA::Request_ptr request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const char *op - ACE_ENV_ARG_DECL); + ); // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest. @@ -82,7 +82,7 @@ public: // CORBA::ORB::create_exception_list. virtual void create_exception_list (CORBA::ExceptionList_ptr &list - ACE_ENV_ARG_DECL); + ); // Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index 6e09d9ff5fa..be9247638db 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -20,24 +20,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean TAO_DynamicImplementation::_is_a (const char *logical_type_id - ACE_ENV_ARG_DECL) + ) { CORBA::RepositoryId_var id = - this->get_id_from_primary_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->get_id_from_primary_interface (); return ACE_OS::strcmp (logical_type_id, id.in ()) == 0; } CORBA::Object_ptr -TAO_DynamicImplementation::_this (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynamicImplementation::_this (void) { // The _this() function returns a CORBA::Object_ptr for the target // object. Unlike _this() for static skeletons, its return type is // not interface-specific because a DSI servant may very well // incarnate multiple CORBA objects of different types. - TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + TAO_Stub *stub = this->_create_stub (); // Create a object. CORBA::Object_ptr retval = CORBA::Object::_nil (); @@ -51,7 +49,7 @@ TAO_DynamicImplementation::_this (ACE_ENV_SINGLE_ARG_DECL) } CORBA::InterfaceDef_ptr -TAO_DynamicImplementation::_get_interface (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynamicImplementation::_get_interface (void) { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -65,14 +63,13 @@ TAO_DynamicImplementation::_get_interface (ACE_ENV_SINGLE_ARG_DECL) } CORBA::RepositoryId_var id = - this->get_id_from_primary_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->get_id_from_primary_interface (); // This doesn't take multiple ORBs into account, but it's being // used only to resolve the IFR, so we should be ok. return adapter->get_interface (TAO_ORB_Core_instance ()->orb (), id.in () - ACE_ENV_ARG_PARAMETER); + ); } const char * @@ -92,7 +89,7 @@ TAO_DynamicImplementation::_downcast (const char *repository_id) } TAO_Stub * -TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL) +TAO_DynamicImplementation::_create_stub (void) { // If DynamicImplementation::_this() is invoked outside of the // context of a request invocation on a target object being served @@ -115,27 +112,24 @@ TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL) CORBA::PolicyList_var client_exposed_policies = poa_current_impl->poa ()->client_exposed_policies ( poa_current_impl->priority () - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (0); CORBA::RepositoryId_var pinterface = this->_primary_interface (poa_current_impl->object_id (), poa.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); return poa_current_impl->poa ()->key_to_stub (poa_current_impl->object_key (), pinterface.in (), poa_current_impl->priority () - ACE_ENV_ARG_PARAMETER); + ); } void TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, void * /* context */ - ACE_ENV_ARG_DECL) + ) { // No need to do any of this if the client isn't waiting. if (request.response_expected ()) @@ -163,21 +157,19 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, ACE_NEW (dsi_request, CORBA::ServerRequest (request)); - ACE_TRY + try { // Delegate to user. this->invoke (dsi_request - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // Only if the client is waiting. if (request.response_expected () && !request.sync_with_server ()) { - dsi_request->dsi_marshal (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dsi_request->dsi_marshal (); } } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception& ex) { // Only if the client is waiting. if (request.response_expected () && !request.sync_with_server ()) @@ -185,14 +177,13 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, request.tao_send_reply_exception (ex); } } - ACE_ENDTRY; ::CORBA::release (dsi_request); } CORBA::RepositoryId TAO_DynamicImplementation::get_id_from_primary_interface ( - ACE_ENV_SINGLE_ARG_DECL + ) { // If this method is called outside of the @@ -215,7 +206,7 @@ TAO_DynamicImplementation::get_id_from_primary_interface ( return this->_primary_interface (poa_current_impl->object_id (), poa.in () - ACE_ENV_ARG_PARAMETER); + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index b9c17c21ea2..53b700b7c6e 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -60,7 +60,7 @@ public: /// incarnated by the DSI servant and performs the processing /// necessary to execute the request. virtual void invoke (CORBA::ServerRequest_ptr request - ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ) = 0; /// The _primary_interface() method receives an ObjectId value and a /// POA_ptr as input parameters and returns a valid RepositoryId @@ -68,19 +68,19 @@ public: virtual CORBA::RepositoryId _primary_interface ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) = 0; /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char *logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Returns a CORBA::Object_ptr for the target object. - CORBA::Object_ptr _this (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::Object_ptr _this (void); /// Query the Interface Repository for the interface definition. virtual CORBA::InterfaceDef_ptr _get_interface ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); protected: @@ -92,17 +92,17 @@ protected: virtual void *_downcast (const char *repository_id); /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual TAO_Stub *_create_stub (void); /// Turns around and calls invoke. virtual void _dispatch (TAO_ServerRequest &request, void *context - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); private: /// Encapsulates code common to _is_a(), _get_interface() and _create_stub(). CORBA::RepositoryId get_id_from_primary_interface ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); }; diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 18de9aee9d0..ee0c7c39354 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -52,8 +52,7 @@ CORBA::ExceptionList::add_consume (CORBA::TypeCode_ptr tc) } CORBA::TypeCode_ptr -CORBA::ExceptionList::item (CORBA::ULong slot - ACE_ENV_ARG_DECL) +CORBA::ExceptionList::item (CORBA::ULong slot) { CORBA::TypeCode_ptr *tc = 0; @@ -69,10 +68,9 @@ CORBA::ExceptionList::item (CORBA::ULong slot } void -CORBA::ExceptionList::remove (CORBA::ULong - ACE_ENV_ARG_DECL) +CORBA::ExceptionList::remove (CORBA::ULong) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } CORBA::ExceptionList_ptr @@ -97,7 +95,7 @@ CORBA::ExceptionList::_incr_refcnt (void) void CORBA::ExceptionList::_decr_refcnt (void) { - CORBA::ULong refcount = --this->ref_count_; + CORBA::ULong const refcount = --this->ref_count_; if (refcount == 0) { diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index f88c3eca2d8..1fd0259e5d0 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -97,12 +97,10 @@ namespace CORBA void add_consume (CORBA::TypeCode_ptr tc); /// Return the typecode at slot i. Raises the "Bounds" exception. - CORBA::TypeCode_ptr item (CORBA::ULong slot - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::TypeCode_ptr item (CORBA::ULong slot); /// Remove the typecode at slot i. Raises the "Bounds" exception. - void remove (CORBA::ULong slot - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + void remove (CORBA::ULong slot); /// Increment and decrement ref counts. void _incr_refcnt (void); diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 34519883c93..0583a1769e7 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -68,7 +68,7 @@ CORBA::Request::Request (CORBA::Object_ptr obj, CORBA::NamedValue_ptr result, CORBA::Flags flags, CORBA::ExceptionList_ptr exceptions - ACE_ENV_ARG_DECL_NOT_USED) + ) : target_ (CORBA::Object::_duplicate (obj)), orb_ (CORBA::ORB::_duplicate (orb)), opname_ (CORBA::string_dup (op)), @@ -97,7 +97,7 @@ CORBA::Request::Request (CORBA::Object_ptr obj, CORBA::Request::Request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const CORBA::Char *op - ACE_ENV_ARG_DECL_NOT_USED) + ) : target_ (CORBA::Object::_duplicate (obj)), orb_ (CORBA::ORB::_duplicate (orb)), opname_ (CORBA::string_dup (op)), @@ -142,7 +142,7 @@ CORBA::Request::~Request (void) // flow in some exotic situations. void -CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Request::invoke (void) { TAO::NamedValue_Argument _tao_retval (this->result_); @@ -165,8 +165,7 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL) _tao_call.invoke (0, 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // If this request was created by a gateway, then result_ // and/or args_ are shared by a CORBA::ServerRequest, whose @@ -176,7 +175,7 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL) } void -CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Request::send_oneway (void) { TAO::NamedValue_Argument _tao_retval (this->result_); @@ -201,12 +200,11 @@ CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL) _tao_call.invoke (0, 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void -CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Request::send_deferred (void) { { ACE_GUARD (TAO_SYNCH_MUTEX, @@ -246,28 +244,25 @@ CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL) _tao_call.invoke (0, 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void -CORBA::Request::get_response (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Request::get_response (void) { while (!this->response_received_) { - (void) this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + (void) this->orb_->perform_work (); } if (this->lazy_evaluation_) { - this->args_->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->args_->evaluate (); } } CORBA::Boolean -CORBA::Request::poll_response (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Request::poll_response (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, @@ -280,8 +275,7 @@ CORBA::Request::poll_response (ACE_ENV_SINGLE_ARG_DECL) // and the response never gets received, so let the ORB do an // atom of work, if necessary, each time we poll. ACE_Time_Value tv (0, 0); - (void) this->orb_->perform_work (&tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + (void) this->orb_->perform_work (&tv); } return this->response_received_; @@ -290,7 +284,7 @@ CORBA::Request::poll_response (ACE_ENV_SINGLE_ARG_DECL) void CORBA::Request::handle_response (TAO_InputCDR &incoming, CORBA::ULong reply_status - ACE_ENV_ARG_DECL) + ) { // If this request was created by a gateway, then result_ // and/or args_ are shared by a CORBA::ServerRequest, whose @@ -305,15 +299,13 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, { // We can be sure that the impl is a TAO::Unknown_IDL_Type. this->result_->value ()->impl ()->_tao_decode (incoming - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } this->args_->_tao_incoming_cdr (incoming, CORBA::ARG_OUT | CORBA::ARG_INOUT, this->lazy_evaluation_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); { ACE_GUARD (TAO_SYNCH_MUTEX, diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index f7c13f398ab..e4e19e434e1 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -127,7 +127,7 @@ namespace CORBA * recommended as the user may not be able to propagate the * exceptions. */ - void invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void invoke (void); /// Send a oneway request. /** @@ -135,7 +135,7 @@ namespace CORBA * recommended as the user may not be able to propagate the * exceptions. */ - void send_oneway (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void send_oneway (void); /** * @name The 'deferred synchronous' methods. @@ -143,15 +143,15 @@ namespace CORBA * The 'deferred synchronous' methods. */ //@{ - void send_deferred (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - void get_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - CORBA::Boolean poll_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void send_deferred (void); + void get_response (void); + CORBA::Boolean poll_response (void); //@} /// Callback method for deferred synchronous requests. void handle_response (TAO_InputCDR &incoming, CORBA::ULong reply_status - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Pseudo object methods. static CORBA::Request* _duplicate (CORBA::Request*); @@ -200,12 +200,12 @@ namespace CORBA CORBA::NamedValue_ptr result, CORBA::Flags flags, CORBA::ExceptionList_ptr exceptions - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); Request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const CORBA::Char *op - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); ~Request (void); diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index f540c8652d6..ccd7468d82c 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -93,43 +93,37 @@ CORBA::Request::contexts (void) ACE_INLINE CORBA::Any & CORBA::Request::add_in_arg (void) { - ACE_DECLARE_NEW_CORBA_ENV; - return this->args_->add_element (CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->any_; + return this->args_->add_element (CORBA::ARG_IN)->any_; } ACE_INLINE CORBA::Any & CORBA::Request::add_in_arg (const CORBA::Char *name) { - ACE_DECLARE_NEW_CORBA_ENV; - return this->args_->add_item (name, CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->any_; + return this->args_->add_item (name, CORBA::ARG_IN)->any_; } ACE_INLINE CORBA::Any & CORBA::Request::add_inout_arg (void) { - ACE_DECLARE_NEW_CORBA_ENV; - return this->args_->add_element (CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->any_; + return this->args_->add_element (CORBA::ARG_INOUT)->any_; } ACE_INLINE CORBA::Any & CORBA::Request::add_inout_arg (const CORBA::Char *name) { - ACE_DECLARE_NEW_CORBA_ENV; - return this->args_->add_item (name, CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->any_; + return this->args_->add_item (name, CORBA::ARG_INOUT)->any_; } ACE_INLINE CORBA::Any & CORBA::Request::add_out_arg (void) { - ACE_DECLARE_NEW_CORBA_ENV; - return this->args_->add_element (CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->any_; + return this->args_->add_element (CORBA::ARG_OUT)->any_; } ACE_INLINE CORBA::Any & CORBA::Request::add_out_arg (const CORBA::Char *name) { - ACE_DECLARE_NEW_CORBA_ENV; - return this->args_->add_item (name, CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->any_; + return this->args_->add_item (name, CORBA::ARG_OUT)->any_; } ACE_INLINE void diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index 5582886beee..b12895cc4cb 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -83,12 +83,12 @@ CORBA::ServerRequest::~ServerRequest (void) // inout/out/return values later on. void CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list - ACE_ENV_ARG_DECL) + ) { // arguments() must be called before either of these. if (this->params_ != 0 || this->exception_ != 0) { - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO)); + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO)); } // Save params for later use when marshaling the reply. @@ -97,8 +97,7 @@ CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list this->params_->_tao_incoming_cdr (*this->orb_server_request_.incoming (), CORBA::ARG_IN | CORBA::ARG_INOUT, this->lazy_evaluation_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Pass this alignment back to the TAO_ServerRequest. this->orb_server_request_.dsi_nvlist_align ( @@ -111,22 +110,21 @@ CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list // only after the parameter list has been provided (maybe empty). void CORBA::ServerRequest::set_result (const CORBA::Any &value - ACE_ENV_ARG_DECL) + ) { // Setting a result when another result already exists or if an exception // exists or before the args have been processeed is an error. if (this->retval_ != 0 || this->exception_ != 0 || this->params_ == 0) { - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO)); + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO)); } ACE_NEW_THROW_EX (this->retval_, CORBA::Any (value), CORBA::NO_MEMORY ()); - ACE_CHECK; } - // NOTE: if "ACE_ENV_SINGLE_ARG_PARAMETER" is set, there has been a system exception, + // NOTE: if "" is set, there has been a system exception, // and it will take precedence over exceptions reported using the // set_exception() mechanism of the ServerRequest, which we assume // the application writer will use to report only user exceptions. @@ -136,25 +134,23 @@ CORBA::ServerRequest::set_result (const CORBA::Any &value // Store the exception value. void CORBA::ServerRequest::set_exception (const CORBA::Any &value - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var tc = value.type (); - CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind const kind = tc->kind (); // set_exception() can be called at any time, but the Any arg MUST // contain an exception. if (kind != CORBA::tk_except) { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 21, + throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 21, CORBA::COMPLETED_MAYBE)); } ACE_NEW_THROW_EX (this->exception_, CORBA::Any (value), CORBA::NO_MEMORY ()); - ACE_CHECK; this->orb_server_request_.exception_type (TAO_GIOP_USER_EXCEPTION); } @@ -162,7 +158,7 @@ CORBA::ServerRequest::set_exception (const CORBA::Any &value // This method will be utilized by the DSI servant to marshal outgoing // parameters. void -CORBA::ServerRequest::dsi_marshal (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ServerRequest::dsi_marshal (void) { // There was a user exception, no need to marshal any parameters. if (this->sent_gateway_exception_) @@ -194,9 +190,8 @@ CORBA::ServerRequest::dsi_marshal (ACE_ENV_SINGLE_ARG_DECL) this->params_->_tao_encode ( *this->orb_server_request_.outgoing (), CORBA::ARG_INOUT | CORBA::ARG_OUT - ACE_ENV_ARG_PARAMETER + ); - ACE_CHECK; } } else diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 39cae0c7b82..b7d94dd59e1 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -78,7 +78,7 @@ namespace CORBA /// parameter list ... on return, their values are available; the /// list fed in has typecodes and (perhap) memory assigned. void arguments (CORBA::NVList_ptr &list - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Implementation uses this to provide the operation result /// ... illegal if exception() was called or params() was not called. @@ -86,7 +86,7 @@ namespace CORBA /// XXX Implementation should be able to assume response has been /// sent when this returns, and reclaim memory it allocated. void set_result (const CORBA::Any &value - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Implementation uses this to provide the exception value which is /// the only result of this particular invocation. @@ -94,7 +94,7 @@ namespace CORBA /// XXX Implementation should be able to assume response has been /// sent when this returns, and reclaim memory it allocated. void set_exception (const CORBA::Any &value - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // = Get various universal call attributes. @@ -106,7 +106,7 @@ namespace CORBA // basic CORBA Object Model. /// Marshal outgoing parameters. - void dsi_marshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void dsi_marshal (void); /// Accessor for the Context member. CORBA::Context_ptr ctx (void) const; diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 81d9935832f..88e3d466953 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -89,17 +89,17 @@ CORBA::UnknownUserException::_tao_duplicate (void) const void CORBA::UnknownUserException::_tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL + ) const { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::UnknownUserException::_tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL) + ) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } CORBA::TypeCode_ptr diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index ab618060852..c97f08f5dcf 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -80,9 +80,9 @@ namespace CORBA virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const; + ) const; virtual void _tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL); + ); /// Narrow to an UnknowUserException. static UnknownUserException * _downcast (CORBA::Exception *ex); diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h index 39c8fb6bb48..ed9a0f22403 100644 --- a/TAO/tao/Dynamic_Adapter.h +++ b/TAO/tao/Dynamic_Adapter.h @@ -55,8 +55,6 @@ namespace CORBA typedef ServerRequest *ServerRequest_ptr; typedef ULong Flags; - - class Environment; } /** @@ -84,12 +82,12 @@ public: CORBA::ExceptionList_ptr exceptions, CORBA::Request_ptr &request, CORBA::Flags req_flags - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual CORBA::Request_ptr request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const char *op - ACE_ENV_ARG_DECL) = 0; + ) = 0; // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest. @@ -107,7 +105,7 @@ public: // CORBA::ORB::create_exception_list. virtual void create_exception_list (CORBA::ExceptionList_ptr & - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp index aff1b5bb0eb..7b0b4107087 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp @@ -22,8 +22,7 @@ TAO_EndpointPolicy_Initializer::init (void) PortableInterceptor::ORBInitializer::_nil (); PortableInterceptor::ORBInitializer_var orb_initializer; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { /// Register the EndpointPolicy ORBInitializer. ACE_NEW_THROW_EX (temp_orb_initializer, @@ -33,15 +32,13 @@ TAO_EndpointPolicy_Initializer::init (void) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { @@ -50,7 +47,6 @@ TAO_EndpointPolicy_Initializer::init (void) } return -1; } - ACE_ENDTRY; ACE_Service_Config::process_directive (ace_svc_desc_TAO_Endpoint_Acceptor_Filter_Factory,1); // force replacement diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp index 73b50a6e192..56161ad79be 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp @@ -31,7 +31,7 @@ CORBA::Policy_ptr TAO_EndpointPolicy_Factory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { @@ -81,7 +81,6 @@ TAO_EndpointPolicy_Factory::create_policy ( TAO_EndpointPolicy_i (*endpoint_list), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h index 667c7f2aa9a..0877fa147df 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h @@ -48,7 +48,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); private: diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp index d457e78d389..41acbc30ea9 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_EndpointPolicy_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -24,18 +24,17 @@ TAO_EndpointPolicy_ORBInitializer::pre_init ( void TAO_EndpointPolicy_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_EndpointPolicy_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) { TAO_ORBInitInfo * local_info = dynamic_cast <TAO_ORBInitInfo *> (info); TAO_ORB_Core * the_orb_core = local_info->orb_core (); @@ -49,20 +48,18 @@ TAO_EndpointPolicy_ORBInitializer::register_policy_factories ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::PolicyFactory_var policy_factory = policy_factory_ptr; - ACE_TRY + try { info->register_policy_factory (EndpointPolicy::ENDPOINT_POLICY_TYPE, policy_factory.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch ( ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -72,15 +69,13 @@ TAO_EndpointPolicy_ORBInitializer::register_policy_factories ( // should do no more work in this ORBInitializer. return; } - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Rethrow any other exceptions... - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h index daeeff7f2c0..b75c52d370a 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h @@ -50,11 +50,11 @@ public: //@{ virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -64,7 +64,7 @@ private: /// Register Endpoint policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); + ); }; diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp index 93090a87bc0..955e6854896 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp @@ -32,7 +32,7 @@ TAO_EndpointPolicy_i::~TAO_EndpointPolicy_i () CORBA::PolicyType -TAO_EndpointPolicy_i::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EndpointPolicy_i::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return EndpointPolicy::ENDPOINT_POLICY_TYPE; @@ -49,7 +49,7 @@ TAO_EndpointPolicy_i::clone (void) const } EndpointPolicy::EndpointList * -TAO_EndpointPolicy_i::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EndpointPolicy_i::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { EndpointPolicy::EndpointList* list = 0; @@ -61,20 +61,19 @@ TAO_EndpointPolicy_i::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Policy_ptr -TAO_EndpointPolicy_i::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_EndpointPolicy_i::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EndpointPolicy_i* servant = 0; ACE_NEW_THROW_EX (servant, TAO_EndpointPolicy_i (*this), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return servant; } void -TAO_EndpointPolicy_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EndpointPolicy_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->value_.length (0); diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h index f7f9cb629d7..429b6681ebe 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h @@ -51,7 +51,7 @@ public: /// Copy constructor. TAO_EndpointPolicy_i (const TAO_EndpointPolicy_i &rhs); - + virtual ~TAO_EndpointPolicy_i (); @@ -60,20 +60,20 @@ public: // = The EndpointPolicy::Policy methods - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; virtual EndpointPolicy::EndpointList * value ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( ::CORBA::SystemException diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h index 10ea6491e34..83d838a6f84 100644 --- a/TAO/tao/Endpoint_Selector_Factory.h +++ b/TAO/tao/Endpoint_Selector_Factory.h @@ -33,8 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { - class Environment; - class Exception; } @@ -69,7 +67,7 @@ public: /// Get an Invocation's endpoint selection strategy and /// initialize the endpoint selection state instance. virtual TAO_Invocation_Endpoint_Selector *get_selector ( - ACE_ENV_SINGLE_ARG_DECL) = 0; + void) = 0; }; diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 80ed0821dab..15ca449ef40 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -90,10 +90,8 @@ CORBA::Environment::exception (CORBA::Exception *ex) this->exception_ = ex; -#if defined (TAO_HAS_EXCEPTIONS) if (this->exception_ != 0) this->exception_->_raise (); -#endif /* TAO_HAS_EXCEPTIONS */ } void @@ -106,7 +104,6 @@ CORBA::Environment::clear (void) CORBA::Environment& CORBA::Environment::default_environment () { -#if defined (TAO_HAS_EXCEPTIONS) // // If we are using native C++ exceptions the user is *not* supposed // to clear the environment every time she calls into TAO. In fact @@ -122,7 +119,6 @@ CORBA::Environment::default_environment () // clear the environment before calling into the ORB. // TAO_ORB_Core_instance ()->default_environment ()->clear (); -#endif /* TAO_HAS_EXCEPTIONS */ return TAO_default_environment ();; } diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 78b135945b5..5362927702f 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -26,11 +26,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ // This is used in the implementation of the _raise methods -#if defined (TAO_HAS_EXCEPTIONS) #define TAO_RAISE(EXCEPTION) throw EXCEPTION -#else -#define TAO_RAISE(EXCEPTION) -#endif /* ACE_HAS_EXCEPTIONS */ #include /**/ "tao/TAO_Export.h" #include "tao/Basic_Types.h" @@ -154,10 +150,10 @@ namespace CORBA virtual ACE_CString _info (void) const = 0; virtual void _tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const = 0; + ) const = 0; virtual void _tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Used in the non-copying Any insertion operator. static void _tao_any_destructor (void *); diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index 47145cfff9b..8a3c303802d 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport) : TAO_Transport_Mux_Strategy (transport), request_id_generator_ (0), - has_request_ (0), + has_request_ (false), request_id_ (0), rd_ (0) { @@ -38,7 +38,7 @@ TAO_Exclusive_TMS::request_id (void) // == -1 --> no bi-directional connection was negotiated // The originating side must have an even request ID, and the other // side must have an odd request ID. Make sure that is the case. - int bidir_flag = + int const bidir_flag = this->transport_->bidirectional_flag (); if ((bidir_flag == 1 && ACE_ODD (this->request_id_generator_)) @@ -58,7 +58,7 @@ int TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id, TAO_Reply_Dispatcher *rd) { - this->has_request_ = 1; + this->has_request_ = true; this->request_id_ = request_id; this->rd_ = rd; @@ -70,7 +70,7 @@ TAO_Exclusive_TMS::unbind_dispatcher (CORBA::ULong request_id) { if (!this->has_request_ || this->request_id_ != request_id) return -1; - this->has_request_ = 0; + this->has_request_ = false; this->request_id_ = 0; this->rd_ = 0; @@ -94,7 +94,7 @@ TAO_Exclusive_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) } TAO_Reply_Dispatcher *rd = this->rd_; - this->has_request_ = 0; + this->has_request_ = false; this->request_id_ = 0; // @@ What is a good value??? this->rd_ = 0; diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h index 84f659bcc68..82932adcfc2 100644 --- a/TAO/tao/Exclusive_TMS.h +++ b/TAO/tao/Exclusive_TMS.h @@ -70,9 +70,9 @@ protected: /// request_id(). CORBA::ULong request_id_generator_; - /// If 0 then the request id and reply dispatcher below are + /// If false then the request id and reply dispatcher below are /// meaningless - int has_request_; + bool has_request_; /// Request id for the current request. CORBA::ULong request_id_; diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index b0f0d551994..479f06a2d5c 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -2,7 +2,6 @@ #include "tao/FILE_Parser.h" #include "tao/ORB.h" -#include "tao/Environment.h" #include "tao/Object.h" #include "ace/Read_Buffer.h" @@ -38,7 +37,7 @@ TAO_FILE_Parser::match_prefix (const char *ior_string) const CORBA::Object_ptr TAO_FILE_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Skip the prefix, we know it is there because this method in only @@ -60,20 +59,17 @@ TAO_FILE_Parser::parse_string (const char *ior, return CORBA::Object::_nil (); CORBA::Object_ptr object = CORBA::Object::_nil (); - ACE_TRY + try { - object = orb->string_to_object (string ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + object = orb->string_to_object (string); reader.alloc ()->free (string); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { reader.alloc ()->free (string); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object; } diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h index 2242d33a219..5946fc9e86f 100644 --- a/TAO/tao/FILE_Parser.h +++ b/TAO/tao/FILE_Parser.h @@ -47,7 +47,7 @@ public: virtual bool match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 5262caa29f6..068b593b639 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -75,8 +75,7 @@ int TAO_GIOP_Message_Base::generate_request_header ( TAO_Operation_Details &op, TAO_Target_Specification &spec, - TAO_OutputCDR &cdr - ) + TAO_OutputCDR &cdr) { // Get a parser for us TAO_GIOP_Message_Generator_Parser *generator_parser = 0; @@ -195,15 +194,13 @@ TAO_GIOP_Message_Base::generate_reply_header ( return -1; } - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Now call the implementation for the rest of the header int const result = generator_parser->write_reply_header (cdr, params - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (!result) { @@ -215,15 +212,14 @@ TAO_GIOP_Message_Base::generate_reply_header ( return -1; } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 4) - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, ACE_TEXT ("TAO_GIOP_Message_Base::generate_reply_header")); return -1; } - ACE_ENDTRY; return 0; } @@ -870,18 +866,16 @@ TAO_GIOP_Message_Base::generate_exception_reply ( { // A new try/catch block, but if something goes wrong now we have no // hope, just abort. - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Make the GIOP & reply header. this->generate_reply_header (cdr, params); x._tao_encode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { // Now we know that while handling the error an other error // happened -> no hope, close connection. @@ -893,8 +887,6 @@ TAO_GIOP_Message_Base::generate_exception_reply ( ACE_TEXT ("generate_exception_reply ()\n"))); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -959,16 +951,14 @@ TAO_GIOP_Message_Base::process_request ( int parse_error = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { parse_error = parser->parse_request_header (request); // Throw an exception if the if (parse_error != 0) - ACE_TRY_THROW (CORBA::MARSHAL (0, - CORBA::COMPLETED_NO)); + throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO); TAO_Codeset_Manager *csm = request.orb_core ()->codeset_manager (); if (csm) @@ -995,8 +985,7 @@ TAO_GIOP_Message_Base::process_request ( this->orb_core_, request, forward_to - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); //@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_END @@ -1059,7 +1048,7 @@ TAO_GIOP_Message_Base::process_request ( } } // Only CORBA exceptions are caught here. - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { int result = 0; @@ -1069,7 +1058,7 @@ TAO_GIOP_Message_Base::process_request ( output, request_id, &request.reply_service_info (), - &ACE_ANY_EXCEPTION); + &ex); if (result == -1) { if (TAO_debug_level > 0) @@ -1080,7 +1069,7 @@ TAO_GIOP_Message_Base::process_request ( ACE_TEXT ("process_connector_request ()"))); ACE_PRINT_EXCEPTION ( - ACE_ANY_EXCEPTION, + ex, "TAO_GIOP_Message_Base::process_request[1]"); } } @@ -1099,14 +1088,13 @@ TAO_GIOP_Message_Base::process_request ( ACE_TEXT ("but client is not waiting a response\n"))); ACE_PRINT_EXCEPTION ( - ACE_ANY_EXCEPTION, + ex, "TAO_GIOP_Message_Base::process_request[2]"); } return result; } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { // @@ TODO some c++ exception or another, but what do we do with // it? @@ -1157,8 +1145,6 @@ TAO_GIOP_Message_Base::process_request ( return result; } -#endif /* TAO_HAS_EXCEPTIONS */ - ACE_ENDTRY; return 0; } @@ -1182,16 +1168,14 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, CORBA::Boolean response_required = true; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { int parse_error = parser->parse_locate_header (locate_request); if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (0, - CORBA::COMPLETED_NO)); + throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO); } TAO::ObjectKey tmp_key (locate_request.object_key ().length (), @@ -1219,8 +1203,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (0, - CORBA::COMPLETED_NO)); + throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO); } CORBA::Object_var forward_to; @@ -1228,9 +1211,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, this->orb_core_->request_dispatcher ()->dispatch ( this->orb_core_, server_request, - forward_to - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + forward_to); if (!CORBA::is_nil (forward_to.in ())) { @@ -1272,7 +1253,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Normal exception, so the object is not here status_info.status = TAO_GIOP_UNKNOWN_OBJECT; @@ -1281,8 +1262,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") ACE_TEXT ("CORBA exception raised\n"))); } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { // Normal exception, so the object is not here status_info.status = TAO_GIOP_UNKNOWN_OBJECT; @@ -1291,8 +1271,6 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Base::process_locate_request - ") ACE_TEXT ("C++ exception raised\n"))); } -#endif /* TAO_HAS_EXCEPTIONS */ - ACE_ENDTRY; return this->make_send_locate_reply (transport, locate_request, @@ -1322,9 +1300,9 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport, output.more_fragments (false); // Send the message - int result = transport->send_message (output, - 0, - TAO_Transport::TAO_REPLY); + int const result = transport->send_message (output, + 0, + TAO_Transport::TAO_REPLY); // Print out message if there is an error if (result == -1) @@ -1383,7 +1361,7 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport) message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN); size_t bt; - int result = transport->send_message_block_chain (&message_block, bt); + int const result = transport->send_message_block_chain (&message_block, bt); if (result == -1) { if (TAO_debug_level > 0) @@ -1452,7 +1430,6 @@ TAO_GIOP_Message_Base:: TAO_Transport *transport, void *) { - // static CORBA::Octet // I hate this in every method. Till the time I figure out a way // around I will have them here hanging around. @@ -1511,7 +1488,7 @@ TAO_GIOP_Message_Base:: message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN); size_t bt; - int result = transport->send_message_block_chain (&message_block, bt); + int const result = transport->send_message_block_chain (&message_block, bt); if (result == -1) { if (TAO_debug_level > 0) @@ -1524,7 +1501,6 @@ TAO_GIOP_Message_Base:: ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) shut down transport, handle %d\n"), transport-> id ())); - } diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index bb355b26f05..bee6b9d2a62 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -66,7 +66,7 @@ public: virtual bool write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; /// Writes the locate _reply message in to the @a output diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index c418123f9b5..f293b39d13f 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -147,14 +147,13 @@ bool TAO_GIOP_Message_Generator_Parser_10::write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Write the service context list. #if (TAO_HAS_MINIMUM_CORBA == 1) output << reply.service_context_notowned (); - ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #else if (reply.is_dsi_ == false) { diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index 6c4a50f07be..45dbb9f62c5 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -55,7 +55,7 @@ public: virtual bool write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 446126132fe..5dc4cf05c60 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -27,8 +27,7 @@ bool TAO_GIOP_Message_Generator_Parser_12::write_request_header ( const TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - TAO_OutputCDR &msg - ) + TAO_OutputCDR &msg) { // First the request id msg << opdetails.request_id (); @@ -95,9 +94,8 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header ( bool TAO_GIOP_Message_Generator_Parser_12::write_locate_request_header ( CORBA::ULong request_id, - TAO_Target_Specification &spec, - TAO_OutputCDR &msg - ) + TAO_Target_Specification &spec, + TAO_OutputCDR &msg) { // Write the request id msg << request_id; @@ -120,9 +118,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_locate_request_header ( bool TAO_GIOP_Message_Generator_Parser_12::write_reply_header ( TAO_OutputCDR & output, - TAO_Pluggable_Reply_Params_Base &reply - ACE_ENV_ARG_DECL_NOT_USED - ) + TAO_Pluggable_Reply_Params_Base &reply) ACE_THROW_SPEC ((CORBA::SystemException)) { // Write the request ID @@ -187,8 +183,7 @@ bool TAO_GIOP_Message_Generator_Parser_12::write_locate_reply_mesg ( TAO_OutputCDR & output, CORBA::ULong request_id, - TAO_GIOP_Locate_Status_Msg &status_info - ) + TAO_GIOP_Locate_Status_Msg &status_info) { output.write_ulong (request_id); @@ -260,8 +255,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_fragment_header ( int TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( - TAO_ServerRequest &request - ) + TAO_ServerRequest &request) { // Get the input CDR in the request class TAO_InputCDR & input = *request.incoming (); @@ -339,8 +333,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( int TAO_GIOP_Message_Generator_Parser_12::parse_locate_header ( - TAO_GIOP_Locate_Request_Header &request - ) + TAO_GIOP_Locate_Request_Header &request) { // Get the stream . TAO_InputCDR &msg = request.incoming_stream (); @@ -367,8 +360,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_locate_header ( int TAO_GIOP_Message_Generator_Parser_12::parse_reply ( TAO_InputCDR &cdr, - TAO_Pluggable_Reply_Params ¶ms - ) + TAO_Pluggable_Reply_Params ¶ms) { if (TAO_GIOP_Message_Generator_Parser::parse_reply (cdr, params) == -1) @@ -397,8 +389,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_reply ( int TAO_GIOP_Message_Generator_Parser_12::parse_locate_reply ( TAO_InputCDR &cdr, - TAO_Pluggable_Reply_Params ¶ms - ) + TAO_Pluggable_Reply_Params ¶ms) { if (TAO_GIOP_Message_Generator_Parser::parse_locate_reply (cdr, params) == -1) @@ -442,8 +433,7 @@ TAO_GIOP_Message_Generator_Parser_12::is_ready_for_bidirectional (void) const bool TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec ( TAO_Target_Specification &spec, - TAO_OutputCDR &msg - ) + TAO_OutputCDR &msg) { switch (spec.specifier ()) { diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index d758a48abab..2fb34e24a4b 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -57,7 +57,7 @@ public: virtual bool write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 62e51a2e2a6..5a13e11a0a4 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -681,17 +681,15 @@ TAO_GIOP_Message_Lite::generate_exception_reply ( { // A new try/catch block, but if something goes wrong now we have no // hope, just abort. - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Make the GIOP & reply header. They are version specific. this->write_reply_header (cdr, params); - x._tao_encode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + x._tao_encode (cdr); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { // Now we know that while handling the error an other error // happened -> no hope, close connection. @@ -702,8 +700,6 @@ TAO_GIOP_Message_Lite::generate_exception_reply ( ACE_TEXT ("generate_exception_reply ()\n"))); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -755,8 +751,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, int parse_error = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { parse_error = this->parse_request_header (request); @@ -770,7 +765,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, // Throw an exception if the if (parse_error != 0) - ACE_TRY_THROW (CORBA::MARSHAL (0, + throw ( ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO)); request_id = request.request_id (); @@ -782,8 +777,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, this->orb_core_->adapter_registry ()->dispatch (request.object_key (), request, forward_to - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (!CORBA::is_nil (forward_to.in ())) { @@ -827,7 +821,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, } } // Only CORBA exceptions are caught here. - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { int result = 0; @@ -837,7 +831,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, this->orb_core_, request_id, &request.reply_service_info (), - &ACE_ANY_EXCEPTION); + &ex); if (result == -1) { if (TAO_debug_level > 0) @@ -847,7 +841,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, ACE_TEXT ("cannot send exception\n"), ACE_TEXT ("process_request ()"))); ACE_PRINT_EXCEPTION ( - ACE_ANY_EXCEPTION, + ex, "TAO_GIOP_Message_Lite::process_request[2]"); } } @@ -865,14 +859,13 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, ACE_TEXT ("(%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, "TAO: "); } return result; } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { // @@ TODO some c++ exception or another, but what do we do with // it? @@ -927,8 +920,6 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, return result; } -#endif /* TAO_HAS_EXCEPTIONS */ - ACE_ENDTRY; return 0; } @@ -951,15 +942,14 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, CORBA::Boolean response_required = 1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { int parse_error = this->parse_locate_header (locate_request); if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (0, + throw ( ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO)); } @@ -995,7 +985,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (0, + throw ( ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO)); } @@ -1004,8 +994,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, this->orb_core_->adapter_registry ()->dispatch (server_request.object_key (), server_request, forward_to - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (!CORBA::is_nil (forward_to.in ())) { @@ -1046,7 +1035,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Normal exception, so the object is not here status_info.status = TAO_GIOP_UNKNOWN_OBJECT; @@ -1055,8 +1044,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Lite::process_locate_request - ") ACE_TEXT ("CORBA exception raised\n"))); } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL + catch (...) { // Normal exception, so the object is not here status_info.status = TAO_GIOP_UNKNOWN_OBJECT; @@ -1065,8 +1053,6 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Lite::process_locate_request - ") ACE_TEXT ("C++ exception raised\n"))); } -#endif /* TAO_HAS_EXCEPTIONS */ - ACE_ENDTRY; return this->make_send_locate_reply (transport, output, @@ -1200,7 +1186,7 @@ int TAO_GIOP_Message_Lite::write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ + /* */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1487,9 +1473,8 @@ TAO_GIOP_Message_Lite::send_reply_exception ( // A new try/catch block, but if something goes wrong now we have no // hope, just abort. - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Write the exception. reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION; @@ -1504,10 +1489,9 @@ TAO_GIOP_Message_Lite::send_reply_exception ( reply_params); - x->_tao_encode (output ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + x->_tao_encode (output); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { // Now we know that while handling the error an other error // happened -> no hope, close connection. @@ -1519,7 +1503,6 @@ TAO_GIOP_Message_Lite::send_reply_exception ( ACE_TEXT ("send_reply_exception ()"))); return -1; } - ACE_ENDTRY; return transport->send_message (output); } diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index 7b8e35d512a..22807573742 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -252,7 +252,7 @@ private: int write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Writes the locate _reply message in to the <output> diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp index 496734e91b0..68a127359cb 100644 --- a/TAO/tao/HTTP_Parser.cpp +++ b/TAO/tao/HTTP_Parser.cpp @@ -3,7 +3,6 @@ #include "tao/HTTP_Parser.h" #include "tao/HTTP_Client.h" #include "tao/ORB.h" -#include "tao/Environment.h" #include "tao/Object.h" #include "ace/Read_Buffer.h" @@ -36,7 +35,7 @@ TAO_HTTP_Parser::match_prefix (const char *ior_string) const CORBA::Object_ptr TAO_HTTP_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Skip the prefix, we know it is there because this method in only @@ -120,17 +119,14 @@ TAO_HTTP_Parser::parse_string (const char *ior, string += curr->rd_ptr(); CORBA::Object_ptr object = CORBA::Object::_nil (); - ACE_TRY + try { - object = orb->string_to_object (string.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + object = orb->string_to_object (string.c_str()); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object; } diff --git a/TAO/tao/HTTP_Parser.h b/TAO/tao/HTTP_Parser.h index 8396039e864..b55ad6a00e3 100644 --- a/TAO/tao/HTTP_Parser.h +++ b/TAO/tao/HTTP_Parser.h @@ -48,7 +48,7 @@ public: virtual bool match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index 17e928e1ed6..e24bba103c3 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -67,13 +67,12 @@ CORBA::InterfaceDef_ptr TAO_IFR_Client_Adapter_Impl::get_interface ( CORBA::ORB_ptr orb, const char *repo_id - ACE_ENV_ARG_DECL + ) { CORBA::Object_var obj = orb->resolve_initial_references ("InterfaceRepository" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ()); + ); if (CORBA::is_nil (obj.in ())) { @@ -83,8 +82,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface ( CORBA::Repository_var repo = CORBA::Repository::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ()); + ); if (CORBA::is_nil (repo.in ())) { @@ -93,8 +91,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface ( } CORBA::Contained_var result = repo->lookup_id (repo_id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ()); + ); if (CORBA::is_nil (result.in ())) { @@ -103,14 +100,14 @@ TAO_IFR_Client_Adapter_Impl::get_interface ( else { return CORBA::InterfaceDef::_narrow (result.in () - ACE_ENV_ARG_PARAMETER); + ); } } CORBA::InterfaceDef_ptr TAO_IFR_Client_Adapter_Impl::get_interface_remote ( CORBA::Object_ptr target - ACE_ENV_ARG_DECL + ) { TAO::Arg_Traits<CORBA::InterfaceDef>::ret_val _tao_retval; @@ -129,20 +126,18 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote ( 0 ); - ACE_TRY + try { - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK (_tao_retval.excp ()); + _tao_call.invoke (0, 0); } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch ( ::CORBA::OBJECT_NOT_EXIST&) { return CORBA::InterfaceDef::_nil (); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; return _tao_retval.retn (); } @@ -153,20 +148,18 @@ TAO_IFR_Client_Adapter_Impl::create_operation_list ( CORBA::ORB_ptr orb, CORBA::OperationDef_ptr opDef, CORBA::NVList_ptr &result - ACE_ENV_ARG_DECL + ) { // Create an empty NVList. orb->create_list (0, result - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Get the parameters (if any) from the OperationDef, and for each // parameter add a corresponding entry to the result. CORBA::ParDescriptionSeq_var params = - opDef->params (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + opDef->params (); CORBA::ULong paramCount = params->length (); @@ -193,7 +186,7 @@ TAO_IFR_Client_Adapter_Impl::create_operation_list ( break; default: // Shouldn't happen - ACE_THROW (CORBA::INTERNAL()); + throw ( ::CORBA::INTERNAL()); } // Add an argument to the NVList. diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h index 3686f11a0cd..06deb8c9d07 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h @@ -60,12 +60,12 @@ public: virtual CORBA::InterfaceDef_ptr get_interface ( CORBA::ORB_ptr orb, const char *repo_id - ACE_ENV_ARG_DECL + ); virtual CORBA::InterfaceDef_ptr get_interface_remote ( CORBA::Object_ptr target - ACE_ENV_ARG_DECL + ); #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -73,7 +73,7 @@ public: CORBA::ORB_ptr orb, CORBA::OperationDef_ptr, CORBA::NVList_ptr& - ACE_ENV_ARG_DECL + ); #endif /*TAO_HAS_MINIMUM_CORBA*/ diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h index 6f85a0af52e..246a1b678ef 100644 --- a/TAO/tao/IFR_Client_Adapter.h +++ b/TAO/tao/IFR_Client_Adapter.h @@ -47,8 +47,6 @@ namespace CORBA class NVList; typedef NVList *NVList_ptr; - - class Environment; } /** @@ -80,12 +78,12 @@ public: virtual CORBA::InterfaceDef_ptr get_interface ( CORBA::ORB_ptr orb, const char *repo_id - ACE_ENV_ARG_DECL + ) = 0; virtual CORBA::InterfaceDef_ptr get_interface_remote ( CORBA::Object_ptr target - ACE_ENV_ARG_DECL + ) = 0; #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -93,7 +91,7 @@ public: CORBA::ORB_ptr orb, CORBA::OperationDef_ptr, CORBA::NVList_ptr& - ACE_ENV_ARG_DECL + ) = 0; #endif /*TAO_HAS_MINIMUM_CORBA*/ }; diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 3f62e43d82e..f9bd455feb6 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -111,31 +111,26 @@ TAO_IIOP_Connection_Handler::open (void*) bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (client) { tph->client_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { tph->server_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); if (this->set_socket_option (this->peer (), protocol_properties.send_buffer_size_, diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 3d509136a89..bf18d18008a 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -5,7 +5,6 @@ #include "tao/IIOP_Profile.h" #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "tao/Environment.h" #include "tao/Protocols_Hooks.h" #include "tao/Connect_Strategy.h" #include "tao/Thread_Lane_Resources.h" @@ -644,7 +643,7 @@ TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) +TAO_IIOP_Connector::make_profile (void) { // The endpoint should be of the form: // N.n@host:port/object_key @@ -659,7 +658,6 @@ TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return profile; } diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index 7f234d39342..04e09b1c37d 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -112,7 +112,7 @@ protected: /// More TAO_Connector methods, please check the documentation on /// Transport_Connector.h - virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile *make_profile (void); /// Cancel the passed cvs handler from the connector virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index ceb6d1f4fec..f022d30f3f8 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -2,7 +2,6 @@ #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) -#include "tao/Environment.h" #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/IIOP_EndpointsC.h" @@ -129,7 +128,7 @@ TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr) void TAO_IIOP_Profile::parse_string_i (const char *ior - ACE_ENV_ARG_DECL) + ) { // Pull off the "hostname:port/" part of the objref // Copy the string because we are going to modify it... @@ -139,7 +138,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior if (okd == 0 || okd == ior) { // No object key delimiter or no hostname specified. - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -173,7 +172,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior ACE_TEXT ("Invalid IPv6 decimal address specified.\n"))); } - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -201,7 +200,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior ACE_TEXT ("Host address may be omited only when no port has been specified.\n"))); } - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -230,7 +229,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior ACE_INET_Addr ia; if (ia.string_to_addr (tmp.in ()) == -1) { - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -289,7 +288,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior ACE_TEXT ("cannot determine hostname"))); // @@ What's the right exception to throw here? - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -342,7 +341,7 @@ TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) CORBA::ULong TAO_IIOP_Profile::hash (CORBA::ULong max - ACE_ENV_ARG_DECL_NOT_USED) + ) { // Get the hash value for all endpoints. CORBA::ULong hashval = 0; @@ -451,7 +450,7 @@ TAO_IIOP_Profile::add_generic_endpoint (TAO_Endpoint *endp) } char * -TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_IIOP_Profile::to_string (void) { // corbaloc:iiop:1.2@host:port,iiop:1.2@host:port,.../key diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index 03cf95694bd..3f273556161 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -95,7 +95,7 @@ public: virtual char object_key_delimiter (void) const; /// Template methods. Please see Profile.h for documentation. - virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); + virtual char * to_string (void); /// Encode endpoints for RT profiles, using a single TAO_TAG_ENDPOINT /// component. @@ -107,7 +107,7 @@ public: virtual TAO_Endpoint *endpoint (void); virtual CORBA::ULong endpoint_count (void) const; virtual CORBA::ULong hash (CORBA::ULong max - ACE_ENV_ARG_DECL); + ); protected: /// Destructor is to be called only through <_decr_refcnt>. @@ -137,7 +137,7 @@ protected: virtual int decode_profile (TAO_InputCDR &cdr); virtual int decode_endpoints (void); virtual void parse_string_i (const char *string - ACE_ENV_ARG_DECL); + ); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp index de6dd91494d..56e74eb0662 100644 --- a/TAO/tao/IORInterceptor/IORInfo.cpp +++ b/TAO/tao/IORInterceptor/IORInfo.cpp @@ -28,15 +28,13 @@ TAO_IORInfo::~TAO_IORInfo (void) CORBA::Policy_ptr TAO_IORInfo::get_effective_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->check_validity (); CORBA::Policy_var policy = - this->poa_->get_policy (type ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->poa_->get_policy (type); if (!CORBA::is_nil (policy.in ())) { @@ -54,70 +52,62 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type void TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); if (this->components_established_) - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO)); // Add the given tagged component to all profiles. this->poa_->save_ior_component (component - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_IORInfo::add_ior_component_to_profile ( const IOP::TaggedComponent &component, IOP::ProfileId profile_id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); if (this->components_established_) - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO)); this->poa_->save_ior_component_and_profile_id (component, profile_id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } char * -TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::manager_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); - PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - return poa_manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager (); + return poa_manager->get_id (); } PortableInterceptor::AdapterState -TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::state (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableInterceptor::NON_EXISTENT); + this->check_validity (); - return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->poa_->get_adapter_state (); } PortableInterceptor::ObjectReferenceTemplate * -TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::adapter_template (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // Return the Object Reference Template whenever an IOR Interceptor // is invoked. Its value is the template created for the adapter @@ -125,8 +115,7 @@ TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL) // add_ior_component_to_profile. It's a const value and its value // never changes. PortableInterceptor::ObjectReferenceTemplate *adapter_template = - this->poa_->get_adapter_template (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->poa_->get_adapter_template (); if (adapter_template == 0) { @@ -139,11 +128,10 @@ TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL) } PortableInterceptor::ObjectReferenceFactory * -TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::current_factory (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // Return the current_factory that is used to create the object // references by the adapter. Though initially, its value is the @@ -151,8 +139,7 @@ TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL) // can be changed. The value of the current_factory can be changed // only during the call to components_established method. PortableInterceptor::ObjectReferenceFactory *adapter_factory = - this->poa_->get_obj_ref_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->poa_->get_obj_ref_factory (); if (adapter_factory == 0) { @@ -167,19 +154,17 @@ TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL) void TAO_IORInfo::current_factory ( PortableInterceptor::ObjectReferenceFactory * current_factory - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); this->poa_->set_obj_ref_factory (current_factory - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void -TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::check_validity (void) { if (this->poa_ == 0) { @@ -189,7 +174,7 @@ TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) // once the POA has invoked all IORInterceptor interception // points. This also prevents memory access violations from // occuring if the POA is destroyed before this IORInfo object. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO::VMCID, + throw ( ::CORBA::OBJECT_NOT_EXIST (TAO::VMCID, CORBA::COMPLETED_NO)); } } diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h index 3d4803a6792..df8723f914f 100644 --- a/TAO/tao/IORInterceptor/IORInfo.h +++ b/TAO/tao/IORInterceptor/IORInfo.h @@ -62,13 +62,13 @@ public: /// effect for the object whose IOR is being created. virtual CORBA::Policy_ptr get_effective_policy ( CORBA::PolicyType type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles. virtual void add_ior_component ( const IOP::TaggedComponent & component - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles matching the given @@ -76,28 +76,28 @@ public: virtual void add_ior_component_to_profile ( const IOP::TaggedComponent & component, IOP::ProfileId profile_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * manager_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::AdapterState state ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::ObjectReferenceFactory * current_factory ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void current_factory ( PortableInterceptor::ObjectReferenceFactory * current_factory - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -132,7 +132,7 @@ protected: * this IORInfo object is no longer valid. Throw an exception in * that case. */ - void check_validity (ACE_ENV_SINGLE_ARG_DECL); + void check_validity (void); private: diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp index a917dc798d4..e30e2e7505b 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp @@ -16,14 +16,13 @@ TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Imp } TAO_IORInterceptor_Adapter * -TAO_IORInterceptor_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInterceptor_Adapter_Factory_Impl::create (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IORInterceptor_Adapter_Impl *nia = 0; ACE_NEW_THROW_EX (nia, TAO_IORInterceptor_Adapter_Impl (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (nia); return nia; } diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h index a08507cd6a6..6696a5320c2 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h @@ -43,9 +43,7 @@ class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Factory_Impl public: virtual ~TAO_IORInterceptor_Adapter_Factory_Impl (void); - virtual TAO_IORInterceptor_Adapter * create ( - ACE_ENV_SINGLE_ARG_DECL - ) + virtual TAO_IORInterceptor_Adapter * create (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Used to force the initialization of the ORB code. diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index 4b9bc703257..8ac7a0a501b 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -22,32 +22,29 @@ TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void) void TAO_IORInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::IORInterceptor_ptr i - ACE_ENV_ARG_DECL + ) { this->ior_interceptor_list_.add_interceptor (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_IORInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::IORInterceptor_ptr i, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL + ) { this->ior_interceptor_list_.add_interceptor (i, policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void -TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (void) { - this->ior_interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->ior_interceptor_list_.destroy_interceptors (); delete this; } @@ -55,7 +52,7 @@ TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) void TAO_IORInterceptor_Adapter_Impl::establish_components ( TAO_Root_POA* poa - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { const size_t interceptor_count = this->ior_interceptor_list_.size (); @@ -71,7 +68,6 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::IORInfo_var info = tao_info; @@ -82,14 +78,13 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( for (size_t i = 0; i < interceptor_count; ++i) { - ACE_TRY + try { this->ior_interceptor_list_.interceptor (i)->establish_components ( info.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // According to the Portable Interceptors specification, // IORInterceptor::establish_components() must not throw an @@ -100,8 +95,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( { CORBA::String_var name = this->ior_interceptor_list_.interceptor (i)->name ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // @@ What do we do if we get an exception here? if (name.in () != 0) @@ -117,15 +111,12 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( "IORInterceptor::establish_components"); } } - ACE_ENDTRY; - ACE_CHECK; } tao_info->components_established (); this->components_established (info.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // The IORInfo instance is no longer valid. Invalidate it to // prevent the user from peforming "illegal" operations. @@ -135,7 +126,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( void TAO_IORInterceptor_Adapter_Impl::components_established ( PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Iterate over the registered IOR interceptors so that they may be @@ -148,7 +139,7 @@ TAO_IORInterceptor_Adapter_Impl::components_established ( // on all the IORInterceptors. for (size_t j = 0; j < interceptor_count; ++j) { - ACE_TRY + try { PortableInterceptor::IORInterceptor_ptr ior_interceptor = this->ior_interceptor_list_.interceptor (j); @@ -159,17 +150,14 @@ TAO_IORInterceptor_Adapter_Impl::components_established ( { ior_3_interceptor->components_established ( info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6, - CORBA::COMPLETED_NO)); + throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6, + CORBA::COMPLETED_NO); } - ACE_ENDTRY; - ACE_CHECK; } } @@ -177,7 +165,7 @@ void TAO_IORInterceptor_Adapter_Impl::adapter_state_changed ( const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { const size_t interceptor_count = this->ior_interceptor_list_.size (); @@ -212,8 +200,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed ( ior_3_interceptor->adapter_state_changed ( seq_obj_ref_template, state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } } @@ -222,7 +209,7 @@ void TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed ( const char * id, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { /// Whenever the POAManager state is changed, the @@ -245,8 +232,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed ( ior_3_interceptor->adapter_manager_state_changed ( id, state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } } diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h index 5dc289f77d8..9094acb23fc 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h @@ -55,34 +55,34 @@ public: virtual void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - ACE_ENV_ARG_DECL); + ); virtual void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + ); - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); + virtual void destroy_interceptors (void); - virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL) + virtual void establish_components (TAO_Root_POA *poa ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. virtual void components_established (PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_state_changed ( const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_manager_state_changed ( const char * id, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp index 77835d4cfd0..1317d6a642e 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp @@ -13,10 +13,10 @@ namespace TAO void IORInterceptor_Details::apply_policies ( const CORBA::PolicyList &/*policies*/ - ACE_ENV_ARG_DECL) + ) { // There are currently no policies that apply to IOR Interceptors. - ACE_THROW (CORBA::INV_POLICY ()); + throw ( ::CORBA::INV_POLICY ()); } } diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.h b/TAO/tao/IORInterceptor/IORInterceptor_Details.h index bb2ce8b0fa8..9bee1807d7e 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Details.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.h @@ -52,7 +52,7 @@ namespace TAO { public: void apply_policies (const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + ); }; } diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index 89a85887b92..752aff0b006 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -65,17 +65,17 @@ public: virtual void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - ACE_ENV_ARG_DECL + ) = 0; virtual void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL + ) = 0; virtual void destroy_interceptors ( - ACE_ENV_SINGLE_ARG_DECL + ) = 0; /// Call the IORInterceptor::establish_components() method on all @@ -86,25 +86,25 @@ public: * IORInterceptor::components_established() once the former is * completed. */ - virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL) + virtual void establish_components (TAO_Root_POA *poa ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. virtual void components_established (PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual void adapter_state_changed ( const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual void adapter_manager_state_changed ( const char * id, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h index ebb5561ee76..87f6fc0057e 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.h +++ b/TAO/tao/IORInterceptor_Adapter_Factory.h @@ -43,7 +43,7 @@ public: virtual ~TAO_IORInterceptor_Adapter_Factory (void); virtual TAO_IORInterceptor_Adapter * create ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp index eceb6b0b06b..adcb4b6d6ca 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.cpp +++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp @@ -19,7 +19,7 @@ CORBA::Object_ptr TAO_IORManip_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR *[] - 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 fc45a394fae..8bfbd4e69e2 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.h +++ b/TAO/tao/IORManipulation/IORManip_Loader.h @@ -39,7 +39,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to force the initialization of the ORB code. 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)) { diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h index 9ad320bc8d0..d81fedd2886 100644 --- a/TAO/tao/IORManipulation/IORManipulation.h +++ b/TAO/tao/IORManipulation/IORManipulation.h @@ -55,7 +55,7 @@ public: virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList, @@ -66,7 +66,7 @@ public: virtual CORBA::Object_ptr add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList, @@ -77,7 +77,7 @@ public: virtual CORBA::Object_ptr remove_profiles ( CORBA::Object_ptr group, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::Invalid_IOR, @@ -88,7 +88,7 @@ public: virtual CORBA::Boolean set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -101,7 +101,7 @@ public: TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr new_primary, CORBA::Object_ptr group - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -113,7 +113,7 @@ public: virtual CORBA::Object_ptr get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -123,7 +123,7 @@ public: virtual CORBA::Boolean is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -132,7 +132,7 @@ public: virtual CORBA::Boolean remove_primary_tag ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr iogr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -140,7 +140,7 @@ public: virtual CORBA::ULong is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound @@ -148,7 +148,7 @@ public: virtual CORBA::ULong get_profile_count ( CORBA::Object_ptr group - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index 71edf7b3f72..46e3377e367 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -19,8 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IOR_Table_Impl_ptr TAO::Objref_Traits<TAO_IOR_Table_Impl>::duplicate ( - TAO_IOR_Table_Impl_ptr p - ) + TAO_IOR_Table_Impl_ptr p) { if (! ::CORBA::is_nil (p)) { @@ -32,8 +31,7 @@ TAO::Objref_Traits<TAO_IOR_Table_Impl>::duplicate ( void TAO::Objref_Traits<TAO_IOR_Table_Impl>::release ( - TAO_IOR_Table_Impl_ptr p - ) + TAO_IOR_Table_Impl_ptr p) { ::CORBA::release (p); } @@ -46,9 +44,8 @@ TAO::Objref_Traits<TAO_IOR_Table_Impl>::nil (void) ::CORBA::Boolean TAO::Objref_Traits<TAO_IOR_Table_Impl>::marshal ( - const TAO_IOR_Table_Impl_ptr , - TAO_OutputCDR & - ) + const TAO_IOR_Table_Impl_ptr, + TAO_OutputCDR &) { return false; } @@ -58,12 +55,8 @@ TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void) } char * -TAO_IOR_Table_Impl::find (const char *object_key - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC (( - CORBA::SystemException, - IORTable::NotFound - )) +TAO_IOR_Table_Impl::find (const char *object_key) + ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { // We don't want the lock held during locate, so make it go out // of scope before then. @@ -80,62 +73,38 @@ TAO_IOR_Table_Impl::find (const char *object_key ACE_THROW_RETURN (IORTable::NotFound (), 0); } - return this->locator_->locate (object_key ACE_ENV_ARG_PARAMETER); + return this->locator_->locate (object_key); } void -TAO_IOR_Table_Impl::bind ( - const char * object_key, - const char * IOR - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - IORTable::AlreadyBound - )) +TAO_IOR_Table_Impl::bind (const char * object_key, const char * IOR) + ACE_THROW_SPEC ((CORBA::SystemException, IORTable::AlreadyBound)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->map_.bind (object_key, IOR) != 0) - ACE_THROW (IORTable::AlreadyBound ()); + throw (IORTable::AlreadyBound ()); } void -TAO_IOR_Table_Impl::rebind ( - const char * object_key, - const char * IOR - ACE_ENV_ARG_DECL_NOT_USED - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +TAO_IOR_Table_Impl::rebind (const char * object_key, const char * IOR) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->map_.rebind (object_key, IOR); } void -TAO_IOR_Table_Impl::unbind ( - const char * object_key - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - IORTable::NotFound - )) +TAO_IOR_Table_Impl::unbind (const char * object_key) + ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->map_.unbind (object_key) != 0) - ACE_THROW (IORTable::NotFound ()); + throw (IORTable::NotFound ()); } void -TAO_IOR_Table_Impl::set_locator ( - IORTable::Locator_ptr locator - ACE_ENV_ARG_DECL_NOT_USED - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +TAO_IOR_Table_Impl::set_locator (IORTable::Locator_ptr locator) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->locator_ = IORTable::Locator::_duplicate (locator); diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index f5f08941c10..e6feaf6ea01 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -54,10 +54,7 @@ public: TAO_IOR_Table_Impl (void); /// Find the object, using the locator if it is not on the table. - char *find ( - const char *object_key - ACE_ENV_ARG_DECL - ) + char *find (const char *object_key) ACE_THROW_SPEC (( CORBA::SystemException, IORTable::NotFound @@ -69,38 +66,24 @@ public: * Please check the IORTable.pidl file for details. */ //@{ - virtual void bind ( - const char * object_key, - const char * IOR - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + virtual void bind (const char * object_key, const char * IOR) ACE_THROW_SPEC (( CORBA::SystemException, IORTable::AlreadyBound )); - virtual void rebind ( - const char * object_key, - const char * IOR - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + virtual void rebind (const char * object_key, const char * IOR) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void unbind ( - const char * object_key - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + virtual void unbind (const char * object_key) ACE_THROW_SPEC (( CORBA::SystemException, IORTable::NotFound )); - virtual void set_locator ( - IORTable::Locator_ptr the_locator - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + virtual void set_locator (IORTable::Locator_ptr the_locator) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index aee48d01239..4b46f57d614 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -65,21 +65,20 @@ TAO_Table_Adapter::create_lock (bool enable_locking, } void -TAO_Table_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) +TAO_Table_Adapter::open (void) { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); - TAO_IOR_Table_Impl *impl; + TAO_IOR_Table_Impl *impl = 0; ACE_NEW_THROW_EX (impl, TAO_IOR_Table_Impl (), CORBA::NO_MEMORY ()); - ACE_CHECK; this->root_ = impl; this->closed_ = false; } void -TAO_Table_Adapter::close (int ACE_ENV_ARG_DECL_NOT_USED) +TAO_Table_Adapter::close (int) { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); this->closed_ = true; @@ -88,7 +87,7 @@ TAO_Table_Adapter::close (int ACE_ENV_ARG_DECL_NOT_USED) } void -TAO_Table_Adapter::check_close (int ACE_ENV_ARG_DECL_NOT_USED) +TAO_Table_Adapter::check_close (int) { } @@ -101,8 +100,7 @@ TAO_Table_Adapter::priority (void) const int TAO_Table_Adapter::dispatch (TAO::ObjectKey &key, TAO_ServerRequest &, - CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) + CORBA::Object_out forward_to) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IOR_Table_Impl_var rootref; @@ -156,7 +154,7 @@ TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub, } CORBA::Long -TAO_Table_Adapter::initialize_collocated_object (TAO_Stub * stub) +TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *stub) { // Get the effective profile set. const TAO_MProfile &mp = stub->forward_profiles () ? *(stub->forward_profiles ()) @@ -169,14 +167,13 @@ TAO_Table_Adapter::initialize_collocated_object (TAO_Stub * stub) CORBA::Object_var forward_to = CORBA::Object::_nil (); CORBA::Boolean found = false; - ACE_TRY_NEW_ENV + try { found = this->find_object (key, forward_to.out ()); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; if (found) { @@ -192,28 +189,20 @@ TAO_Table_Adapter::initialize_collocated_object (TAO_Stub * stub) CORBA::Long TAO_Table_Adapter::find_object (TAO::ObjectKey &key, - CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) + CORBA::Object_out forward_to) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var object_key; - TAO::ObjectKey::encode_sequence_to_string (object_key.out (), - key); - ACE_TRY + TAO::ObjectKey::encode_sequence_to_string (object_key.out (), key); + try { - CORBA::String_var ior = root_->find (object_key.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - forward_to = - this->orb_core_.orb ()->string_to_object (ior.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::String_var ior = root_->find (object_key.in ()); + forward_to = this->orb_core_.orb ()->string_to_object (ior.in ()); } - ACE_CATCH (IORTable::NotFound, nf_ex) + catch ( ::IORTable::NotFound&) { return 0; } - ACE_ENDTRY; return 1; } diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index dff331744d7..628b1a4d8ae 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -43,16 +43,13 @@ public: // = The TAO_Adapter methods, please check tao/Adapter.h for the // documentation - virtual void open (ACE_ENV_SINGLE_ARG_DECL); - virtual void close (int wait_for_completion - ACE_ENV_ARG_DECL); - virtual void check_close (int wait_for_completion - ACE_ENV_ARG_DECL); + virtual void open (void); + virtual void close (int wait_for_completion); + virtual void check_close (int wait_for_completion); virtual int priority (void) const; virtual int dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, - CORBA::Object_out foward_to - ACE_ENV_ARG_DECL) + CORBA::Object_out foward_to) ACE_THROW_SPEC ((CORBA::SystemException)); virtual const char *name (void) const; @@ -60,15 +57,14 @@ public: virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &); - virtual CORBA::Long initialize_collocated_object (TAO_Stub *); + virtual CORBA::Long initialize_collocated_object (TAO_Stub *stub); private: static ACE_Lock * create_lock (bool enable_locking, TAO_SYNCH_MUTEX &l); /// Helper method to find an object bound in the table. /// @return 1 if found, 0 otherwise. CORBA::Long find_object (TAO::ObjectKey &key, - CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) + CORBA::Object_out forward_to) ACE_THROW_SPEC ((CORBA::SystemException)); /// The ORB Core we belong to diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index 621433e6e40..7509cc31dcf 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -28,7 +28,7 @@ namespace TAO void ImR_Client_Adapter_Impl::imr_notify_startup ( - TAO_Root_POA* poa ACE_ENV_ARG_DECL) + TAO_Root_POA* poa ) { CORBA::Object_var imr = poa->orb_core ().implrepo_service (); @@ -37,7 +37,7 @@ namespace TAO ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: No usable IMR initial reference ") ACE_TEXT ("available but use IMR has been specified.\n"))); - ACE_THROW (CORBA::TRANSIENT ( + throw ( ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), CORBA::COMPLETED_NO)); } @@ -53,8 +53,7 @@ namespace TAO ACE_UNUSED_ARG (non_servant_upcall); imr_locator = - ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ImplementationRepository::Administration::_narrow (imr.in ()); } if (CORBA::is_nil(imr_locator.in ())) @@ -63,7 +62,7 @@ namespace TAO ACE_TEXT ("(%P|%t) ERROR: Narrowed IMR initial reference ") ACE_TEXT ("is nil but use IMR has been specified.\n"))); - ACE_THROW (CORBA::TRANSIENT ( + throw ( ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), CORBA::COMPLETED_NO)); } @@ -73,7 +72,6 @@ namespace TAO ServerObject_i (poa->orb_core ().orb (), root_poa), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (this->server_object_); ACE_UNUSED_ARG (safe_servant); @@ -88,17 +86,14 @@ namespace TAO root_poa->activate_object_i (this->server_object_, poa->server_priority (), wait_occurred_restart_call_ignored - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Object_var obj = root_poa->id_to_reference_i (id.in (), false - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); ImplementationRepository::ServerObject_var svr = ImplementationRepository::ServerObject::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ()) { @@ -107,8 +102,7 @@ namespace TAO } CORBA::String_var ior = - svr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + svr->_stubobj ()->profile_in_use ()->to_string (); // Search for "corbaloc:" alone, without the protocol. This code // should be protocol neutral. @@ -126,7 +120,7 @@ namespace TAO "Informing IMR that we are running at: %s\n", ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str()))); - ACE_TRY + try { // ATTENTION: Trick locking here, see class header for details TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa); @@ -135,23 +129,18 @@ namespace TAO imr_locator->server_is_running (poa->name().c_str (), partial_ior.c_str(), svr.in() - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (CORBA::SystemException, sysex) + catch ( ::CORBA::SystemException&) { - // Avoid warnings on platforms with native C++ exceptions - ACE_UNUSED_ARG (sysex); - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_TRY_THROW (CORBA::TRANSIENT ( + throw ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } - ACE_ENDTRY; - ACE_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Successfully notified ImR of Startup\n")); @@ -159,7 +148,7 @@ namespace TAO void ImR_Client_Adapter_Impl::imr_notify_shutdown ( - TAO_Root_POA* poa ACE_ENV_ARG_DECL) + TAO_Root_POA* poa ) { // Notify the Implementation Repository about shutting down. CORBA::Object_var imr = poa->orb_core ().implrepo_service (); @@ -169,7 +158,7 @@ namespace TAO if (CORBA::is_nil (imr.in ())) return; - ACE_TRY_NEW_ENV + try { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -182,57 +171,49 @@ namespace TAO // Get the IMR's administrative object and call shutting_down on it ImplementationRepository::Administration_var imr_locator = - ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ImplementationRepository::Administration::_narrow (imr.in ()); imr_locator->server_is_shutting_down (poa->name().c_str () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH(CORBA::COMM_FAILURE, ex) + catch ( ::CORBA::COMM_FAILURE&) { // At the moment we call this during ORB shutdown and the ORB is // configured to drop replies during shutdown (it does by default in // the LF model) we get a COMM_FAILURE exception which we ignore if (TAO_debug_level > 0) ACE_DEBUG((LM_DEBUG, "Ignoring COMM_FAILURE while unregistering from ImR.\n")); - ACE_UNUSED_ARG (ex); } - ACE_CATCH(CORBA::TRANSIENT, ex) + catch ( ::CORBA::TRANSIENT&) { // Similarly, there are cases where we could get a TRANSIENT. if (TAO_debug_level > 0) ACE_DEBUG((LM_DEBUG, "Ignoring TRANSIENT while unregistering from ImR.\n")); - ACE_UNUSED_ARG (ex); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Client_Adapter_Impl::imr_notify_shutdown()"); // Ignore exceptions } - ACE_ENDTRY; if (this->server_object_) { PortableServer::POA_var poa = - this->server_object_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->server_object_->_default_POA (); TAO_Root_POA *root_poa = dynamic_cast <TAO_Root_POA*> (poa.in ()); if (!root_poa) { - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } PortableServer::ObjectId_var id = root_poa->servant_to_id_i (this->server_object_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - root_poa->deactivate_object_i (id.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + root_poa->deactivate_object_i (id.in()); server_object_ = 0; } diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h index cf1e19b7f92..e7bc661c089 100644 --- a/TAO/tao/ImR_Client/ImR_Client.h +++ b/TAO/tao/ImR_Client/ImR_Client.h @@ -54,10 +54,10 @@ namespace TAO static int Initializer (void); /// ImplRepo helper method, notify the ImplRepo on startup - virtual void imr_notify_startup (TAO_Root_POA* poa ACE_ENV_ARG_DECL); + virtual void imr_notify_startup (TAO_Root_POA* poa); /// ImplRepo helper method, notify the ImplRepo on shutdown - virtual void imr_notify_shutdown (TAO_Root_POA* poa ACE_ENV_ARG_DECL); + virtual void imr_notify_shutdown (TAO_Root_POA* poa); private: /// Implementation Repository Server Object diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp index 8e777df8a31..711732af5aa 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.cpp +++ b/TAO/tao/ImR_Client/ServerObject_i.cpp @@ -14,25 +14,23 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb, } void -ServerObject_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerObject_i::ping (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -ServerObject_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +ServerObject_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Note : We want our child POAs to be able to unregister themselves from // the ImR, so we must destroy them before shutting down the orb. - poa_->destroy(1, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + poa_->destroy(1, 0); + this->orb_->shutdown (0); } PortableServer::POA_ptr -ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerObject_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h index a397952aab6..f7b28b8af41 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.h +++ b/TAO/tao/ImR_Client/ServerObject_i.h @@ -45,15 +45,15 @@ public: PortableServer::POA_ptr poa); /// Ping method. - void ping (ACE_ENV_SINGLE_ARG_DECL) + void ping (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the server. - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns the default POA for this servant. - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); protected: /// Our ORB. We need this member in case we need to shutdown the diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index b3577fb9e7e..616bf0dff47 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -36,12 +36,11 @@ namespace TAO void Invocation_Adapter::invoke (TAO::Exception_Data *ex_data, unsigned long ex_count - ACE_ENV_ARG_DECL) + ) { // Should stub object be refcounted here? TAO_Stub *stub = - this->get_stub (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_stub (); TAO_Operation_Details op_details (this->operation_, this->op_len_, @@ -53,14 +52,13 @@ namespace TAO this->invoke_i (stub, op_details - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void Invocation_Adapter::invoke_i (TAO_Stub *stub, TAO_Operation_Details &details - ACE_ENV_ARG_DECL) + ) { // The invocation has got to be within the context of the // corresponding ORB's configuration. Otherwise things like @@ -90,8 +88,7 @@ namespace TAO { strat = TAO_ORB_Core::collocation_strategy (effective_target.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } if (strat == TAO_CS_REMOTE_STRATEGY || @@ -103,8 +100,7 @@ namespace TAO details, effective_target, max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { @@ -119,8 +115,7 @@ namespace TAO details, effective_target, strat - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } if (status == TAO_INVOKE_RESTART) @@ -151,7 +146,7 @@ namespace TAO } TAO_Stub * - Invocation_Adapter::get_stub (ACE_ENV_SINGLE_ARG_DECL) const + Invocation_Adapter::get_stub (void) const { TAO_Stub * const stub = this->target_->_stubobj (); @@ -172,7 +167,7 @@ namespace TAO TAO_Operation_Details &details, CORBA::Object_var &effective_target, Collocation_Strategy strat - ACE_ENV_ARG_DECL) + ) { // To make a collocated call we must have a collocated proxy broker, the // invoke_i() will make sure that we only come here when we have one @@ -192,8 +187,7 @@ namespace TAO status = coll_inv.invoke (this->cpb_, strat - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); if (status == TAO_INVOKE_RESTART && coll_inv.is_forwarded ()) @@ -211,8 +205,7 @@ namespace TAO (void) this->object_forwarded (effective_target, stub, is_permanent_forward - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); } return status; @@ -259,7 +252,7 @@ namespace TAO TAO_Operation_Details &details, CORBA::Object_var &effective_target, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL) + ) { ACE_Time_Value tmp_wait_time; bool is_timeout = @@ -286,8 +279,7 @@ namespace TAO block_connect); resolver.resolve (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); if (TAO_debug_level) { @@ -307,7 +299,7 @@ namespace TAO effective_target, resolver, max_wait_time - ACE_ENV_ARG_PARAMETER); + ); } else if (this->type_ == TAO_TWOWAY_INVOCATION) { @@ -315,7 +307,7 @@ namespace TAO effective_target, resolver, max_wait_time - ACE_ENV_ARG_PARAMETER); + ); } return TAO_INVOKE_FAILURE; @@ -326,7 +318,7 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL) + ) { // Simple sanity check if (this->mode_ != TAO_SYNCHRONOUS_INVOCATION || @@ -346,8 +338,7 @@ namespace TAO Invocation_Status const status = synch.remote_twoway (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); if (status == TAO_INVOKE_RESTART && synch.is_forwarded ()) @@ -365,8 +356,7 @@ namespace TAO this->object_forwarded (effective_target, r.stub (), is_permanent_forward - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); } return status; @@ -377,7 +367,7 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL) + ) { TAO::Synch_Oneway_Invocation synch (this->target_, r, @@ -385,8 +375,7 @@ namespace TAO Invocation_Status const s = synch.remote_oneway (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); if (s == TAO_INVOKE_RESTART && synch.is_forwarded ()) @@ -403,8 +392,7 @@ namespace TAO this->object_forwarded (effective_target, r.stub (), is_permanent_forward - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); } return s; @@ -414,7 +402,7 @@ namespace TAO Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target, TAO_Stub *stub, CORBA::Boolean permanent_forward - ACE_ENV_ARG_DECL) + ) { // The object pointer has to be changed to a TAO_Stub pointer // in order to obtain the profiles. @@ -422,7 +410,7 @@ namespace TAO effective_target->_stubobj (); if (stubobj == 0) - ACE_THROW (CORBA::INTERNAL ( + throw ( ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE, errno), @@ -433,7 +421,7 @@ namespace TAO stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward); if (stub->next_profile () == 0) - ACE_THROW (CORBA::TRANSIENT ( + throw ( ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code ( TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE, errno), diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 017851372e1..c6da4157d14 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -43,8 +43,6 @@ namespace CORBA class Object; typedef Object *Object_ptr; typedef TAO_Pseudo_Var_T<Object> Object_var; - - class Environment; } namespace TAO @@ -119,7 +117,7 @@ namespace TAO size_t op_len, Collocation_Proxy_Broker *cpb, TAO::Invocation_Type type = TAO_TWOWAY_INVOCATION, - TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION, + TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION, CORBA::Boolean is_dii_request = false); virtual ~Invocation_Adapter (void); @@ -136,7 +134,7 @@ namespace TAO */ virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count - ACE_ENV_ARG_DECL); + ); protected: /** * The stub pointer passed to this call has all the details about @@ -148,7 +146,7 @@ namespace TAO */ virtual void invoke_i (TAO_Stub *stub, TAO_Operation_Details &details - ACE_ENV_ARG_DECL); + ); /** * @name Helper methods for making different types of invocations. @@ -179,7 +177,7 @@ namespace TAO TAO_Operation_Details &details, CORBA::Object_var &effective_target, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL); + ); /// Make a collocated call. /** @@ -197,7 +195,7 @@ namespace TAO TAO_Operation_Details &details, CORBA::Object_var &effective_target, Collocation_Strategy strat - ACE_ENV_ARG_DECL); + ); /// Helper method to make a two way invocation. /** @@ -211,7 +209,7 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL); + ); /// Helper method to make a one way invocation. /** @@ -225,7 +223,7 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL); + ); //@} /// Helper function that extracts the roundtrip timeout policies @@ -234,14 +232,14 @@ namespace TAO ACE_Time_Value &val); /// Helper method that extracts TAO_Stub from the target object. - TAO_Stub *get_stub (ACE_ENV_SINGLE_ARG_DECL) const; + TAO_Stub *get_stub (void) const; /// Helper method that takes care of setting the profiles within /// the stub object if the target gets forwarded void object_forwarded (CORBA::Object_var &effective_target, TAO_Stub *stub, CORBA::Boolean permanent_forward - ACE_ENV_ARG_DECL); + ); /// Helper method to set the response flags within @a details void set_response_flags (TAO_Stub *stub, diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index a5558b74465..51741319030 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -80,39 +80,24 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 Invocation_Status - Invocation_Base::send_request_interception (ACE_ENV_SINGLE_ARG_DECL) + Invocation_Base::send_request_interception (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (adapter_ != 0) { - ACE_TRY + try { this->adapter_->send_request (*this - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { - (void) this->handle_any_exception (&ACE_ANY_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) this->handle_any_exception (&ex + ); // This is a begin interception point - ACE_RE_THROW; + throw; } - # if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL - { - (void) this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - // This is a begin interception point - ACE_RE_THROW; - } - # endif /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */ - ACE_ENDTRY; - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); if (this->forwarded_to_.in ()) return TAO_INVOKE_RESTART; @@ -123,37 +108,21 @@ namespace TAO } Invocation_Status - Invocation_Base::receive_reply_interception (ACE_ENV_SINGLE_ARG_DECL) + Invocation_Base::receive_reply_interception (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (adapter_ != 0) { - ACE_TRY - { - this->adapter_->receive_reply (*this - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY + try { - (void) this->handle_any_exception (&ACE_ANY_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_RE_THROW; + this->adapter_->receive_reply (*this); } - # if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL + catch ( ::CORBA::Exception& ex) { - (void) this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) this->handle_any_exception (&ex ); - ACE_RE_THROW; + throw; } - # endif /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */ - ACE_ENDTRY; - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); PortableInterceptor::ReplyStatus const status = this->adapter_->reply_status (*this); @@ -168,37 +137,21 @@ namespace TAO Invocation_Status - Invocation_Base::receive_other_interception (ACE_ENV_SINGLE_ARG_DECL) + Invocation_Base::receive_other_interception (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (adapter_ != 0) { - ACE_TRY + try { - this->adapter_->receive_other (*this - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - (void) this->handle_any_exception (&ACE_ANY_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_RE_THROW; + this->adapter_->receive_other (*this); } - # if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL + catch ( ::CORBA::Exception& ex) { - (void) this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) this->handle_any_exception (&ex); - ACE_RE_THROW; + throw; } - # endif /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */ - ACE_ENDTRY; - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); if (this->forwarded_to_.in ()) return TAO_INVOKE_RESTART; @@ -209,7 +162,7 @@ namespace TAO PortableInterceptor::ReplyStatus Invocation_Base::handle_any_exception (CORBA::Exception *ex - ACE_ENV_ARG_DECL) + ) { this->exception (ex); @@ -219,8 +172,7 @@ namespace TAO if (adapter_ != 0) { this->adapter_->receive_exception (*this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableInterceptor::UNKNOWN); + ); if (this->forwarded_to_.in ()) { @@ -236,7 +188,7 @@ namespace TAO } PortableInterceptor::ReplyStatus - Invocation_Base::handle_all_exception (ACE_ENV_SINGLE_ARG_DECL) + Invocation_Base::handle_all_exception (void) { CORBA::UNKNOWN ex; this->exception (&ex); @@ -247,8 +199,7 @@ namespace TAO if (adapter_ != 0) { this->adapter_->receive_exception (*this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableInterceptor::UNKNOWN); + ); status = this->adapter_->reply_status (*this); @@ -265,7 +216,7 @@ namespace TAO else if (CORBA::UserException::_downcast (exception) != 0) this->invoke_status_ = TAO::TAO_INVOKE_USER_EXCEPTION; - this->forwarded_to_ = CORBA::Object::_nil (); + this->forwarded_to_ = CORBA::Object::_nil (); this->caught_exception_ = exception; } diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h index 328127e9dc0..27f204854e9 100644 --- a/TAO/tao/Invocation_Base.h +++ b/TAO/tao/Invocation_Base.h @@ -198,27 +198,27 @@ namespace TAO protected: /// Helper method to invoke send_request interception call to all /// the registered interceptors. - Invocation_Status send_request_interception (ACE_ENV_SINGLE_ARG_DECL) + Invocation_Status send_request_interception (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Helper method to invoke receive_reply interception call to all /// the registered interceptors. - Invocation_Status receive_reply_interception (ACE_ENV_SINGLE_ARG_DECL) + Invocation_Status receive_reply_interception (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Helper method to invoke receive_other interception call to all /// the registered interceptors. - Invocation_Status receive_other_interception (ACE_ENV_SINGLE_ARG_DECL) + Invocation_Status receive_other_interception (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Helper methods to handle interception calls when exceptions /// are thrown by the PortableInterceptor. PortableInterceptor::ReplyStatus handle_any_exception (CORBA::Exception *e - ACE_ENV_ARG_DECL); + ); PortableInterceptor::ReplyStatus - handle_all_exception (ACE_ENV_SINGLE_ARG_DECL); + handle_all_exception (void); protected: /// The client requestor adapter diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index 5221ee8d9c5..111265b0243 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -29,7 +29,7 @@ TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void) void TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver *r, ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + ) { do { @@ -53,8 +53,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver bool success = r->try_parallel_connect (&desc, max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Check if the connect has completed. if (success) @@ -76,8 +75,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver bool retval = r->try_connect (&desc, max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Check if the connect has completed. if (retval) @@ -91,7 +89,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver // If we get here, we completely failed to find an endpoint selector // that we know how to use, so throw an exception. - ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2, + throw ( ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h index 29b33b7d37d..d7142cd86d3 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.h +++ b/TAO/tao/Invocation_Endpoint_Selectors.h @@ -44,7 +44,6 @@ namespace TAO namespace CORBA { class Exception; - class Environment; } /** * @class TAO_Invocation_Endpoint_Selector @@ -70,7 +69,7 @@ public: /// Select the endpoint and set @a r's @c profile_ virtual void select_endpoint (TAO::Profile_Transport_Resolver *r, ACE_Time_Value *val - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; @@ -98,7 +97,7 @@ public: virtual void select_endpoint (TAO::Profile_Transport_Resolver *r, ACE_Time_Value *val - ACE_ENV_ARG_DECL); + ); }; diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp index 694bf8190b9..220f01e1cc8 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp @@ -47,25 +47,22 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport ( { // @todo This is not the right way to do this.... - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO_ORB_Core *orb_core = transport->orb_core (); while (!transport->queue_is_empty ()) { - int result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + int result = orb_core->run (0, 1); if (result == -1) return -1; } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 75f80855da7..349f4e52513 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -39,8 +39,7 @@ CORBA::LocalObject::_remove_ref (void) // create hash tables. CORBA::ULong -CORBA::LocalObject::_hash (CORBA::ULong maximum - ACE_ENV_ARG_DECL_NOT_USED) +CORBA::LocalObject::_hash (CORBA::ULong maximum) { // Note that we reinterpret_cast to an "ptrdiff_t" instead of // CORBA::ULong since we need to first cast to an integer large @@ -60,8 +59,7 @@ CORBA::LocalObject::_hash (CORBA::ULong maximum // such as strcmp(), to allow more comparison algorithms. CORBA::Boolean -CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj - ACE_ENV_ARG_DECL_NOT_USED) +CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj) ACE_THROW_SPEC (()) { return (other_obj == this) ? true : false; @@ -71,7 +69,7 @@ CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj TAO::ObjectKey * -CORBA::LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL) +CORBA::LocalObject::_key (void) { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, @@ -87,7 +85,7 @@ CORBA::LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL) // the latter case, return FALSE. CORBA::Boolean -CORBA::LocalObject::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::LocalObject::_non_existent (void) { // Always return false. return false; @@ -99,10 +97,9 @@ CORBA::LocalObject::_create_request (CORBA::Context_ptr, CORBA::NVList_ptr, CORBA::NamedValue_ptr, CORBA::Request_ptr &, - CORBA::Flags - ACE_ENV_ARG_DECL) + CORBA::Flags) { - ACE_THROW (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, + throw ( ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO)); } @@ -114,16 +111,14 @@ CORBA::LocalObject::_create_request (CORBA::Context_ptr, CORBA::ExceptionList_ptr, CORBA::ContextList_ptr, CORBA::Request_ptr &, - CORBA::Flags - ACE_ENV_ARG_DECL) + CORBA::Flags) { - ACE_THROW (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, + throw ( ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO)); } CORBA::Request_ptr -CORBA::LocalObject::_request (const char * - ACE_ENV_ARG_DECL) +CORBA::LocalObject::_request (const char *) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO), @@ -131,7 +126,7 @@ CORBA::LocalObject::_request (const char * } CORBA::Object_ptr -CORBA::LocalObject::_get_component (ACE_ENV_SINGLE_ARG_DECL) +CORBA::LocalObject::_get_component (void) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO), @@ -139,7 +134,7 @@ CORBA::LocalObject::_get_component (ACE_ENV_SINGLE_ARG_DECL) } char * -CORBA::LocalObject::_repository_id (ACE_ENV_SINGLE_ARG_DECL) +CORBA::LocalObject::_repository_id (void) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO), @@ -147,7 +142,7 @@ CORBA::LocalObject::_repository_id (ACE_ENV_SINGLE_ARG_DECL) } CORBA::InterfaceDef_ptr -CORBA::LocalObject::_get_interface (ACE_ENV_SINGLE_ARG_DECL) +CORBA::LocalObject::_get_interface (void) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO), @@ -155,7 +150,7 @@ CORBA::LocalObject::_get_interface (ACE_ENV_SINGLE_ARG_DECL) } CORBA::ImplementationDef_ptr -CORBA::LocalObject::_get_implementation (ACE_ENV_SINGLE_ARG_DECL) +CORBA::LocalObject::_get_implementation (void) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } @@ -165,8 +160,7 @@ CORBA::LocalObject::_get_implementation (ACE_ENV_SINGLE_ARG_DECL) #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr -CORBA::LocalObject::_get_policy (CORBA::PolicyType - ACE_ENV_ARG_DECL) +CORBA::LocalObject::_get_policy (CORBA::PolicyType) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO), @@ -174,16 +168,14 @@ CORBA::LocalObject::_get_policy (CORBA::PolicyType } CORBA::Policy_ptr -CORBA::LocalObject::_get_cached_policy (TAO_Cached_Policy_Type - ACE_ENV_ARG_DECL) +CORBA::LocalObject::_get_cached_policy (TAO_Cached_Policy_Type) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CORBA::Object_ptr CORBA::LocalObject::_set_policy_overrides (const CORBA::PolicyList &, - CORBA::SetOverrideType - ACE_ENV_ARG_DECL) + CORBA::SetOverrideType) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO), @@ -191,8 +183,7 @@ CORBA::LocalObject::_set_policy_overrides (const CORBA::PolicyList &, } CORBA::PolicyList * -CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq & - ACE_ENV_ARG_DECL) +CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO), @@ -200,8 +191,7 @@ CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq & } CORBA::Boolean -CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out - ACE_ENV_ARG_DECL) +CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO), @@ -211,7 +201,7 @@ CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ CORBA::ORB_ptr -CORBA::LocalObject::_get_orb (ACE_ENV_SINGLE_ARG_DECL) +CORBA::LocalObject::_get_orb (void) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO), diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index 8c57edb4b6c..bc700bac3c3 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -63,43 +63,31 @@ namespace CORBA * regular object. Or, even easier, add a @c is_local member into * CORBA::Object. I'll take the easier route for now. */ - static LocalObject_ptr _narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + static LocalObject_ptr _narrow (CORBA::Object_ptr obj); #if (TAO_HAS_MINIMUM_CORBA == 0) /// Always returns false. - virtual CORBA::Boolean _non_existent ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual CORBA::Boolean _non_existent (void); /// Throws CORBA::NO_IMPLEMENT. - virtual CORBA::ImplementationDef_ptr _get_implementation ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual CORBA::ImplementationDef_ptr _get_implementation (void); /// Gets info about object from the Interface Repository. - virtual CORBA::InterfaceDef_ptr _get_interface ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual CORBA::InterfaceDef_ptr _get_interface (void); /// Throws NO_IMPLEMENT. - virtual CORBA::Object_ptr _get_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual CORBA::Object_ptr _get_component (void); /// Get the repository id. - virtual char * _repository_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual char * _repository_id (void); virtual void _create_request (CORBA::Context_ptr ctx, const char * operation, CORBA::NVList_ptr arg_list, CORBA::NamedValue_ptr result, CORBA::Request_ptr & request, - CORBA::Flags req_flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::Flags req_flags); virtual void _create_request (CORBA::Context_ptr ctx, const char * operation, @@ -108,43 +96,33 @@ namespace CORBA CORBA::ExceptionList_ptr exclist, CORBA::ContextList_ptr ctxtlist, CORBA::Request_ptr & request, - CORBA::Flags req_flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::Flags req_flags); /// Throws NO_IMPLEMENT. - virtual CORBA::Request_ptr _request (const char * operation - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Request_ptr _request (const char * operation); #endif /* TAO_HAS_MINIMUM_CORBA */ #if (TAO_HAS_CORBA_MESSAGING == 1) /// Throws CORBA::NO_IMPLEMENT. - CORBA::Policy_ptr _get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::Policy_ptr _get_policy (CORBA::PolicyType type); /// Throws CORBA::NO_IMPLEMENT. - CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type); /// Throws CORBA::NO_IMPLEMENT. CORBA::Object_ptr _set_policy_overrides ( const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); + CORBA::SetOverrideType set_add); /// Throws CORBA::NO_IMPLEMENT. CORBA::PolicyList * _get_policy_overrides ( - const CORBA::PolicyTypeSeq & types - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); + const CORBA::PolicyTypeSeq & types); /// Throws CORBA::NO_IMPLEMENT. CORBA::Boolean _validate_connection ( - CORBA::PolicyList_out inconsistent_policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); + CORBA::PolicyList_out inconsistent_policies); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -153,8 +131,7 @@ namespace CORBA * address of the object. On non-32 bit platforms, the hash may * be non-unique. */ - virtual CORBA::ULong _hash (CORBA::ULong maximum - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::ULong _hash (CORBA::ULong maximum); /** * Try to determine if this object is the same as @c other_obj. @@ -163,8 +140,7 @@ namespace CORBA * different ORB protocols are in use) there is no default * implementation. */ - virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj) ACE_THROW_SPEC (()); // = Reference count managment. @@ -174,14 +150,12 @@ namespace CORBA /// Decrement the reference count. virtual void _remove_ref (void); - virtual CORBA::ORB_ptr _get_orb ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual CORBA::ORB_ptr _get_orb (void); // = TAO extensions /// Throws CORBA::NO_IMPLEMENT. - virtual TAO::ObjectKey * _key (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO::ObjectKey * _key (void); /// Useful for template programming. typedef LocalObject_ptr _ptr_type; diff --git a/TAO/tao/LocalObject.inl b/TAO/tao/LocalObject.inl index 3b84db89160..151ac30f6ed 100644 --- a/TAO/tao/LocalObject.inl +++ b/TAO/tao/LocalObject.inl @@ -25,8 +25,7 @@ CORBA::LocalObject::_nil (void) ACE_INLINE CORBA::LocalObject_ptr -CORBA::LocalObject::_narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED) +CORBA::LocalObject::_narrow (CORBA::Object_ptr obj) { if (obj->_is_local () != 0) { diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp index 203bcd5f605..6095fdcd4e3 100644 --- a/TAO/tao/LocateRequest_Invocation.cpp +++ b/TAO/tao/LocateRequest_Invocation.cpp @@ -31,8 +31,7 @@ namespace TAO } Invocation_Status - LocateRequest_Invocation::invoke (ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + LocateRequest_Invocation::invoke (ACE_Time_Value *max_wait_time) ACE_THROW_SPEC ((CORBA::Exception)) { ACE_Countdown_Time countdown (max_wait_time); @@ -58,8 +57,7 @@ namespace TAO } TAO_Target_Specification tspec; - this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + this->init_target_spec (tspec); TAO_Transport *transport = this->resolver_.transport (); @@ -70,7 +68,6 @@ namespace TAO transport->generate_locate_request (tspec, this->details_, cdr); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); if (retval == -1) return TAO_INVOKE_FAILURE; @@ -80,9 +77,7 @@ namespace TAO Invocation_Status s = this->send_message (cdr, TAO_Transport::TAO_TWOWAY_REQUEST, - max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + max_wait_time); if (s != TAO_INVOKE_SUCCESS) return s; @@ -98,13 +93,9 @@ namespace TAO s = this->wait_for_reply (max_wait_time, rd, - dispatch_guard - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + dispatch_guard); - s = this->check_reply (rd - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + s = this->check_reply (rd); // For some strategies one may want to release the transport // back to cache after receiving the reply. If the idling is @@ -116,8 +107,7 @@ namespace TAO } Invocation_Status - LocateRequest_Invocation::check_reply (TAO_Synch_Reply_Dispatcher &rd - ACE_ENV_ARG_DECL) + LocateRequest_Invocation::check_reply (TAO_Synch_Reply_Dispatcher &rd) { TAO_InputCDR &cdr = rd.reply_cdr (); @@ -136,7 +126,7 @@ namespace TAO case TAO_GIOP_OBJECT_FORWARD: case TAO_GIOP_OBJECT_FORWARD_PERM: return this->location_forward (cdr - ACE_ENV_ARG_PARAMETER); + ); case TAO_GIOP_LOC_SYSTEM_EXCEPTION: { @@ -176,9 +166,7 @@ namespace TAO // Now set this addressing mode in the profile, so that // the next invocation need not go through this. - this->resolver_.profile ()->addressing_mode (addr_mode - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_SUCCESS); + this->resolver_.profile ()->addressing_mode (addr_mode); // Restart the invocation. return TAO_INVOKE_RESTART; diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h index 40b213eef37..d1aaebf63da 100644 --- a/TAO/tao/LocateRequest_Invocation.h +++ b/TAO/tao/LocateRequest_Invocation.h @@ -65,15 +65,12 @@ namespace TAO TAO_Operation_Details &detail); /// Start the invocation. - Invocation_Status invoke (ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + Invocation_Status invoke (ACE_Time_Value *max_wait_time) ACE_THROW_SPEC ((CORBA::Exception)); private: /// Helper to check the reply status - Invocation_Status check_reply (TAO_Synch_Reply_Dispatcher &rd - ACE_ENV_ARG_DECL); - + Invocation_Status check_reply (TAO_Synch_Reply_Dispatcher &rd); }; } diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index a8058d59eeb..dc2fa190857 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -25,14 +25,14 @@ namespace TAO } void - LocateRequest_Invocation_Adapter::invoke (ACE_ENV_SINGLE_ARG_DECL) + LocateRequest_Invocation_Adapter::invoke (void) { CORBA::Object * const effective_target = this->target_; TAO_Stub * const stub = this->target_->_stubobj (); if (stub == 0) - ACE_THROW (CORBA::INTERNAL ( + throw ( ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -44,7 +44,7 @@ namespace TAO // there are multiple ORB instances in the process, each with its // own, local configuration. ACE_Service_Config_Guard scg (stub->orb_core ()->configuration ()); - + ACE_Time_Value tmp_wait_time; ACE_Time_Value *max_wait_time = 0; @@ -63,15 +63,13 @@ namespace TAO stub, true); - ACE_TRY + try { resolver.init_inconsistent_policies ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ); resolver.resolve (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // Dummy operation details that is used to instantiate the // LocateRequest class. @@ -84,21 +82,18 @@ namespace TAO op); s = synch.invoke (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (CORBA::INV_POLICY, ex) + catch ( ::CORBA::INV_POLICY&) { this->list_ = resolver.steal_inconsistent_policies (); - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } return; diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h index cfed80c24fc..f0d092ad31b 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.h +++ b/TAO/tao/LocateRequest_Invocation_Adapter.h @@ -57,7 +57,7 @@ namespace TAO CORBA::Object_ptr target); /// Start the invocation on the target - void invoke (ACE_ENV_SINGLE_ARG_DECL); + void invoke (void); /// Accessor to the inconsistent policy list CORBA::PolicyList *get_inconsistent_policies (void); diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index a816035353b..2a8c88be7b7 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -2,7 +2,6 @@ #include "tao/default_ports.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" -#include "tao/Environment.h" #include "tao/debug.h" #include "ace/SOCK_Acceptor.h" @@ -39,8 +38,7 @@ TAO_MCAST_Parser::match_prefix (const char *ior_string) const CORBA::Object_ptr TAO_MCAST_Parser::parse_string (const char *ior, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + CORBA::ORB_ptr orb) ACE_THROW_SPEC ((CORBA::SystemException)) { const char *mcast_name = @@ -65,9 +63,7 @@ TAO_MCAST_Parser::parse_string (const char *ior, this->mcast_ttl_.in (), this->mcast_nic_.in (), orb, - timeout - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + timeout); return object; } @@ -79,8 +75,7 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name, const char *mcast_ttl, const char *mcast_nic, CORBA::ORB_ptr orb, - ACE_Time_Value *timeout - ACE_ENV_ARG_DECL) + ACE_Time_Value *timeout) { char buf[2048]; char *ior = buf; @@ -109,9 +104,7 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name, { // Convert IOR to an object reference. return_value = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + orb->string_to_object (ior); } // Return object reference. diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h index d8132a6f52f..35c8f170ad7 100644 --- a/TAO/tao/MCAST_Parser.h +++ b/TAO/tao/MCAST_Parser.h @@ -51,8 +51,7 @@ public: /// Parse the ior-string that is passed. virtual CORBA::Object_ptr parse_string (const char *ior, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ORB_ptr orb) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -63,8 +62,7 @@ private: const char *mcast_ttl, const char *mcast_nic, CORBA::ORB_ptr orb, - ACE_Time_Value *timeout - ACE_ENV_ARG_DECL_NOT_USED); + ACE_Time_Value *timeout); int multicast_query (char *&buf, const char *service_name, diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index 7433ee4d8c4..221ca7cfeaf 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -2,7 +2,6 @@ // // $Id$ #include "tao/MProfile.h" -#include "tao/Environment.h" #include "tao/Profile.h" #include "tao/PolicyC.h" #include "tao/ORB_Constants.h" @@ -25,22 +24,19 @@ TAO_MProfile::~TAO_MProfile (void) { if (this->policy_list_ != 0) { - ACE_DECLARE_NEW_CORBA_ENV; - const CORBA::ULong len = this->policy_list_->length (); + CORBA::ULong const len = this->policy_list_->length (); for (CORBA::ULong i = 0; i < len; ++i) { - ACE_TRY + try { CORBA::Policy_ptr policy = (*this->policy_list_)[i]; - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy->destroy (); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Ignore all exceptions to allow other policies to be // destroyed. } - ACE_ENDTRY; } delete this->policy_list_; @@ -289,8 +285,7 @@ TAO_MProfile::is_equivalent (const TAO_MProfile *rhs) } CORBA::ULong -TAO_MProfile::hash (CORBA::ULong max - ACE_ENV_ARG_DECL) +TAO_MProfile::hash (CORBA::ULong max) { CORBA::ULong hashval = 0; @@ -299,9 +294,7 @@ TAO_MProfile::hash (CORBA::ULong max for (TAO_PHandle h = 0; h < this->last_ ; ++h) { - hashval += pfiles_[h]->hash (max - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + hashval += pfiles_[h]->hash (max); } // The above hash function return an ULong between 0 and max here we @@ -312,7 +305,7 @@ TAO_MProfile::hash (CORBA::ULong max } void -TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL) +TAO_MProfile::create_policy_list (void) { ACE_NEW_THROW_EX (this->policy_list_, CORBA::PolicyList, @@ -322,21 +315,19 @@ TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_MProfile::init_policy_list (ACE_ENV_SINGLE_ARG_DECL) +TAO_MProfile::init_policy_list (void) { // The first time this method is called // it causes the initialization of the policies // for the current profile. - this->get_current_profile ()->get_policies (*this->policy_list_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->get_current_profile ()->get_policies (*this->policy_list_); - this->is_policy_list_initialized_ = 1; + this->is_policy_list_initialized_ = true; } CORBA::PolicyList * -TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL) +TAO_MProfile::policy_list (void) { if (!this->is_policy_list_initialized_) { @@ -347,11 +338,9 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL) if (this->policy_list_ == 0) { - this->create_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->create_policy_list (); - this->init_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->init_policy_list (); } } CORBA::PolicyList *ret_val = 0; @@ -359,7 +348,6 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL) CORBA::PolicyList (*this->policy_list_), CORBA::NO_MEMORY (0, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return ret_val; } diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index 017c098ee0d..bd0b6f49c93 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -17,13 +17,12 @@ #define TAO_MPROFILE_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" +#include "ace/Recursive_Thread_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Recursive_Thread_Mutex.h" #include /**/ "tao/TAO_Export.h" #include "tao/Basic_Types.h" @@ -36,8 +35,6 @@ class TAO_Profile; namespace CORBA { class PolicyList; - - class Environment; } typedef CORBA::ULong TAO_PHandle; @@ -172,14 +169,13 @@ public: * profile and the results are averaged together. * NON-THREAD SAFE. */ - CORBA::ULong hash (CORBA::ULong max - ACE_ENV_ARG_DECL); + CORBA::ULong hash (CORBA::ULong max); protected: /// This method handle the dynamic allocation of the data member /// <policy_list_>. - void create_policy_list (ACE_ENV_SINGLE_ARG_DECL); + void create_policy_list (void); public: @@ -189,12 +185,12 @@ public: /// Gets the policies list associated with the profiles /// owned by the TAO_MProfile. - CORBA::PolicyList *policy_list (ACE_ENV_SINGLE_ARG_DECL); + CORBA::PolicyList *policy_list (void); protected: /// Initialize the policy list, demarsharling the policy. - void init_policy_list (ACE_ENV_SINGLE_ARG_DECL); + void init_policy_list (void); protected: /// Stores the policy list for the profile of this MProfile. diff --git a/TAO/tao/MProfile.inl b/TAO/tao/MProfile.inl index 2cf4d05d274..2a2d95f46d5 100644 --- a/TAO/tao/MProfile.inl +++ b/TAO/tao/MProfile.inl @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_MProfile::TAO_MProfile (CORBA::ULong sz) : policy_list_ (0), - is_policy_list_initialized_ (0), + is_policy_list_initialized_ (false), forward_from_(0), pfiles_ (0), current_ (0), @@ -21,7 +21,7 @@ TAO_MProfile::TAO_MProfile (CORBA::ULong sz) ACE_INLINE TAO_MProfile::TAO_MProfile (const TAO_MProfile &mprofiles) : policy_list_ (0), - is_policy_list_initialized_ (0), + is_policy_list_initialized_ (false), forward_from_(0), pfiles_ (0), current_ (0), diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 0a1f3912dc9..45d42f11694 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -54,21 +54,17 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) // If sending the exception to the client fails, then we just give // up, release the transport and return. - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code (TAO_AMH_REPLY_LOCATION_CODE, EFAULT), CORBA::COMPLETED_NO); - this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_tao_rh_send_exception (ex); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; - ACE_CHECK; } void @@ -86,7 +82,7 @@ TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request, } void -TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL) +TAO_AMH_Response_Handler::_tao_rh_init_reply (void) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -99,7 +95,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL) // request and is now trying to send back the reply. Hence we // say that the operation has completed but let the server // anyway that it is not doing something right. - ACE_THROW (CORBA::BAD_INV_ORDER + throw ( ::CORBA::BAD_INV_ORDER (CORBA::SystemException::_tao_minor_code (TAO_AMH_REPLY_LOCATION_CODE, EEXIST), @@ -135,7 +131,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL) +TAO_AMH_Response_Handler::_tao_rh_send_reply (void) { { @@ -145,7 +141,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL) // server-app saying it is not doing something right. if (this->reply_status_ != TAO_RS_INITIALIZED) { - ACE_THROW (CORBA::BAD_INV_ORDER ( + throw ( ::CORBA::BAD_INV_ORDER ( CORBA::SystemException::_tao_minor_code ( TAO_AMH_REPLY_LOCATION_CODE, ENOTSUP), @@ -181,13 +177,13 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL) void TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex - ACE_ENV_ARG_DECL) + ) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->reply_status_ != TAO_RS_UNINITIALIZED) { - ACE_THROW (CORBA::BAD_INV_ORDER ( + throw ( ::CORBA::BAD_INV_ORDER ( CORBA::SystemException::_tao_minor_code ( TAO_AMH_REPLY_LOCATION_CODE, ENOTSUP), @@ -212,7 +208,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex reply_params, ex) == -1) { - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } // Send the Exception diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 585ed1defea..9f25b914054 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -99,14 +99,14 @@ protected: /// Sets up the various parameters in anticipation of returning a reply /// to the client. return/OUT/INOUT arguments are marshalled into the /// Output stream after this method has been called. - void _tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL); + void _tao_rh_init_reply (void); /// Sends the marshalled reply back to the client. - void _tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL); + void _tao_rh_send_reply (void); /// Send back an exception to the client. void _tao_rh_send_exception (CORBA::Exception &ex - ACE_ENV_ARG_DECL); + ); protected: diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index 7296456a0ad..6734704c028 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -40,12 +40,11 @@ namespace TAO Invocation_Status Asynch_Remote_Invocation::remote_invocation (ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::Exception)) { TAO_Target_Specification tspec; - this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + this->init_target_spec (tspec); TAO_OutputCDR &cdr = this->resolver_.transport ()->messaging_object ()->out_stream (); @@ -54,8 +53,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 s = - this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + this->send_request_interception (); if (s != TAO_INVOKE_SUCCESS) return s; @@ -64,7 +62,7 @@ namespace TAO // We have started the interception flow. We need to call the // ending interception flow if things go wrong. The purpose of the // try block is to take care of the cases when things go wrong. - ACE_TRY + try { // Oneway semantics. See comments for below send_message() // call. @@ -75,12 +73,10 @@ namespace TAO this->write_header (tspec, cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); this->marshal_data (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // Register a reply dispatcher for this invocation. Use the // preallocated reply dispatcher. @@ -115,8 +111,7 @@ namespace TAO this->send_message (cdr, TAO_Transport::TAO_ONEWAY_REQUEST, max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); #if TAO_HAS_INTERCEPTORS == 1 // NOTE: We don't need to do the auto_ptr <> trick. We got here @@ -132,8 +127,7 @@ namespace TAO // proper send, we are supposed to call receiver_other () // interception point. So we do that here Invocation_Status tmp = - this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_other_interception (); // We got an error during the interception. if (s == TAO_INVOKE_SUCCESS && tmp != TAO_INVOKE_SUCCESS) @@ -152,13 +146,11 @@ namespace TAO (void) this->resolver_.transport_released (); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ReplyStatus const status = - this->handle_any_exception (&ACE_ANY_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->handle_any_exception (&ACE_ANY_EXCEPTION); if (status == PortableInterceptor::LOCATION_FORWARD || status == PortableInterceptor::TRANSPORT_RETRY) @@ -166,28 +158,8 @@ namespace TAO else if (status == PortableInterceptor::SYSTEM_EXCEPTION || status == PortableInterceptor::USER_EXCEPTION) #endif /*TAO_HAS_INTERCEPTORS*/ - ACE_RE_THROW; + throw; } -# if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL - { -#if TAO_HAS_INTERCEPTORS == 1 - PortableInterceptor::ReplyStatus st = - this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (st == PortableInterceptor::LOCATION_FORWARD || - st == PortableInterceptor::TRANSPORT_RETRY) - s = TAO_INVOKE_RESTART; - else -#endif /*TAO_HAS_INTERCEPTORS == 1*/ - ACE_RE_THROW; - } -# endif /* ACE_HAS_EXCEPTIONS && - ACE_HAS_BROKEN_UNEXPECTED_EXCEPTION*/ - ACE_ENDTRY; - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); return s; } diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h index 930d223bd3c..0aee5c7a088 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.h +++ b/TAO/tao/Messaging/Asynch_Invocation.h @@ -56,7 +56,7 @@ namespace TAO bool response_expected = true); Invocation_Status remote_invocation (ACE_Time_Value *value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::Exception)); protected: diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index f0ef8094e34..e2794ff2189 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -48,11 +48,10 @@ namespace TAO Asynch_Invocation_Adapter::invoke ( Messaging::ReplyHandler_ptr reply_handler_ptr, const TAO_Reply_Handler_Skeleton &reply_handler_skel - ACE_ENV_ARG_DECL) + ) { TAO_Stub * stub = - this->get_stub (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_stub (); if (TAO_debug_level >= 4) { @@ -99,24 +98,22 @@ namespace TAO if (rd == 0) { - ACE_THROW (CORBA::NO_MEMORY ()); + throw ( ::CORBA::NO_MEMORY ()); } this->safe_rd_.reset (rd); } - Invocation_Adapter::invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + Invocation_Adapter::invoke (0, 0); } void Asynch_Invocation_Adapter::invoke ( TAO::Exception_Data *ex, unsigned long ex_count - ACE_ENV_ARG_DECL) + ) { - Invocation_Adapter::invoke (ex, ex_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + Invocation_Adapter::invoke (ex, ex_count ); } Invocation_Status @@ -125,7 +122,7 @@ namespace TAO TAO_Operation_Details &details, CORBA::Object_var &effective_target, Collocation_Strategy strat - ACE_ENV_ARG_DECL) + ) { // When doing a collocation asynch invocation we shouldn't use the // stub args but use the skel args @@ -135,7 +132,7 @@ namespace TAO details, effective_target, strat - ACE_ENV_ARG_PARAMETER); + ); } Invocation_Status @@ -144,7 +141,7 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL) + ) { // Simple sanity check if (this->mode_ != TAO_ASYNCHRONOUS_CALLBACK_INVOCATION @@ -172,8 +169,7 @@ namespace TAO this->safe_rd_->schedule_timer ( op.request_id (), *max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); } } @@ -186,8 +182,7 @@ namespace TAO Invocation_Status const s = asynch.remote_invocation (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); if (s == TAO_INVOKE_RESTART && asynch.is_forwarded ()) @@ -204,8 +199,7 @@ namespace TAO this->object_forwarded (effective_target, r.stub (), permanent_forward - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); } return s; diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index 0a36175d751..85c7501e9dd 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -43,7 +43,6 @@ class TAO_Asynch_Reply_Dispatcher_Base; namespace CORBA { class Object; - class Environment; class SystemException; } @@ -75,11 +74,11 @@ namespace TAO void invoke (Messaging::ReplyHandler_ptr reply_handler_ptr, const TAO_Reply_Handler_Skeleton &reply_handler_skel - ACE_ENV_ARG_DECL); + ); virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count - ACE_ENV_ARG_DECL); + ); protected: virtual Invocation_Status invoke_twoway ( @@ -87,14 +86,14 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time - ACE_ENV_ARG_DECL); + ); virtual Invocation_Status invoke_collocated_i ( TAO_Stub *stub, TAO_Operation_Details &details, CORBA::Object_var &effective_target, Collocation_Strategy strat - ACE_ENV_ARG_DECL); + ); private: /// Autofunctor to manage the reply dispatcher diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index a0a4d13cf08..e6273d30a3a 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -121,22 +121,20 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply ( if (!CORBA::is_nil (this->reply_handler_.in ())) { - ACE_TRY_NEW_ENV + try { // Call the Reply Handler's skeleton. reply_handler_skel_ (this->reply_cdr_, this->reply_handler_.in (), reply_error - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception during reply handler"); } - ACE_ENDTRY; } this->decr_refcount (); @@ -147,7 +145,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply ( void TAO_Asynch_Reply_Dispatcher::connection_closed (void) { - ACE_TRY_NEW_ENV + try { if (!this->try_dispatch_reply ()) return; @@ -166,9 +164,8 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) TAO_OutputCDR out_cdr; - comm_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER); + comm_failure._tao_encode (out_cdr); - ACE_TRY_CHECK; // Turn into an output CDR TAO_InputCDR cdr (out_cdr); @@ -178,11 +175,10 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) this->reply_handler_skel_ (cdr, this->reply_handler_.in (), TAO_AMI_REPLY_SYSTEM_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) { @@ -191,7 +187,6 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) } } - ACE_ENDTRY; (void) this->decr_refcount (); } @@ -201,9 +196,8 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) void TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Generate a fake exception.... CORBA::TIMEOUT timeout_failure ( @@ -214,8 +208,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) TAO_OutputCDR out_cdr; - timeout_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + timeout_failure._tao_encode (out_cdr); // This is okay here... Everything relies on our refcount being // held by the timeout handler, whose refcount in turn is held @@ -240,11 +233,10 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) this->reply_handler_skel_ (cdr, this->reply_handler_.in (), TAO_AMI_REPLY_SYSTEM_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) { @@ -253,8 +245,6 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) } } - ACE_ENDTRY; - ACE_CHECK; (void) this->decr_refcount (); } @@ -262,7 +252,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) long TAO_Asynch_Reply_Dispatcher::schedule_timer (CORBA::ULong request_id, const ACE_Time_Value &max_wait_time - ACE_ENV_ARG_DECL) + ) { if (this->timeout_handler_ == 0) { diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h index 5b315547813..4989fb659f4 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h @@ -60,7 +60,7 @@ public: /// Install the timeout handler long schedule_timer (CORBA::ULong request_id, const ACE_Time_Value &max_wait_time - ACE_ENV_ARG_DECL); + ); private: /// Skeleton for the call back method in the Reply Handler. diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index b621a85b375..1aa3051b9a2 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -38,7 +38,7 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( TimeBase::TimeT TAO_ConnectionTimeoutPolicy::relative_expiry ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->relative_expiry_; @@ -46,7 +46,7 @@ TAO_ConnectionTimeoutPolicy::relative_expiry ( CORBA::PolicyType TAO_ConnectionTimeoutPolicy::policy_type ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO::CONNECTION_TIMEOUT_POLICY_TYPE; @@ -58,7 +58,7 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core, bool &has_timeout, ACE_Time_Value &time_value) { - ACE_TRY_NEW_ENV + try { CORBA::Policy_var policy = 0; @@ -67,16 +67,14 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core, policy = orb_core->get_cached_policy_including_current ( TAO_CACHED_POLICY_CONNECTION_TIMEOUT - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { policy = stub->get_cached_policy ( TAO_CACHED_POLICY_CONNECTION_TIMEOUT - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } if (CORBA::is_nil (policy.in ())) @@ -88,11 +86,9 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core, TAO::ConnectionTimeoutPolicy_var p = TAO::ConnectionTimeoutPolicy::_narrow ( policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); - TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + TimeBase::TimeT t = p->relative_expiry (); TimeBase::TimeT seconds = t / 10000000u; TimeBase::TimeT microseconds = (t % 10000000u) / 10; time_value.set (ACE_U64_TO_U32 (seconds), @@ -108,16 +104,15 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core, time_value.msec ())); } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Ignore all exceptions... } - ACE_ENDTRY; } CORBA::Policy_ptr TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val - ACE_ENV_ARG_DECL) + ) { // Future policy implementors: notice how the following code is // exception safe! @@ -132,7 +127,6 @@ TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val TAO_ConnectionTimeoutPolicy (value), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } @@ -148,7 +142,7 @@ TAO_ConnectionTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_ConnectionTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_ConnectionTimeoutPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is @@ -158,13 +152,12 @@ TAO_ConnectionTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO_ConnectionTimeoutPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_ConnectionTimeoutPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ConnectionTimeoutPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 9e334a307a7..67d4e401033 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -64,22 +64,22 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any& val - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Returns a copy of <this>. virtual TAO_ConnectionTimeoutPolicy *clone (void) const; // = The TAO::ConnectionTinoutPolicy methods - virtual TimeBase::TimeT relative_expiry (ACE_ENV_SINGLE_ARG_DECL) + virtual TimeBase::TimeT relative_expiry (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Change the CORBA representation to the ACE representation. diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp index a03294907a5..b66bcba0eb5 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.cpp +++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp @@ -44,7 +44,7 @@ namespace TAO } void ExceptionHolder::raise_exception ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) { TAO_Messaging_Helper::exception_holder_raise ( @@ -54,15 +54,15 @@ namespace TAO this->marshaled_exception ().length (), this->byte_order (), this->is_system_exception () - ACE_ENV_ARG_PARAMETER); + ); } void ExceptionHolder::raise_exception_with_list ( - const ::Dynamic::ExceptionList & ACE_ENV_ARG_DECL_WITH_DEFAULTS + const ::Dynamic::ExceptionList & ) { // todo convert exceptionlist to something we can really use. - this->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); + this->raise_exception (); } CORBA::ValueBase* @@ -72,7 +72,6 @@ namespace TAO ACE_NEW_THROW_EX (ret_val, ExceptionHolder, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); // @todo According to the latest corba spec we should be able to // pass this to the ExceptionHolder constructor but the TAO_IDL @@ -86,13 +85,12 @@ namespace TAO CORBA::ValueBase * ExceptionHolderFactory::create_for_unmarshal ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) { TAO::ExceptionHolder* ret_val = 0; ACE_NEW_THROW_EX (ret_val, ExceptionHolder, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return ret_val; } diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h index f19f4308d58..ea07d781443 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ b/TAO/tao/Messaging/ExceptionHolder_i.h @@ -60,10 +60,10 @@ namespace TAO void set_exception_data (::TAO::Exception_Data* data, ::CORBA::ULong exceptions_count); - virtual void raise_exception (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void raise_exception (void); virtual void raise_exception_with_list ( - const ::Dynamic::ExceptionList & exc_list ACE_ENV_ARG_DECL_WITH_DEFAULTS + const ::Dynamic::ExceptionList & exc_list ); virtual CORBA::ValueBase* _copy_value (void); @@ -91,7 +91,7 @@ namespace TAO { public: virtual CORBA::ValueBase * create_for_unmarshal ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void); }; } diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index 9f0c1f164cf..8380851f05b 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -33,7 +33,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, CORBA::ULong marshaled_data_length, CORBA::Boolean byte_order, CORBA::Boolean is_system_exception - ACE_ENV_ARG_DECL) + ) { TAO_InputCDR _tao_in ((const char*) marshaled_data, marshaled_data_length, @@ -45,7 +45,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, { // Could not demarshal the exception id, raise a local // CORBA::MARSHAL - ACE_THROW (CORBA::MARSHAL (TAO::VMCID, + throw ( ::CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_YES)); } @@ -55,7 +55,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, CORBA::ULong completion = 0; if ((_tao_in >> minor) == 0 || (_tao_in >> completion) == 0) - ACE_THROW (CORBA::MARSHAL (TAO::VMCID, + throw ( ::CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_MAYBE)); CORBA::SystemException* exception = @@ -72,9 +72,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, exception->completed (CORBA::CompletionStatus (completion)); // Raise the exception. -#if defined (TAO_HAS_EXCEPTIONS) ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(exception); -#endif ACE_ENV_RAISE (exception); return; @@ -91,15 +89,12 @@ exception_holder_raise (TAO::Exception_Data *exception_data, CORBA::Exception * const exception = exception_data[i].alloc (); if (exception == 0) - ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, + throw ( ::CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_YES)); - exception->_tao_decode (_tao_in ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + exception->_tao_decode (_tao_in); // Raise the exception. -#if defined (TAO_HAS_EXCEPTIONS) ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr (exception); -#endif ACE_ENV_RAISE (exception); return; @@ -111,7 +106,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, // @@ It would seem like if the remote exception is a // UserException we can assume that the request was // completed. - ACE_THROW (CORBA::UNKNOWN (TAO::VMCID, + throw ( ::CORBA::UNKNOWN (TAO::VMCID, CORBA::COMPLETED_YES)); } diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h index 4c4647e5432..04f69d33aa5 100644 --- a/TAO/tao/Messaging/Messaging.h +++ b/TAO/tao/Messaging/Messaging.h @@ -64,7 +64,7 @@ typedef void (*TAO_Reply_Handler_Skeleton)( TAO_InputCDR &, Messaging::ReplyHandler_ptr, CORBA::ULong reply_status - ACE_ENV_ARG_DECL_NOT_USED + ); namespace TAO @@ -89,7 +89,7 @@ namespace TAO_Messaging_Helper CORBA::ULong marshaled_data_length, CORBA::Boolean byte_order, CORBA::Boolean is_system_exception - ACE_ENV_ARG_DECL); + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index de5d02cbc7c..3b2dc178316 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -37,8 +37,7 @@ TAO_Messaging_Loader::init (int, PortableInterceptor::ORBInitializer::_nil (); PortableInterceptor::ORBInitializer_var orb_initializer; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { /// Register the Messaging ORBInitializer. @@ -49,15 +48,13 @@ TAO_Messaging_Loader::init (int, TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { @@ -66,7 +63,6 @@ TAO_Messaging_Loader::init (int, } return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index 82a57e50c9e..6d036909a46 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -17,9 +17,7 @@ ACE_RCSID (Messaging, TAO_BEGIN_VERSIONED_NAMESPACE_DECL void -TAO_Messaging_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) @@ -40,30 +38,22 @@ TAO_Messaging_ORBInitializer::pre_init ( void TAO_Messaging_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) + PortableInterceptor::ORBInitInfo_ptr info) + ACE_THROW_SPEC ((CORBA::SystemException)) { - this->register_policy_factories (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->register_policy_factories (info); - this->register_value_factory (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->register_value_factory (info); } void TAO_Messaging_ORBInitializer::register_value_factory ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) { // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. TAO_ORBInitInfo_var tao_info = - TAO_ORBInitInfo::_narrow (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + TAO_ORBInitInfo::_narrow (info); if (CORBA::is_nil (tao_info.in ())) { @@ -74,7 +64,7 @@ TAO_Messaging_ORBInitializer::register_value_factory ( "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" "(%P|%t) \"TAO_ORBInitInfo *.\"\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } TAO::ExceptionHolderFactory *base_factory = 0; @@ -84,14 +74,11 @@ TAO_Messaging_ORBInitializer::register_value_factory ( tao_info->orb_core()->orb ()->register_value_factory ( Messaging::ExceptionHolder::_tao_obv_static_repository_id (), - base_factory - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + base_factory); } void TAO_Messaging_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) { // Register the Messaging policy factories. @@ -103,7 +90,6 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::PolicyFactory_var policy_factory = @@ -160,14 +146,11 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]); for (CORBA::PolicyType *i = type; i != end; ++i) { - ACE_TRY + try { - info->register_policy_factory (*i, - policy_factory.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + info->register_policy_factory (*i, policy_factory.in ()); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch ( ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -177,15 +160,13 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( // should do no more work in this ORBInitializer. return; } - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Rethrow any other exceptions... - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h index e5d57c2a72d..443118bf601 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h @@ -49,12 +49,10 @@ public: */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -62,14 +60,10 @@ public: private: /// Register Messaging policy factories. - void register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); + void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); /// Register ExceptionHolder value factory - void register_value_factory ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); + void register_value_factory (PortableInterceptor::ORBInitInfo_ptr info); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp index 7fcda386a8b..278d07e5ec6 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp @@ -18,8 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr TAO_Messaging_PolicyFactory::create_buffering_constraint_policy ( - const CORBA::Any& val - ACE_ENV_ARG_DECL) + const CORBA::Any& val) { TAO::BufferingConstraint *buffering_constraint = 0; if ((val >>= buffering_constraint) == 0) @@ -30,7 +29,6 @@ TAO_Messaging_PolicyFactory::create_buffering_constraint_policy ( ACE_NEW_THROW_EX (servant, TAO_Buffering_Constraint_Policy (*buffering_constraint), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return servant; } @@ -40,33 +38,32 @@ TAO_Messaging_PolicyFactory::create_buffering_constraint_policy ( CORBA::Policy_ptr TAO_Messaging_PolicyFactory::create_policy ( CORBA::PolicyType type, - const CORBA::Any &value - ACE_ENV_ARG_DECL) + const CORBA::Any &value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) if (type == Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE) return TAO_RelativeRoundtripTimeoutPolicy::create (value - ACE_ENV_ARG_PARAMETER); + ); #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1) if (type == TAO::CONNECTION_TIMEOUT_POLICY_TYPE) return TAO_ConnectionTimeoutPolicy::create (value - ACE_ENV_ARG_PARAMETER); + ); #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) if (type == Messaging::SYNC_SCOPE_POLICY_TYPE) return TAO_Sync_Scope_Policy::create (value - ACE_ENV_ARG_PARAMETER); + ); #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) if (type == TAO::BUFFERING_CONSTRAINT_POLICY_TYPE) return this->create_buffering_constraint_policy (value - ACE_ENV_ARG_PARAMETER); + ); #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ if ( diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h index c2b36ed1a43..a2e5d63eae0 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.h +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h @@ -43,15 +43,13 @@ class TAO_Messaging_PolicyFactory public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const CORBA::Any & value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); private: #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) CORBA::Policy_ptr - create_buffering_constraint_policy (const CORBA::Any& val - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + create_buffering_constraint_policy (const CORBA::Any& val); #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ }; diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 39d4cc2b50a..7eba31507a7 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -42,7 +42,7 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( TimeBase::TimeT TAO_RelativeRoundtripTimeoutPolicy::relative_expiry ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->relative_expiry_; @@ -50,7 +50,7 @@ TAO_RelativeRoundtripTimeoutPolicy::relative_expiry ( CORBA::PolicyType TAO_RelativeRoundtripTimeoutPolicy::policy_type ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE; @@ -62,7 +62,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, bool &has_timeout, ACE_Time_Value &time_value) { - ACE_TRY_NEW_ENV + try { CORBA::Policy_var policy = 0; @@ -71,15 +71,13 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, policy = orb_core->get_cached_policy_including_current ( TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { policy = stub->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } if (CORBA::is_nil (policy.in ())) @@ -91,15 +89,13 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, Messaging::RelativeRoundtripTimeoutPolicy_var p = Messaging::RelativeRoundtripTimeoutPolicy::_narrow ( policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); - TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + TimeBase::TimeT t = p->relative_expiry (); TimeBase::TimeT seconds = t / 10000000u; TimeBase::TimeT microseconds = (t % 10000000u) / 10; - time_value.set (ACE_U64_TO_U32 (seconds), - ACE_U64_TO_U32 (microseconds)); + time_value.set (seconds, + microseconds); // Set the flag once all operations complete successfully has_timeout = true; @@ -111,16 +107,14 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, time_value.msec ())); } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Ignore all exceptions... } - ACE_ENDTRY; } CORBA::Policy_ptr -TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val - ACE_ENV_ARG_DECL) +TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val) { // Future policy implementors: notice how the following code is // exception safe! @@ -135,7 +129,6 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val TAO_RelativeRoundtripTimeoutPolicy (value), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } @@ -151,23 +144,22 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_RelativeRoundtripTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_RelativeRoundtripTimeoutPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is // exception safe! - TAO_RelativeRoundtripTimeoutPolicy* tmp; + TAO_RelativeRoundtripTimeoutPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_RelativeRoundtripTimeoutPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_RelativeRoundtripTimeoutPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RelativeRoundtripTimeoutPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -184,8 +176,8 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) TimeBase::TimeT t = this->relative_expiry_; TimeBase::TimeT seconds = t / 10000000u; TimeBase::TimeT microseconds = (t % 10000000u) / 10; - time_value.set (ACE_U64_TO_U32 (seconds), - ACE_U64_TO_U32 (microseconds)); + time_value.set (seconds, + microseconds); if (TAO_debug_level > 0) { @@ -222,7 +214,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) } CORBA::PolicyType -TAO_Sync_Scope_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Sync_Scope_Policy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return Messaging::SYNC_SCOPE_POLICY_TYPE; @@ -234,7 +226,7 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core, bool &has_synchronization, Messaging::SyncScope &scope) { - ACE_TRY_NEW_ENV + try { CORBA::Policy_var policy = 0; @@ -243,47 +235,42 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core, policy = orb_core->get_cached_policy_including_current ( TAO_CACHED_POLICY_SYNC_SCOPE - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { policy = stub->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } if (CORBA::is_nil (policy.in ())) { - has_synchronization = 0; + has_synchronization = false; return; } Messaging::SyncScopePolicy_var p = Messaging::SyncScopePolicy::_narrow (policy.in ()); - ACE_TRY_CHECK; if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL ( + throw ( ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_POLICY_NARROW_CODE, 0), CORBA::COMPLETED_NO)); has_synchronization = true; - scope = p->synchronization (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + scope = p->synchronization (); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Ignore all exceptions... } - ACE_ENDTRY; } CORBA::Policy_ptr TAO_Sync_Scope_Policy::create (const CORBA::Any& val - ACE_ENV_ARG_DECL) + ) { Messaging::SyncScope synchronization; if ((val >>= synchronization) == 0) @@ -294,7 +281,6 @@ TAO_Sync_Scope_Policy::create (const CORBA::Any& val ACE_NEW_THROW_EX (servant, TAO_Sync_Scope_Policy (synchronization), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return servant; } @@ -310,27 +296,26 @@ TAO_Sync_Scope_Policy::clone (void) const } Messaging::SyncScope -TAO_Sync_Scope_Policy::synchronization (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Sync_Scope_Policy::synchronization (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->synchronization_; } CORBA::Policy_ptr -TAO_Sync_Scope_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Sync_Scope_Policy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Sync_Scope_Policy *servant = 0; ACE_NEW_THROW_EX (servant, TAO_Sync_Scope_Policy (*this), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return servant; } void -TAO_Sync_Scope_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Sync_Scope_Policy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index 8e1d7ce59f2..dea4905a49a 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -57,22 +57,22 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any& val - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Returns a copy of <this>. virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const; // = The Messaging::RelativeRoundtripTimeoutPolicy methods - virtual TimeBase::TimeT relative_expiry (ACE_ENV_SINGLE_ARG_DECL) + virtual TimeBase::TimeT relative_expiry (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Change the CORBA representation to the ACE representation. @@ -122,25 +122,25 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any& val - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Returns a copy of <this>. virtual TAO_Sync_Scope_Policy *clone (void) const; // = The Messaging::SyncScopePolicy methods. - virtual Messaging::SyncScope synchronization (ACE_ENV_SINGLE_ARG_DECL) + virtual Messaging::SyncScope synchronization (void) ACE_THROW_SPEC ((CORBA::SystemException)); void get_synchronization (Messaging::SyncScope &synchronization) const; - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h index c8f27cfe0eb..250d5435b42 100644 --- a/TAO/tao/NVList_Adapter.h +++ b/TAO/tao/NVList_Adapter.h @@ -35,8 +35,6 @@ namespace CORBA class NamedValue; typedef NamedValue *NamedValue_ptr; - - class Environment; } /** @@ -49,12 +47,10 @@ public: virtual void create_list ( CORBA::Long count, - CORBA::NVList_ptr &new_list - ACE_ENV_ARG_DECL) = 0; + CORBA::NVList_ptr &new_list) = 0; virtual void create_named_value ( - CORBA::NamedValue_ptr &nv - ACE_ENV_ARG_DECL) = 0; + CORBA::NamedValue_ptr &nv) = 0; }; diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index a3ce4098b83..58f05bbe9a6 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -46,12 +46,10 @@ ACE_RCSID (tao, #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" -#if defined (ACE_HAS_EXCEPTIONS) void TAO_unexpected_exception_handler (void) { - throw CORBA::UNKNOWN (); + throw ::CORBA::UNKNOWN (); } -#endif /* ACE_HAS_EXCEPTIONS */ static const char ior_prefix[] = "IOR:"; @@ -113,8 +111,7 @@ CORBA::ORB::InvalidName::_tao_duplicate (void) const ACE_NEW_RETURN ( result, ::CORBA::ORB::InvalidName (*this), - 0 - ); + 0); return result; } @@ -124,19 +121,15 @@ void CORBA::ORB::InvalidName::_raise (void) const } void CORBA::ORB::InvalidName::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const + TAO_OutputCDR &) const { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::ORB::InvalidName::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) + TAO_InputCDR &) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } // **************************************************************** @@ -156,21 +149,18 @@ CORBA::ORB::~ORB (void) } void -CORBA::ORB::shutdown (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) +CORBA::ORB::shutdown (CORBA::Boolean wait_for_completion) { // We cannot lock the exceptions here. We need to propogate // BAD_INV_ORDER exceptions if needed to the caller. Locking // exceptions down would render us non-compliant with the spec. - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_shutdown (); - this->orb_core ()->shutdown (wait_for_completion - ACE_ENV_ARG_PARAMETER); + this->orb_core ()->shutdown (wait_for_completion); } void -CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ORB::destroy (void) { if (this->orb_core () == 0) { @@ -181,7 +171,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) // CORBA::OBJECT_NOT_EXIST exception if the ORB has been // destroyed by the time an ORB function is called. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (0, + throw ( ::CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO)); } @@ -192,8 +182,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_TEXT_CHAR_TO_TCHAR (this->orb_core ()->orbid ()))); } - this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_core ()->destroy (); // Now invalidate the pointer to the ORB_Core that created this // ORB. @@ -201,56 +190,51 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) } void -CORBA::ORB::run (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ORB::run (void) { - this->run (0 ACE_ENV_ARG_PARAMETER); + this->run (0); } void -CORBA::ORB::run (ACE_Time_Value &tv ACE_ENV_ARG_DECL) +CORBA::ORB::run (ACE_Time_Value &tv) { - this->run (&tv ACE_ENV_ARG_PARAMETER); + this->run (&tv); } void -CORBA::ORB::run (ACE_Time_Value *tv - ACE_ENV_ARG_DECL) +CORBA::ORB::run (ACE_Time_Value *tv) { - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_shutdown (); - this->orb_core ()->run (tv, 0 ACE_ENV_ARG_PARAMETER); + this->orb_core ()->run (tv, 0); } void -CORBA::ORB::perform_work (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ORB::perform_work (void) { - this->perform_work (0 ACE_ENV_ARG_PARAMETER); + this->perform_work (0); } void -CORBA::ORB::perform_work (ACE_Time_Value &tv ACE_ENV_ARG_DECL) +CORBA::ORB::perform_work (ACE_Time_Value &tv) { - this->perform_work (&tv ACE_ENV_ARG_PARAMETER); + this->perform_work (&tv); } void -CORBA::ORB::perform_work (ACE_Time_Value *tv - ACE_ENV_ARG_DECL) +CORBA::ORB::perform_work (ACE_Time_Value *tv) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_shutdown (); - this->orb_core ()->run (tv, 1 ACE_ENV_ARG_PARAMETER); + this->orb_core ()->run (tv, 1); } CORBA::Boolean -CORBA::ORB::work_pending (ACE_Time_Value &tv ACE_ENV_ARG_DECL) +CORBA::ORB::work_pending (ACE_Time_Value &tv) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_shutdown (); int const result = this->orb_core_->reactor ()->work_pending (tv); if (result == 0 || (result == -1 && errno == ETIME)) @@ -263,11 +247,10 @@ CORBA::ORB::work_pending (ACE_Time_Value &tv ACE_ENV_ARG_DECL) } CORBA::Boolean -CORBA::ORB::work_pending (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ORB::work_pending (void) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_shutdown (); const int result = this->orb_core_->reactor ()->work_pending (); if (result == 0) @@ -282,14 +265,10 @@ CORBA::ORB::work_pending (ACE_ENV_SINGLE_ARG_DECL) #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) void -CORBA::ORB::create_list (CORBA::Long count, - CORBA::NVList_ptr &new_list - ACE_ENV_ARG_DECL) +CORBA::ORB::create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) { TAO_NVList_Adapter *adapter = - ACE_Dynamic_Service<TAO_NVList_Adapter>::instance ( - "TAO_NVList_Adapter" - ); + ACE_Dynamic_Service<TAO_NVList_Adapter>::instance ("TAO_NVList_Adapter"); if (adapter == 0) { @@ -297,50 +276,43 @@ CORBA::ORB::create_list (CORBA::Long count, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("ORB unable to find the ") ACE_TEXT ("NVList Adapter instance"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } - adapter->create_list (count, new_list ACE_ENV_ARG_PARAMETER); + adapter->create_list (count, new_list); } void -CORBA::ORB::create_exception_list (CORBA::ExceptionList_ptr &list - ACE_ENV_ARG_DECL) +CORBA::ORB::create_exception_list (CORBA::ExceptionList_ptr &list) { TAO_Dynamic_Adapter *dynamic_adapter = ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance ( - TAO_ORB_Core::dynamic_adapter_name () - ); + TAO_ORB_Core::dynamic_adapter_name ()); - dynamic_adapter->create_exception_list (list - ACE_ENV_ARG_PARAMETER); + dynamic_adapter->create_exception_list (list); } void CORBA::ORB::create_operation_list (CORBA::OperationDef_ptr opDef, - CORBA::NVList_ptr &result - ACE_ENV_ARG_DECL) + CORBA::NVList_ptr &result) { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); + TAO_ORB_Core::ifr_client_adapter_name ()); if (adapter == 0) { - ACE_THROW (CORBA::INTF_REPOS ()); + throw ( ::CORBA::INTF_REPOS ()); } adapter->create_operation_list (this, opDef, - result - ACE_ENV_ARG_PARAMETER); + result); } void -CORBA::ORB::create_environment (CORBA::Environment_ptr &environment - ACE_ENV_ARG_DECL) +CORBA::ORB::create_environment (CORBA::Environment_ptr &environment) { ACE_NEW_THROW_EX (environment, CORBA::Environment (), @@ -352,13 +324,11 @@ CORBA::ORB::create_environment (CORBA::Environment_ptr &environment } void -CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv - ACE_ENV_ARG_DECL) +CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv) { TAO_NVList_Adapter *adapter = ACE_Dynamic_Service<TAO_NVList_Adapter>::instance ( - "TAO_NVList_Adapter" - ); + "TAO_NVList_Adapter"); if (adapter == 0) { @@ -367,10 +337,10 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv ACE_TEXT ("ORB unable to find the ") ACE_TEXT ("NVList Adapter instance"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } - adapter->create_named_value (nv ACE_ENV_ARG_PARAMETER); + adapter->create_named_value (nv); } // The following functions are not implemented - they just throw @@ -379,8 +349,7 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv CORBA::Boolean CORBA::ORB::get_service_information ( CORBA::ServiceType /* service_type */, - CORBA::ServiceInformation_out /* service_information */ - ACE_ENV_ARG_DECL) + CORBA::ServiceInformation_out /* service_information */) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( @@ -391,10 +360,9 @@ CORBA::ORB::get_service_information ( } void -CORBA::ORB::create_context_list (CORBA::ContextList_ptr & - ACE_ENV_ARG_DECL) +CORBA::ORB::create_context_list (CORBA::ContextList_ptr &) { - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -402,10 +370,9 @@ CORBA::ORB::create_context_list (CORBA::ContextList_ptr & } void -CORBA::ORB::get_default_context (CORBA::Context_ptr & - ACE_ENV_ARG_DECL) +CORBA::ORB::get_default_context (CORBA::Context_ptr &) { - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -413,10 +380,9 @@ CORBA::ORB::get_default_context (CORBA::Context_ptr & } void -CORBA::ORB::send_multiple_requests_oneway (const CORBA::RequestSeq & - ACE_ENV_ARG_DECL) +CORBA::ORB::send_multiple_requests_oneway (const CORBA::RequestSeq &) { - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -424,10 +390,9 @@ CORBA::ORB::send_multiple_requests_oneway (const CORBA::RequestSeq & } void -CORBA::ORB::send_multiple_requests_deferred (const CORBA::RequestSeq & - ACE_ENV_ARG_DECL) +CORBA::ORB::send_multiple_requests_deferred (const CORBA::RequestSeq &) { - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -435,10 +400,9 @@ CORBA::ORB::send_multiple_requests_deferred (const CORBA::RequestSeq & } void -CORBA::ORB::get_next_response (CORBA::Request_ptr & - ACE_ENV_ARG_DECL) +CORBA::ORB::get_next_response (CORBA::Request_ptr &) { - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -446,7 +410,7 @@ CORBA::ORB::get_next_response (CORBA::Request_ptr & } CORBA::Boolean -CORBA::ORB::poll_next_response (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ORB::poll_next_response (void) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( @@ -462,14 +426,11 @@ CORBA::TypeCode_ptr CORBA::ORB::create_struct_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::StructMemberSeq & members) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -479,8 +440,7 @@ CORBA::ORB::create_struct_tc ( return adapter->create_struct_tc (id, name, - members - ACE_ENV_ARG_PARAMETER); + members); } CORBA::TypeCode_ptr @@ -488,14 +448,11 @@ CORBA::ORB::create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, - const CORBA::UnionMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::UnionMemberSeq & members) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -506,22 +463,18 @@ CORBA::ORB::create_union_tc ( return adapter->create_union_tc (id, name, discriminator_type, - members - ACE_ENV_ARG_PARAMETER); + members); } CORBA::TypeCode_ptr CORBA::ORB::create_enum_tc ( const char *id, const char *name, - const CORBA::EnumMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::EnumMemberSeq & members) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -531,22 +484,18 @@ CORBA::ORB::create_enum_tc ( return adapter->create_enum_tc (id, name, - members - ACE_ENV_ARG_PARAMETER); + members); } CORBA::TypeCode_ptr CORBA::ORB::create_alias_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr original_type - ACE_ENV_ARG_DECL - ) + CORBA::TypeCode_ptr original_type) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -556,22 +505,18 @@ CORBA::ORB::create_alias_tc ( return adapter->create_alias_tc (id, name, - original_type - ACE_ENV_ARG_PARAMETER); + original_type); } CORBA::TypeCode_ptr CORBA::ORB::create_exception_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::StructMemberSeq & members) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -581,21 +526,17 @@ CORBA::ORB::create_exception_tc ( return adapter->create_exception_tc (id, name, - members - ACE_ENV_ARG_PARAMETER); + members); } CORBA::TypeCode_ptr CORBA::ORB::create_interface_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -604,20 +545,16 @@ CORBA::ORB::create_interface_tc ( } return adapter->create_interface_tc (id, - name - ACE_ENV_ARG_PARAMETER); + name); } CORBA::TypeCode_ptr CORBA::ORB::create_string_tc ( - CORBA::ULong bound - ACE_ENV_ARG_DECL - ) + CORBA::ULong bound) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -625,20 +562,16 @@ CORBA::ORB::create_string_tc ( 0); } - return adapter->create_string_tc (bound - ACE_ENV_ARG_PARAMETER); + return adapter->create_string_tc (bound); } CORBA::TypeCode_ptr CORBA::ORB::create_wstring_tc ( - CORBA::ULong bound - ACE_ENV_ARG_DECL - ) + CORBA::ULong bound) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -646,21 +579,17 @@ CORBA::ORB::create_wstring_tc ( 0); } - return adapter->create_wstring_tc (bound - ACE_ENV_ARG_PARAMETER); + return adapter->create_wstring_tc (bound); } CORBA::TypeCode_ptr CORBA::ORB::create_fixed_tc ( CORBA::UShort digits, - CORBA::UShort scale - ACE_ENV_ARG_DECL - ) + CORBA::UShort scale) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -669,21 +598,17 @@ CORBA::ORB::create_fixed_tc ( } return adapter->create_fixed_tc (digits, - scale - ACE_ENV_ARG_PARAMETER); + scale); } CORBA::TypeCode_ptr CORBA::ORB::create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL - ) + CORBA::TypeCode_ptr element_type) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -692,21 +617,17 @@ CORBA::ORB::create_sequence_tc ( } return adapter->create_sequence_tc (bound, - element_type - ACE_ENV_ARG_PARAMETER); + element_type); } CORBA::TypeCode_ptr CORBA::ORB::create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL - ) + CORBA::TypeCode_ptr element_type) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -715,8 +636,7 @@ CORBA::ORB::create_array_tc ( } return adapter->create_array_tc (length, - element_type - ACE_ENV_ARG_PARAMETER); + element_type); } CORBA::TypeCode_ptr @@ -725,14 +645,11 @@ CORBA::ORB::create_value_tc ( const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA::ValueMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::ValueMemberSeq & members) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -744,22 +661,18 @@ CORBA::ORB::create_value_tc ( name, type_modifier, concrete_base, - members - ACE_ENV_ARG_PARAMETER); + members); } CORBA::TypeCode_ptr CORBA::ORB::create_value_box_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr boxed_type - ACE_ENV_ARG_DECL - ) + CORBA::TypeCode_ptr boxed_type) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -769,21 +682,17 @@ CORBA::ORB::create_value_box_tc ( return adapter->create_value_box_tc (id, name, - boxed_type - ACE_ENV_ARG_PARAMETER); + boxed_type); } CORBA::TypeCode_ptr CORBA::ORB::create_native_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -792,20 +701,16 @@ CORBA::ORB::create_native_tc ( } return adapter->create_native_tc (id, - name - ACE_ENV_ARG_PARAMETER); + name); } CORBA::TypeCode_ptr CORBA::ORB::create_recursive_tc ( - const char *id - ACE_ENV_ARG_DECL - ) + const char *id) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -813,21 +718,17 @@ CORBA::ORB::create_recursive_tc ( 0); } - return adapter->create_recursive_tc (id - ACE_ENV_ARG_PARAMETER); + return adapter->create_recursive_tc (id); } CORBA::TypeCode_ptr CORBA::ORB::create_abstract_interface_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -836,21 +737,17 @@ CORBA::ORB::create_abstract_interface_tc ( } return adapter->create_abstract_interface_tc (id, - name - ACE_ENV_ARG_PARAMETER); + name); } CORBA::TypeCode_ptr CORBA::ORB::create_local_interface_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -859,21 +756,17 @@ CORBA::ORB::create_local_interface_tc ( } return adapter->create_local_interface_tc (id, - name - ACE_ENV_ARG_PARAMETER); + name); } CORBA::TypeCode_ptr CORBA::ORB::create_component_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -882,21 +775,17 @@ CORBA::ORB::create_component_tc ( } return adapter->create_component_tc (id, - name - ACE_ENV_ARG_PARAMETER); + name); } CORBA::TypeCode_ptr CORBA::ORB::create_home_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -905,8 +794,7 @@ CORBA::ORB::create_home_tc ( } return adapter->create_home_tc (id, - name - ACE_ENV_ARG_PARAMETER); + name); } CORBA::TypeCode_ptr @@ -915,14 +803,11 @@ CORBA::ORB::create_event_tc ( const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL - ) + const CORBA::ValueMemberSeq &members) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( - TAO_ORB_Core::typecodefactory_adapter_name () - ); + TAO_ORB_Core::typecodefactory_adapter_name ()); if (adapter == 0) { @@ -934,8 +819,7 @@ CORBA::ORB::create_event_tc ( name, type_modifier, concrete_base, - members - ACE_ENV_ARG_PARAMETER); + members); } // **************************************************************** @@ -1048,35 +932,28 @@ CORBA::ORB::resolve_service (TAO::MCAST_SERVICEID mcast_service_id) } CORBA::Object_ptr -CORBA::ORB::resolve_initial_references (const char *name - ACE_ENV_ARG_DECL) +CORBA::ORB::resolve_initial_references (const char *name) { - return this->resolve_initial_references (name, - 0 - ACE_ENV_ARG_PARAMETER); + return this->resolve_initial_references (name, 0); } CORBA::Object_ptr CORBA::ORB::resolve_initial_references (const char *name, - ACE_Time_Value *timeout - ACE_ENV_ARG_DECL) + ACE_Time_Value *timeout) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->check_shutdown (); CORBA::Object_var result; if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0) { - result = this->orb_core ()->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + result = this->orb_core ()->root_poa (); } else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0) { result = this->orb_core ()->resolve_poa_current - (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + (); } else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0) { @@ -1089,45 +966,38 @@ CORBA::ORB::resolve_initial_references (const char *name, else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0) { result = this->orb_core ()->resolve_ior_manipulation - (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + (); } else if (ACE_OS::strcmp (name, TAO_OBJID_IORTABLE) == 0) { result = this->orb_core ()->resolve_ior_table - (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + (); } else if (ACE_OS::strcmp (name, TAO_OBJID_DYNANYFACTORY) == 0) { result = this->orb_core ()->resolve_dynanyfactory - (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + (); } else if (ACE_OS::strcmp (name, TAO_OBJID_TYPECODEFACTORY) == 0) { result = this->orb_core ()->resolve_typecodefactory - (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + (); } else if (ACE_OS::strcmp (name, TAO_OBJID_CODECFACTORY) == 0) { result = this->orb_core ()->resolve_codecfactory - (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + (); } else if (ACE_OS::strcmp (name, TAO_OBJID_COMPRESSIONMANAGER) == 0) { result = this->orb_core ()->resolve_compression_manager - (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + (); } #if TAO_HAS_INTERCEPTORS == 1 else if (ACE_OS::strcmp (name, TAO_OBJID_PICurrent) == 0) { result = this->orb_core ()->resolve_picurrent - (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + (); } #endif @@ -1158,8 +1028,7 @@ CORBA::ORB::resolve_initial_references (const char *name, this->orb_core_->init_ref_map ()->find (ACE_CString (name)); if (ior != this->orb_core_->init_ref_map ()->end ()) - return this->string_to_object ((*ior).second.c_str () - ACE_ENV_ARG_PARAMETER); + return this->string_to_object ((*ior).second.c_str ()); // Look for an environment variable called "<name>IOR". // @@ -1174,12 +1043,9 @@ CORBA::ORB::resolve_initial_references (const char *name, ACE_CString service_ior = ACE_OS::getenv (ior_env_var_name.in ()); - if (ACE_OS::strcmp (service_ior.c_str (), "") != 0 ) + if (ACE_OS::strcmp (service_ior.c_str (), "") != 0) { - result = - this->string_to_object (service_ior.c_str() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + result = this->string_to_object (service_ior.c_str()); return result._retn (); } @@ -1211,8 +1077,7 @@ CORBA::ORB::resolve_initial_references (const char *name, // Is not one of the well known services, try to find it in the // InitRef table....check the defaultinitref values also. - result = this->orb_core ()->resolve_rir (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + result = this->orb_core ()->resolve_rir (name); if (!CORBA::is_nil (result.in ())) return result._retn (); @@ -1224,42 +1089,37 @@ CORBA::ORB::resolve_initial_references (const char *name, #if !defined(CORBA_E_MICRO) void CORBA::ORB::register_initial_reference (const char * id, - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL) + CORBA::Object_ptr obj) { if (id == 0 || ACE_OS::strlen (id) == 0) - ACE_THROW (CORBA::ORB::InvalidName ()); - ACE_CHECK; + throw ( ::CORBA::ORB::InvalidName ()); if (CORBA::is_nil (obj)) - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, + throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, CORBA::COMPLETED_NO)); - ACE_CHECK; TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table (); if (table.register_initial_reference (id, obj) == -1) - ACE_THROW (CORBA::ORB::InvalidName ()); + throw ( ::CORBA::ORB::InvalidName ()); } #endif CORBA::ORB::ObjectIdList_ptr -CORBA::ORB::list_initial_services (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ORB::list_initial_services (void) { - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_shutdown (); return - this->orb_core ()->list_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER); + this->orb_core ()->list_initial_references (); } void -CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ORB::check_shutdown (void) { if (this->orb_core () != 0) { - this->orb_core ()->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_core ()->check_shutdown (); } else { @@ -1270,7 +1130,7 @@ CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) // CORBA::OBJECT_NOT_EXIST exception if the ORB has been // destroyed by the time an ORB function is called. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (0, + throw ( ::CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO)); } } @@ -1278,7 +1138,7 @@ CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) // **************************************************************** void -TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) +TAO::ORB::init_orb_globals (void) { // This method should be invoked atomically. It is the caller's // responsibility to ensure that this condition is satisfied. @@ -1329,37 +1189,21 @@ CORBA::ORB_init (int &argc, char *argv[], const char *orb_name) { -#ifndef ACE_HAS_EXCEPTIONS - // Make sure TAO's singleton manager is initialized. - // - // We need to initialize before TAO_default_environment() is called - // since that call instantiates a TAO_TSS_Singleton. - if (TAO_Singleton_Manager::instance ()->init () == -1) - { - return CORBA::ORB::_nil (); - } - - return CORBA::ORB_init (argc, - argv, - orb_name, - TAO_default_environment ()); -#else CORBA::Environment env; return CORBA::ORB_init (argc, argv, orb_name, env /* unused */); -#endif /* !ACE_HAS_EXCEPTIONS */ } CORBA::ORB_ptr CORBA::ORB_init (int &argc, char *argv[], const char *orbid, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Environment &try_ENV) { // This ugly macro will go away once we've merged the two ORB_init's. - ACE_UNUSED_ARG(ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + ACE_UNUSED_ARG(try_ENV); // FUZZ: ignore check_for_ace_check // Use this string variable to hold the orbid ACE_CString orbid_string (orbid); @@ -1383,8 +1227,7 @@ CORBA::ORB_init (int &argc, return CORBA::ORB::_nil (); } - TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ORB::_nil ()); + TAO::ORB::init_orb_globals (); } // Make sure the following is done after the global ORB @@ -1474,7 +1317,6 @@ CORBA::ORB_init (int &argc, CORBA::SystemException::_tao_minor_code (0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::ORB::_nil ()); // The ORB table increases the reference count on the ORB Core // so do not release it here. Allow the TAO_ORB_Core_Auto_Ptr @@ -1539,16 +1381,12 @@ CORBA::ORB_init (int &argc, orbinitializer_registry->pre_init (oc.get (), command_line.get_argc(), command_line.get_ASCII_argv(), - slotid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ORB::_nil ()); + slotid); } // Initialize the ORB Core instance. result = oc->init (command_line.get_argc(), - command_line.get_ASCII_argv() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ORB::_nil ()); + command_line.get_ASCII_argv()); if (orbinitializer_registry != 0) { @@ -1557,9 +1395,7 @@ CORBA::ORB_init (int &argc, oc.get (), command_line.get_argc(), command_line.get_ASCII_argv(), - slotid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ORB::_nil ()); + slotid); } if (TAO_debug_level > 2) @@ -1585,12 +1421,10 @@ CORBA::ORB_init (int &argc, // Object reference stringification. char * -CORBA::ORB::object_to_string (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL) +CORBA::ORB::object_to_string (CORBA::Object_ptr obj) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_shutdown (); if (!CORBA::is_nil (obj)) { @@ -1727,7 +1561,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj // For now we just use the first profile. TAO_Profile *profile = mp.get_profile (0); - return profile->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); + return profile->to_string (); } } @@ -1735,12 +1569,10 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj // <resolve_name_service> with an IOR <multicast_to_service>. CORBA::Object_ptr -CORBA::ORB::string_to_object (const char *str - ACE_ENV_ARG_DECL) +CORBA::ORB::string_to_object (const char *str) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->check_shutdown (); // Check for NULL pointer if (str == 0) @@ -1757,25 +1589,21 @@ CORBA::ORB::string_to_object (const char *str if (ior_parser != 0) { return ior_parser->parse_string (str, - this - ACE_ENV_ARG_PARAMETER); + this); } - if (ACE_OS::strncmp (str, ior_prefix, sizeof ior_prefix - 1) == 0) - return this->ior_string_to_object (str + sizeof ior_prefix - 1 - ACE_ENV_ARG_PARAMETER); + return this->ior_string_to_object (str + sizeof ior_prefix - 1); else - return this->url_ior_string_to_object (str - ACE_ENV_ARG_PARAMETER); + return this->url_ior_string_to_object (str); } // **************************************************************** char * -CORBA::ORB::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::ORB::id (void) { return CORBA::string_dup (this->orb_core_->orbid ()); } @@ -1785,11 +1613,9 @@ CORBA::ORB::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) #if !defined(CORBA_E_MICRO) CORBA::Policy_ptr CORBA::ORB::create_policy (CORBA::PolicyType type, - const CORBA::Any& val - ACE_ENV_ARG_DECL) + const CORBA::Any& val) { - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->check_shutdown (); TAO::PolicyFactory_Registry_Adapter *adapter = this->orb_core_->policy_factory_registry (); @@ -1801,20 +1627,15 @@ CORBA::ORB::create_policy (CORBA::PolicyType type, } // Attempt to obtain the policy from the policy factory registry. - return adapter->create_policy ( - type, - val - ACE_ENV_ARG_PARAMETER); + return adapter->create_policy (type, val); } #endif #if !defined(CORBA_E_MICRO) CORBA::Policy_ptr -CORBA::ORB::_create_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) +CORBA::ORB::_create_policy (CORBA::PolicyType type) { - this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->check_shutdown (); TAO::PolicyFactory_Registry_Adapter *adapter = this->orb_core_->policy_factory_registry (); @@ -1826,9 +1647,7 @@ CORBA::ORB::_create_policy (CORBA::PolicyType type } // Attempt to obtain the policy from the policy factory registry. - return adapter->_create_policy ( - type - ACE_ENV_ARG_PARAMETER); + return adapter->_create_policy (type); } #endif @@ -1838,8 +1657,7 @@ CORBA::ORB::_create_policy (CORBA::PolicyType type // implementations ... CORBA::Object_ptr -CORBA::ORB::ior_string_to_object (const char *str - ACE_ENV_ARG_DECL) +CORBA::ORB::ior_string_to_object (const char *str) { // Unhex the bytes, and make a CDR deencapsulation stream from the // resulting data. @@ -1897,8 +1715,7 @@ CORBA::ORB::ior_string_to_object (const char *str // Convert an URL style IOR in an object CORBA::Object_ptr -CORBA::ORB::url_ior_string_to_object (const char* str - ACE_ENV_ARG_DECL) +CORBA::ORB::url_ior_string_to_object (const char* str) { TAO_MProfile mprofile; // It is safe to declare this on the stack since the contents of @@ -1908,14 +1725,12 @@ CORBA::ORB::url_ior_string_to_object (const char* str // to hold them all. TAO_Connector_Registry *conn_reg = - this->orb_core_->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->orb_core_->connector_registry (); int const retv = conn_reg->make_mprofile (str, - mprofile - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Return nil. + mprofile); + // Return nil. if (retv != 0) { @@ -1929,9 +1744,7 @@ CORBA::ORB::url_ior_string_to_object (const char* str // Now make the TAO_Stub. TAO_Stub *data = this->orb_core_->create_stub ((char *) 0, - mprofile - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + mprofile); TAO_Stub_Auto_Ptr safe_objdata (data); @@ -1968,8 +1781,7 @@ CORBA::ORB::set_timeout (ACE_Time_Value *timeout) #if !defined(CORBA_E_MICRO) CORBA::ValueFactory CORBA::ORB::register_value_factory (const char *repository_id, - CORBA::ValueFactory factory - ACE_ENV_ARG_DECL) + CORBA::ValueFactory factory) { TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter (); @@ -1997,8 +1809,7 @@ CORBA::ORB::register_value_factory (const char *repository_id, #if !defined(CORBA_E_MICRO) void -CORBA::ORB::unregister_value_factory (const char *repository_id - ACE_ENV_ARG_DECL_NOT_USED) +CORBA::ORB::unregister_value_factory (const char *repository_id) { TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter (); @@ -2012,8 +1823,7 @@ CORBA::ORB::unregister_value_factory (const char *repository_id #if !defined(CORBA_E_MICRO) CORBA::ValueFactory -CORBA::ORB::lookup_value_factory (const char *repository_id - ACE_ENV_ARG_DECL) +CORBA::ORB::lookup_value_factory (const char *repository_id) { TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter (); diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 6fcdb74d24f..9bae8a49d7d 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -178,10 +178,10 @@ namespace CORBA virtual void _raise (void) const; virtual void _tao_encode (TAO_OutputCDR & - ACE_ENV_ARG_DECL) const; + ) const; virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL); + ); }; typedef char *ObjectId; @@ -207,7 +207,7 @@ namespace CORBA static CORBA::ORB_ptr _nil (void); /// Return this ORB's ORBid. - char * id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + char * id (void); /** * Turn a string-ified object reference back into an object @@ -215,7 +215,7 @@ namespace CORBA * object_to_string(), but not necessarily locally. */ CORBA::Object_ptr string_to_object (const char *str - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /** * Turn an object reference into a string. Each type of ORB, @@ -225,70 +225,70 @@ namespace CORBA * an argument. */ char * object_to_string (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #if !defined(CORBA_E_MICRO) // Value factory operations (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7) CORBA::ValueFactory register_value_factory ( const char *repository_id, CORBA::ValueFactory factory - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #endif #if !defined(CORBA_E_MICRO) void unregister_value_factory (const char * repository_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #endif #if !defined(CORBA_E_MICRO) CORBA::ValueFactory lookup_value_factory ( const char *repository_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #endif #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void create_operation_list(CORBA::OperationDef_ptr opDef, CORBA::NVList_ptr& result - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void create_named_value (CORBA::NamedValue_ptr &nmval - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void create_exception_list (CORBA::ExceptionList_ptr &exclist - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void create_environment (CORBA::Environment_ptr &new_env - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // The following are not implemented and just throw // CORBA::NO_IMPLEMENT. void create_context_list (CORBA::ContextList_ptr &ctxtlist - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void get_default_context (CORBA::Context_ptr &ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::Boolean get_service_information ( CORBA::ServiceType service_type, CORBA::ServiceInformation_out service_information - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void send_multiple_requests_oneway (const CORBA::RequestSeq &req - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void send_multiple_requests_deferred (const CORBA::RequestSeq &req - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void get_next_response (CORBA::Request_ptr &req - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); - CORBA::Boolean poll_next_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::Boolean poll_next_response (void); /// The ORB TypeCode creation functions. @@ -296,60 +296,60 @@ namespace CORBA const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA::UnionMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_enum_tc ( const char *id, const char *name, const CORBA::EnumMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_alias_tc ( const char *id, const char *name, CORBA::TypeCode_ptr original_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_exception_tc ( const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_value_tc ( const char *id, @@ -357,42 +357,42 @@ namespace CORBA CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_value_box_tc ( const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_recursive_tc ( const char *id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_component_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); CORBA::TypeCode_ptr create_home_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); CORBA::TypeCode_ptr create_event_tc ( @@ -401,7 +401,7 @@ namespace CORBA CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -413,7 +413,7 @@ namespace CORBA * If an error occurs during initialization or at runtime, a CORBA * system exception will be thrown. */ - void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void run (void); /** * Instructs the ORB to initialize itself and run its event loop in @@ -429,7 +429,7 @@ namespace CORBA * the server will be buffered by TCP. **/ void run (ACE_Time_Value &tv - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /** * Instructs the ORB to initialize itself and run its event loop in @@ -447,11 +447,11 @@ namespace CORBA * the server will be buffered by TCP. **/ void run (ACE_Time_Value *tv - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Returns an indication of whether the ORB needs to perform some /// work. - CORBA::Boolean work_pending (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::Boolean work_pending (void); /// Returns an indication of whether the ORB needs to perform some /// work but will look for work pending for no more than the @@ -461,7 +461,7 @@ namespace CORBA * idle timeout. */ CORBA::Boolean work_pending (ACE_Time_Value &tv - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /** * This operation performs an implementation-defined unit of work. @@ -469,11 +469,11 @@ namespace CORBA * is not present; this behavior can be modified by passing an * appropriate @c ACE_Time_Value as described in run(). **/ - void perform_work (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void perform_work (void); void perform_work (ACE_Time_Value &tv - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); void perform_work (ACE_Time_Value *tv - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /** * This operation instructs the ORB to shut down. Shutting down the @@ -484,7 +484,7 @@ namespace CORBA * has completed. */ void shutdown (CORBA::Boolean wait_for_completion = false - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /** * Explicitly destroy the ORB, releasing any resources. Note that @@ -498,11 +498,11 @@ namespace CORBA * the ORB in one thread and trying to service a request in another * thread are not well defined. TAO does not support such cases. */ - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void destroy (void); CORBA::Object_ptr resolve_initial_references ( const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); /** @@ -524,24 +524,24 @@ namespace CORBA CORBA::Object_ptr resolve_initial_references ( const char *name, ACE_Time_Value *timeout - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #if !defined(CORBA_E_MICRO) /// Register an object reference with the ORB. void register_initial_reference (const char * id, CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #endif /// Returns a sequence of ObjectIds that lists which objects have /// references available via the initial references mechanism. CORBA::ORB::ObjectIdList_ptr list_initial_services ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void); #if !defined(CORBA_E_MICRO) CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any& val - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #endif // ---------------------------------------------------------------- @@ -552,7 +552,7 @@ namespace CORBA /// Create an empty policy, usually to be filled in later by /// demarshaling. CORBA::Policy_ptr _create_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL); + ); #endif // Reference counting... @@ -609,15 +609,15 @@ namespace CORBA /// Convert an OMG IOR into an object reference. CORBA::Object_ptr ior_string_to_object (const char* ior - ACE_ENV_ARG_DECL); + ); /// Convert an URL style IOR into an object reference. CORBA::Object_ptr url_ior_string_to_object (const char* ior - ACE_ENV_ARG_DECL); + ); /// Check if ORB has shutdown. If it has, throw the appropriate /// exception. - void check_shutdown (ACE_ENV_SINGLE_ARG_DECL); + void check_shutdown (void); /// Set the timeout value void set_timeout (ACE_Time_Value * timeout); @@ -650,7 +650,7 @@ namespace TAO { /// Initialize the ORB globals correctly, i.e., only when they /// haven't been initialized yet. - void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL); + void init_orb_globals (void); } } diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 947a8408c26..8a00ecd6f77 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -26,7 +26,7 @@ namespace PortableInterceptor void register_orb_initializer ( ORBInitializer_ptr init - ACE_ENV_ARG_DECL) + ) { { // Using ACE_Static_Object_Lock::instance() precludes @@ -44,8 +44,7 @@ namespace PortableInterceptor ACE_TEXT ("Unable to pre-initialize TAO\n"))); } - TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + TAO::ORB::init_orb_globals (); } // If not, lookup it up. @@ -72,8 +71,7 @@ namespace PortableInterceptor { orbinitializer_registry_->register_orb_initializer ( init - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { @@ -82,7 +80,7 @@ namespace PortableInterceptor ACE_TEXT ("ERROR: ORBInitializer Registry unable to find the ") ACE_TEXT ("ORBInitializer Registry instance"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } } } diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h index 88aa2610d27..81c1d59ae05 100644 --- a/TAO/tao/ORBInitializer_Registry.h +++ b/TAO/tao/ORBInitializer_Registry.h @@ -37,7 +37,7 @@ namespace PortableInterceptor /// table. TAO_Export void register_orb_initializer ( ORBInitializer_ptr init - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); } diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h index 3fa0caa8170..4b90a6adff5 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.h +++ b/TAO/tao/ORBInitializer_Registry_Adapter.h @@ -56,7 +56,7 @@ namespace TAO /// array. virtual void register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init - ACE_ENV_ARG_DECL) = 0; + ) = 0; /** * Begin initialization of all registered ORBInitializers before @@ -71,7 +71,7 @@ namespace TAO int argc, char *argv[], PortableInterceptor::SlotId &slotid - ACE_ENV_ARG_DECL) = 0; + ) = 0; /** * Complete initialization of all registered ORBInitializers after @@ -93,7 +93,7 @@ namespace TAO int argc, char *argv[], PortableInterceptor::SlotId slotid - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; } diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index da5361b6da6..d3a8b9b1127 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -375,7 +375,7 @@ TAO_ORB_Core::~TAO_ORB_Core (void) } int -TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) +TAO_ORB_Core::init (int &argc, char *argv[] ) { // Right now, this code expects to begin parsing in argv[1] rather // than argv[0]. I don't think that's wise. I think we need to @@ -828,7 +828,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) TAO_ORB_CORE_INIT_LOCATION_CODE, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (-1); output_stream->open (ACE_TEXT_ALWAYS_CHAR (file_name), ios::out | ios::app); @@ -944,8 +943,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) this->set_endpoint_helper (TAO_DEFAULT_LANE, ACE_TEXT_ALWAYS_CHAR (current_arg) - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); arg_shifter.consume_arg (); } @@ -959,8 +957,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) this->set_endpoint_helper (TAO_DEFAULT_LANE, ACE_TEXT_ALWAYS_CHAR (current_arg) - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); arg_shifter.consume_arg (); } @@ -987,8 +984,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) this->set_endpoint_helper (lane, endpoints - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNoProprietaryActivation")))) @@ -1340,8 +1336,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // Initialize the protocols hooks instance. this->protocols_hooks_->init_hooks (this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); // As a last step perform initializations of the service callbacks this->services_callbacks_init (); @@ -1357,24 +1352,22 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) int TAO_ORB_Core::fini (void) { - ACE_TRY_NEW_ENV + try { // Shutdown the ORB and block until the shutdown is complete. this->shutdown (1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_CString message = "Exception caught in trying to shutdown "; message += this->orbid_; message += "\n"; - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, message.c_str ()); } - ACE_ENDTRY; // Wait for any server threads, ignoring any failures. (void) this->thr_mgr ()->wait (); @@ -1742,14 +1735,14 @@ TAO::Invocation_Status TAO_ORB_Core::service_raise_comm_failure ( IOP::ServiceContextList &clist, TAO_Profile *profile - ACE_ENV_ARG_DECL) + ) { if (this->ft_service_.service_callback ()) { return this->ft_service_.service_callback ()-> raise_comm_failure (clist, profile - ACE_ENV_ARG_PARAMETER); + ); } ACE_THROW_RETURN (CORBA::COMM_FAILURE ( @@ -1765,14 +1758,14 @@ TAO::Invocation_Status TAO_ORB_Core::service_raise_transient_failure ( IOP::ServiceContextList &clist, TAO_Profile *profile - ACE_ENV_ARG_DECL) + ) { if (this->ft_service_.service_callback ()) { return this->ft_service_.service_callback ()->raise_transient_failure (clist, profile - ACE_ENV_ARG_PARAMETER); + ); } return TAO::TAO_INVOKE_FAILURE; @@ -1783,14 +1776,13 @@ TAO_ORB_Core::service_context_list ( TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean restart - ACE_ENV_ARG_DECL) + ) { // @NOTE: Can use Interceptors instead.. this->protocols_hooks_->rt_service_context (stub, service_context, restart - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } TAO_Client_Strategy_Factory * @@ -1824,7 +1816,7 @@ TAO_ORB_Core::server_factory (void) } CORBA::Object_ptr -TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::root_poa (void) { // DCL .. if (CORBA::is_nil (this->root_poa_.in ())) @@ -1869,16 +1861,14 @@ TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL) { auto_ptr<TAO_Adapter> poa_adapter (factory->create (this)); - poa_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + poa_adapter->open (); // @@ Not exception safe this->root_poa_ = poa_adapter->root (); this->adapter_registry_.insert (poa_adapter.get () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ); poa_adapter.release (); } @@ -1905,14 +1895,13 @@ TAO_ORB_Core::poa_adapter (void) TAO_Stub * TAO_ORB_Core::create_stub (const char *repository_id, const TAO_MProfile &profiles - ACE_ENV_ARG_DECL) + ) { TAO_Stub *retval = this->stub_factory ()->create_stub (repository_id, profiles, this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + ); return retval; } @@ -1929,7 +1918,7 @@ TAO_Stub * TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile, const char *type_id, CORBA::PolicyList *policy_list - ACE_ENV_ARG_DECL) + ) { // Add the Polices contained in "policy_list" to each profile so // that those policies will be exposed to the client in the IOR. In @@ -1948,15 +1937,13 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile, { // Get the ith profile profile = mprofile.get_profile (i); - profile->policies (policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + profile->policies (policy_list); } } /// Initialize a TAO_Stub object with the mprofile thats passed. TAO_Stub *stub = - this->create_stub (type_id, mprofile ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (stub); + this->create_stub (type_id, mprofile); stub->base_profiles ().policy_list (policy_list); @@ -1965,7 +1952,7 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile, void TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator - ACE_ENV_ARG_DECL) + ) { if (this->bidir_adapter_ == 0) { @@ -1976,7 +1963,7 @@ TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator // Call the BiDir library if it has been loaded if (this->bidir_adapter_) - this->bidir_adapter_->load_policy_validators (validator ACE_ENV_ARG_PARAMETER); + this->bidir_adapter_->load_policy_validators (validator); } CORBA::Object_ptr @@ -2161,7 +2148,7 @@ TAO_ORB_Core::lf_strategy (void) int TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work - ACE_ENV_ARG_DECL_NOT_USED) + ) { // ORB::run may be called from a thread, different from the one that // did the ORB_init, consequently we must establish the Service @@ -2281,7 +2268,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, void TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) { { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); @@ -2293,8 +2280,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion // shutdowns with the 'wait_for_completion' flag set in the middle // of an upcall (because those deadlock). this->adapter_registry_.check_close (wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Set the 'has_shutdown' flag, so any further attempt to shutdown // becomes a noop. @@ -2306,8 +2292,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion } this->adapter_registry_.close (wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Shutdown reactor. this->thread_lane_resources_manager ().shutdown_reactor (); @@ -2341,7 +2326,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion } void -TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::destroy (void) { // // All destroy() should do is (a) call shutdown() and (b) unbind() @@ -2358,12 +2343,10 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL) // // Shutdown the ORB and block until the shutdown is complete. - this->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->shutdown (1); // Invoke Interceptor::destroy() on all registered interceptors. - this->destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->destroy_interceptors (); // Now remove it from the ORB table so that it's ORBid may be // reused. @@ -2371,7 +2354,7 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::check_shutdown (void) { if (this->has_shutdown ()) { @@ -2379,15 +2362,15 @@ TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB // has shutdown by the time an ORB function is called. - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO)); } } void -TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::destroy_interceptors (void) { - ACE_TRY + try { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); @@ -2395,8 +2378,7 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) if (this->client_request_interceptor_adapter_ != 0) { this->client_request_interceptor_adapter_->destroy_interceptors ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ); delete this->client_request_interceptor_adapter_; this->client_request_interceptor_adapter_ = 0; @@ -2405,8 +2387,7 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) if (this->server_request_interceptor_adapter_ != 0) { this->server_request_interceptor_adapter_->destroy_interceptors ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ); delete this->server_request_interceptor_adapter_; this->server_request_interceptor_adapter_ = 0; @@ -2417,14 +2398,13 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) if (this->ior_interceptor_adapter_ != 0) { this->ior_interceptor_adapter_->destroy_interceptors ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ); this->ior_interceptor_adapter_ = 0; } } - ACE_CATCHALL + catch (...) { // .. catch all the exceptions.. if (TAO_debug_level > 3) @@ -2434,7 +2414,6 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) ACE_TEXT ("::destroy_interceptors () \n"))); } } - ACE_ENDTRY; return; } @@ -2446,7 +2425,7 @@ TAO_ORB_Core::lane_resources (void) } void -TAO_ORB_Core::resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_typecodefactory_i (void) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance @@ -2470,16 +2449,16 @@ TAO_ORB_Core::resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unable to instantiate ") ACE_TEXT ("a TypeCodeFactory_Loader\n"))); - ACE_THROW (CORBA::ORB::InvalidName ()); + throw ( ::CORBA::ORB::InvalidName ()); } } this->typecode_factory_ = - loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER); + loader->create_object (this->orb_, 0, 0); } void -TAO_ORB_Core::resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_codecfactory_i (void) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance @@ -2501,13 +2480,12 @@ TAO_ORB_Core::resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL) if (loader != 0) { this->codec_factory_ = - loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + loader->create_object (this->orb_, 0, 0); } } void -TAO_ORB_Core::resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_compression_manager_i (void) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance @@ -2529,13 +2507,12 @@ TAO_ORB_Core::resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_DECL) if (loader != 0) { this->compression_manager_ = - loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + loader->create_object (this->orb_, 0, 0); } } void -TAO_ORB_Core::resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_poa_current_i (void) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance @@ -2557,8 +2534,7 @@ TAO_ORB_Core::resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL) if (loader != 0) { this->poa_current_ = - loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + loader->create_object (this->orb_, 0, 0); } } @@ -2566,7 +2542,7 @@ TAO_ORB_Core::resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL) #if TAO_HAS_INTERCEPTORS == 1 void -TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_picurrent_i (void) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance @@ -2588,8 +2564,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL) if (loader != 0) { CORBA::Object_ptr pi = - loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + loader->create_object (this->orb_, 0, 0); this->pi_current_ = pi; } @@ -2599,7 +2574,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL) void -TAO_ORB_Core::resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_dynanyfactory_i (void) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance @@ -2622,13 +2597,12 @@ TAO_ORB_Core::resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL) if (loader != 0) { this->dynany_factory_ = - loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + loader->create_object (this->orb_, 0, 0); } } void -TAO_ORB_Core::resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_iormanipulation_i (void) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance @@ -2650,13 +2624,12 @@ TAO_ORB_Core::resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL) if (loader != 0) { this->ior_manip_factory_ = - loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + loader->create_object (this->orb_, 0, 0); } } void -TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_ior_table_i (void) { TAO_Adapter_Factory *factory = ACE_Dynamic_Service<TAO_Adapter_Factory>::instance @@ -2678,13 +2651,11 @@ TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL) if (factory != 0) { ACE_Auto_Ptr <TAO_Adapter> iortable_adapter (factory->create (this)); - iortable_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + iortable_adapter->open (); CORBA::Object_var tmp_root = iortable_adapter->root (); - this->adapter_registry_.insert (iortable_adapter.get () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->adapter_registry_.insert (iortable_adapter.get ()); // It is now (exception) safe to release ownership from the auto pointers this->ior_table_= tmp_root._retn (); @@ -2695,7 +2666,7 @@ TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL) int TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane, const ACE_CString &endpoints - ACE_ENV_ARG_DECL) + ) { if (this->orb_params ()->add_endpoints (lane, endpoints) != 0) @@ -2717,7 +2688,7 @@ TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane, CORBA::Object_ptr TAO_ORB_Core::resolve_rir (const char *name - ACE_ENV_ARG_DECL) + ) { // Get the table of initial references specified through // -ORBInitRef. @@ -2752,8 +2723,7 @@ TAO_ORB_Core::resolve_rir (const char *name else { TAO_Connector_Registry *conn_reg = - this->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->connector_registry (); // Obtain the appropriate object key delimiter for the // specified protocol. @@ -2770,14 +2740,14 @@ TAO_ORB_Core::resolve_rir (const char *name list_of_profiles += object_id; return this->orb ()->string_to_object (list_of_profiles.c_str () - ACE_ENV_ARG_PARAMETER); + ); } return CORBA::Object::_nil (); } CORBA::ORB::ObjectIdList * -TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::list_initial_references (void) { // Unsupported initial services should NOT be included in the below list! static const char *initial_services[] = { TAO_LIST_OF_INITIAL_SERVICES }; @@ -2798,7 +2768,6 @@ TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL) CORBA::ORB::ObjectIdList ( static_cast<CORBA::ULong> (total_size)), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::ORB::ObjectIdList_var list (tmp); list->length (static_cast<CORBA::ULong> (total_size)); @@ -2930,11 +2899,10 @@ TAO_ORB_Core::create_data_block_i (size_t size, } TAO_Connector_Registry * -TAO_ORB_Core::connector_registry (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::connector_registry (void) { TAO_Connector_Registry *conn = - this->lane_resources ().connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->lane_resources ().connector_registry (); return conn; } @@ -2963,24 +2931,22 @@ TAO_ORB_Core::implrepo_service (void) if (CORBA::is_nil (this->implrepo_service_)) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var temp = - this->orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->resolve_initial_references ("ImplRepoService"); ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::Object::_nil ()); // @@ Worry about assigning a different IOR? (brunsch) this->implrepo_service_ = temp._retn (); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Just make sure that we have a null pointer. Ignore the exception // anyway. this->implrepo_service_ = CORBA::Object::_nil (); } - ACE_ENDTRY; } return CORBA::Object::_duplicate (this->implrepo_service_); @@ -3174,7 +3140,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook) CORBA::Policy_ptr TAO_ORB_Core::get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) { CORBA::Policy_var result; @@ -3183,16 +3149,14 @@ TAO_ORB_Core::get_policy (CORBA::PolicyType type if (policy_manager != 0) { result = policy_manager->get_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); } if (CORBA::is_nil (result.in ())) { result = this->get_default_policies ()->get_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); } return result._retn (); @@ -3200,21 +3164,19 @@ TAO_ORB_Core::get_policy (CORBA::PolicyType type CORBA::Policy_ptr TAO_ORB_Core::get_policy_including_current (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) { TAO_Policy_Current &policy_current = this->policy_current (); CORBA::Policy_var result = policy_current.get_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); if (CORBA::is_nil (result.in ())) { result = this->get_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); } return result._retn (); @@ -3222,7 +3184,7 @@ TAO_ORB_Core::get_policy_including_current (CORBA::PolicyType type CORBA::Policy_ptr TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL) + ) { CORBA::Policy_var result; @@ -3232,16 +3194,14 @@ TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type { result = policy_manager->get_cached_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); } if (CORBA::is_nil (result.in ())) { result = this->get_default_policies ()->get_cached_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); } return result._retn (); @@ -3250,22 +3210,21 @@ TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type CORBA::Policy_ptr TAO_ORB_Core::get_cached_policy_including_current ( TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL) + ) { TAO_Policy_Current &policy_current = this->policy_current (); CORBA::Policy_var result = policy_current.get_cached_policy (type - ACE_ENV_ARG_PARAMETER); + ); ACE_CHECK (CORBA::Policy::_nil ()); if (CORBA::is_nil (result.in ())) { result = this->get_cached_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); } return result._retn (); @@ -3288,13 +3247,12 @@ TAO_ORB_Core::default_environment (CORBA::Environment *env) void TAO_ORB_Core::add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) + ) { if (this->ior_interceptor_adapter ()) { this->ior_interceptor_adapter_->add_interceptor (interceptor - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { @@ -3303,7 +3261,7 @@ TAO_ORB_Core::add_interceptor ( ACE_TEXT ("ERROR: ORB Core unable to find the ") ACE_TEXT ("IORInterceptor Adapter Factory instance"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } } @@ -3319,8 +3277,7 @@ TAO_ORB_Core::ior_interceptor_adapter (void) if (this->ior_interceptor_adapter_ == 0) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO_IORInterceptor_Adapter_Factory * ior_ap_factory = ACE_Dynamic_Service<TAO_IORInterceptor_Adapter_Factory>::instance @@ -3330,18 +3287,15 @@ TAO_ORB_Core::ior_interceptor_adapter (void) if (ior_ap_factory) { this->ior_interceptor_adapter_ = - ior_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ior_ap_factory->create (); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, "Cannot initialize the " "ior_interceptor_adapter \n"); } - ACE_ENDTRY; - ACE_CHECK_RETURN(0); } } @@ -3353,13 +3307,12 @@ TAO_ORB_Core::ior_interceptor_adapter (void) void TAO_ORB_Core::add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) + ) { if (this->clientrequestinterceptor_adapter_i ()) { this->client_request_interceptor_adapter_->add_interceptor (interceptor - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { @@ -3369,7 +3322,7 @@ TAO_ORB_Core::add_interceptor ( ACE_TEXT ("Client Request Interceptor Adapter Factory ") ACE_TEXT ("instance"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } } @@ -3404,13 +3357,12 @@ TAO_ORB_Core::clientrequestinterceptor_adapter_i (void) void TAO_ORB_Core::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) + ) { if (this->serverrequestinterceptor_adapter_i ()) { this->server_request_interceptor_adapter_->add_interceptor (interceptor - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { @@ -3420,7 +3372,7 @@ TAO_ORB_Core::add_interceptor ( ACE_TEXT ("Server Request Interceptor Adapter Factory ") ACE_TEXT ("instance"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } } @@ -3428,16 +3380,15 @@ void TAO_ORB_Core::add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) + ) { if (this->clientrequestinterceptor_adapter_i ()) { this->client_request_interceptor_adapter_->add_interceptor ( interceptor, policies - ACE_ENV_ARG_PARAMETER); + ); - ACE_CHECK; } else { @@ -3447,7 +3398,7 @@ TAO_ORB_Core::add_interceptor ( ACE_TEXT ("Client Request Interceptor Adapter Factory ") ACE_TEXT ("instance"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } } @@ -3455,16 +3406,15 @@ void TAO_ORB_Core::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) + ) { if (this->serverrequestinterceptor_adapter_i ()) { this->server_request_interceptor_adapter_->add_interceptor ( interceptor, policies - ACE_ENV_ARG_PARAMETER); + ); - ACE_CHECK; } else { @@ -3474,7 +3424,7 @@ TAO_ORB_Core::add_interceptor ( ACE_TEXT ("Server Request Interceptor Adapter Factory ") ACE_TEXT ("instance"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } } @@ -3520,8 +3470,7 @@ TAO_ORB_Core::valuetype_adapter (void) if (this->valuetype_adapter_ == 0) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO_Valuetype_Adapter_Factory * vt_ap_factory = ACE_Dynamic_Service<TAO_Valuetype_Adapter_Factory>::instance ( @@ -3531,18 +3480,15 @@ TAO_ORB_Core::valuetype_adapter (void) if (vt_ap_factory) { this->valuetype_adapter_ = - vt_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + vt_ap_factory->create (); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, "Cannot initialize the " "valuetype_adapter \n"); } - ACE_ENDTRY; - ACE_CHECK_RETURN(0); } if (this->valuetype_adapter_ == 0) @@ -3578,19 +3524,16 @@ TAO_ORB_Core_instance (void) // exist in the ORB table after the ORB reference is // destroyed. - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { int argc = 0; CORBA::ORB_var orb = - CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, 0, 0); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // @@ What should we do here? } - ACE_ENDTRY; } } @@ -3600,7 +3543,7 @@ TAO_ORB_Core_instance (void) TAO::Collocation_Strategy TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object - ACE_ENV_ARG_DECL) + ) { TAO_Stub *stub = object->_stubobj (); if (!CORBA::is_nil (stub->servant_orb_var ().in ()) && @@ -3611,8 +3554,7 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object const int collocated = orb_core->collocation_resolver ().is_collocated (object - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY); + ); if (collocated) { diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index b655b0f7a72..301cdb1427c 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -187,7 +187,7 @@ public: //@} /// Get the connector registry - TAO_Connector_Registry *connector_registry (ACE_ENV_SINGLE_ARG_DECL); + TAO_Connector_Registry *connector_registry (void); /// Get the IOR parser registry TAO_Parser_Registry *parser_registry (void); @@ -214,7 +214,7 @@ public: ACE_Thread_Manager *thr_mgr (void); /// Return the RootPOA, or try to load it if not initialized already. - CORBA::Object_ptr root_poa (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr root_poa (void); /// Get the adapter registry TAO_Adapter_Registry *adapter_registry (void); @@ -243,7 +243,7 @@ public: */ static TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object - ACE_ENV_ARG_DECL); + ); //@} /// Set/get the collocation flags @@ -420,23 +420,23 @@ public: /// Get a policy. First, check the ORB-level Policy Manager, then /// check the ORB defaults. CORBA::Policy_ptr get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL); + ); /// Get a policy. First, check the thread current, then check the /// ORB-level Policy Manager, then check the ORB defaults. CORBA::Policy_ptr get_policy_including_current (CORBA::PolicyType type - ACE_ENV_ARG_DECL); + ); /// Get a cached policy. First, check the ORB-level Policy Manager, /// then check the ORB defaults. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + ); /// Get a cached policy. First, check the thread current, then /// check the ORB-level Policy Manager, then check the ORB defaults. CORBA::Policy_ptr get_cached_policy_including_current ( TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + ); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -589,20 +589,20 @@ public: /// Run the event loop. int run (ACE_Time_Value *tv, int perform_work - ACE_ENV_ARG_DECL); + ); /// End the event loop void shutdown (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL); + ); /// Get the shutdown flag value bool has_shutdown (void) const; /// Shutdown the ORB and free resources - void destroy (ACE_ENV_SINGLE_ARG_DECL); + void destroy (void); /// Check if ORB has shutdown. If it has, throw an exception. - void check_shutdown (ACE_ENV_SINGLE_ARG_DECL); + void check_shutdown (void); /// Returns the <timeout> value used by the server threads to poll /// the shutdown flag. If the return value is zero then the server @@ -614,7 +614,7 @@ public: TAO_Stub *create_stub_object (TAO_MProfile &mprofile, const char *type_id, CORBA::PolicyList *policy_list - ACE_ENV_ARG_DECL); + ); /// Factory method that create the "right" Stub depending on /// wheather RTCORBA is loaded or not. The factory used to create @@ -622,7 +622,7 @@ public: /// on the fact that RTCORBA is being used or not. TAO_Stub *create_stub (const char *repository_id, const TAO_MProfile &profiles - ACE_ENV_ARG_DECL); + ); /// Create a new object, use the adapter registry to create a /// collocated object, if not possible then create a regular @@ -660,35 +660,35 @@ public: CORBA::Boolean imr_endpoints_in_ior (void); /// Resolve the TypeCodeFactory DLL. - CORBA::Object_ptr resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_typecodefactory (void); #if TAO_HAS_INTERCEPTORS == 1 /// Resolve the PICurrent. - CORBA::Object_ptr resolve_picurrent (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_picurrent (void); #endif /* TAO_HAS_INTERCEPTORS == 1 */ /// Resolve POA Current. - CORBA::Object_ptr resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_poa_current (void); /// Resolve the CodecFactory DLL. - CORBA::Object_ptr resolve_codecfactory (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_codecfactory (void); /// Resolve the Compression DLL. - CORBA::Object_ptr resolve_compression_manager (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_compression_manager (void); /// Resolve the Dynamic Any Factory - CORBA::Object_ptr resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_dynanyfactory (void); /// Resolve the IOR Manipulation reference for this ORB. - CORBA::Object_ptr resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_ior_manipulation (void); /// Resolve the IOR Table reference for this ORB. - CORBA::Object_ptr resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_ior_table (void); /// Resolve an initial reference via the -ORBInitRef and // -ORBDefaultInitRef options. CORBA::Object_ptr resolve_rir (const char *name - ACE_ENV_ARG_DECL); + ); /// Resolve the RT ORB reference for this ORB. CORBA::Object_ptr resolve_rt_orb (void); @@ -699,7 +699,7 @@ public: /// List all the service known by the ORB CORBA::ORB_ObjectIdList *list_initial_references ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED + ); /// Reference counting... @@ -762,7 +762,7 @@ public: void service_context_list (TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean retstart - ACE_ENV_ARG_DECL); + ); /// Return a reference to the Fault Tolerant service object. TAO_Fault_Tolerance_Service &fault_tolerance_service (void); @@ -773,7 +773,7 @@ public: TAO::Invocation_Status service_raise_comm_failure ( IOP::ServiceContextList &clist, TAO_Profile *profile - ACE_ENV_ARG_DECL); + ); /// Raise a transient failure exception if a service is not loaded, /// else delegate to the service to see what the service has to do @@ -781,7 +781,7 @@ public: TAO::Invocation_Status service_raise_transient_failure ( IOP::ServiceContextList &clist, TAO_Profile *profile - ACE_ENV_ARG_DECL); + ); //@} @@ -804,24 +804,24 @@ public: /// Register a client request interceptor. void add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL); + ); /// Register a server request interceptor. void add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL); + ); /// Register a client request interceptor with policies. void add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + ); /// Register a server request interceptor with policies. void add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + ); /// Get the Client Request Interceptor adapter. /// Will not create a new one if not available yet. @@ -836,7 +836,7 @@ public: /// Register an IOR interceptor. void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - ACE_ENV_ARG_DECL); + ); //@} /// Return the valuetype adapter @@ -872,7 +872,7 @@ public: /// Call the libraries to handover the validators if they havent /// registered yet with the list of validators. void load_policy_validators (TAO_Policy_Validator &validator - ACE_ENV_ARG_DECL); + ); /// Return the flushing strategy /** @@ -924,7 +924,7 @@ protected: /// Initialize the guts of the ORB Core. It is intended that this be /// called by <CORBA::ORB_init>. - int init (int &argc, char **argv ACE_ENV_ARG_DECL); + int init (int &argc, char **argv); /// Final termination hook, typically called by CORBA::ORB's /// destructor. @@ -937,14 +937,14 @@ protected: ACE_Lock *lock); /// Obtain and cache the typecode factory object reference. - void resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL); + void resolve_typecodefactory_i (void); /// Obtain and cache the poa current. - void resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL); + void resolve_poa_current_i (void); #if TAO_HAS_INTERCEPTORS == 1 /// Obtain and cache the picurrent factory object reference. - void resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL); + void resolve_picurrent_i (void); /// Get the Client Request Interceptor adapter. /// If not created, this method will try to create one if needed. @@ -957,16 +957,16 @@ protected: #endif /* TAO_HAS_INTERCEPTORS */ /// Obtain and cache the codec factory object reference. - void resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL); + void resolve_codecfactory_i (void); /// Obtain and cache the compression manager object reference. - void resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_DECL); + void resolve_compression_manager_i (void); /// Obtain and cache the dynamic any factory object reference. - void resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL); + void resolve_dynanyfactory_i (void); /// Obtain and cache the IORManipulation factory object reference. - void resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL); + void resolve_iormanipulation_i (void); /// Search the Dynamic service list for well known services that has /// callbacks which can be dynamically loaded. @@ -975,14 +975,14 @@ protected: /// Helper method that invokes Interceptor::destroy() on all /// registered interceptors when ORB::destroy() is called. Prevents /// exceptions from propagating up the call chain. - void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); + void destroy_interceptors (void); /// Pointer to the list of protocol loaded into this ORB instance. /// Helper method to hold the common code part for -ORBEndpoint and /// -ORBListenEndpoint options. int set_endpoint_helper (const ACE_CString &lane, const ACE_CString &endpoints - ACE_ENV_ARG_DECL); + ); /// Return pointer to the policy factory registry associated with /// this ORB core. @@ -1005,7 +1005,7 @@ private: //@} /// Obtain and cache the dynamic any factory object reference. - void resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL); + void resolve_ior_table_i (void); /// Checks to see whether collocation optimizations have to be /// applied on objects in the @a other_orb diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index 06ce24dd019..2492c939b3e 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -352,14 +352,13 @@ TAO_ORB_Core::imr_endpoints_in_ior (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_typecodefactory (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->typecode_factory_)) { - this->resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->resolve_typecodefactory_i (); } return CORBA::Object::_duplicate (this->typecode_factory_); } @@ -367,14 +366,13 @@ TAO_ORB_Core::resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL) #if TAO_HAS_INTERCEPTORS == 1 ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_picurrent (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_picurrent (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->pi_current_)) { - this->resolve_picurrent_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->resolve_picurrent_i (); } return CORBA::Object::_duplicate (this->pi_current_); } @@ -382,27 +380,25 @@ TAO_ORB_Core::resolve_picurrent (ACE_ENV_SINGLE_ARG_DECL) #endif /* TAO_HAS_INTERCEPTORS == 1 */ ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_codecfactory (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_codecfactory (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->codec_factory_)) { - this->resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->resolve_codecfactory_i (); } return CORBA::Object::_duplicate (this->codec_factory_); } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_compression_manager (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_compression_manager (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->compression_manager_)) { - this->resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->resolve_compression_manager_i (); } return CORBA::Object::_duplicate (this->compression_manager_); } @@ -455,40 +451,37 @@ TAO_ORB_Core::policy_factory_registry () } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_dynanyfactory (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->dynany_factory_)) { - this->resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->resolve_dynanyfactory_i (); } return CORBA::Object::_duplicate (this->dynany_factory_); } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_ior_manipulation (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->ior_manip_factory_)) { - this->resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->resolve_iormanipulation_i (); } return CORBA::Object::_duplicate (this->ior_manip_factory_); } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_ior_table (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->ior_table_)) { - this->resolve_ior_table_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->resolve_ior_table_i (); } return CORBA::Object::_duplicate (this->ior_table_); } @@ -534,14 +527,13 @@ TAO_ORB_Core::policy_current (void) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_poa_current (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->poa_current_.in ())) { - this->resolve_poa_current_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->resolve_poa_current_i (); } return CORBA::Object::_duplicate (this->poa_current_.in ()); } diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp index 1e697edc9cc..f3cba5e3281 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp @@ -14,38 +14,37 @@ ACE_RCSID (ObjRefTemplate, TAO_BEGIN_VERSIONED_NAMESPACE_DECL char * -TAO::ORT_Adapter_Impl::tao_server_id (ACE_ENV_SINGLE_ARG_DECL) +TAO::ORT_Adapter_Impl::tao_server_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // No need to duplicate, the ort_template_ method has to do the duplicate - return this->ort_template_->server_id (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->ort_template_->server_id (); } char * -TAO::ORT_Adapter_Impl::tao_orb_id (ACE_ENV_SINGLE_ARG_DECL) +TAO::ORT_Adapter_Impl::tao_orb_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // No need to duplicate, the ort_template_ method has to do the duplicate - return this->ort_template_->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->ort_template_->orb_id (); } PortableInterceptor::AdapterName * -TAO::ORT_Adapter_Impl::tao_adapter_name (ACE_ENV_SINGLE_ARG_DECL) +TAO::ORT_Adapter_Impl::tao_adapter_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // No need to duplicate, the ort_template_ method has to do the duplicate - return this->ort_template_->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->ort_template_->adapter_name (); } CORBA::Object_ptr TAO::ORT_Adapter_Impl::make_object (const char *repo_id, - const PortableInterceptor::ObjectId &id - ACE_ENV_ARG_DECL) + const PortableInterceptor::ObjectId &id) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->ort_factory_->make_object (repo_id, id - ACE_ENV_ARG_PARAMETER); + ); } PortableInterceptor::ObjectReferenceTemplate * @@ -66,8 +65,7 @@ TAO::ORT_Adapter_Impl::get_obj_ref_factory (void) int TAO::ORT_Adapter_Impl::set_obj_ref_factory ( - PortableInterceptor::ObjectReferenceFactory *cf - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ObjectReferenceFactory *cf) { this->ort_factory_ = cf; @@ -88,8 +86,7 @@ TAO::ORT_Adapter_Impl::activate ( const char *server_id, const char *orb_id, PortableInterceptor::AdapterName *adapter_name, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) { // No need to lock here, there is one instance for each POA and // when the POA creates and actives an ORT_Adapter it will lock @@ -102,7 +99,6 @@ TAO::ORT_Adapter_Impl::activate ( adapter_name, poa), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (-1); this->ort_template_ = t; diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h index ff30c49bbdf..3b5c09072de 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h @@ -26,11 +26,6 @@ #include "tao/PortableServer/ORT_Adapter.h" #include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO @@ -48,8 +43,7 @@ namespace TAO virtual int activate (const char *server_id, const char *orb_id, PortableInterceptor::AdapterName *adapter_name, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL); + PortableServer::POA_ptr poa); /// Accessor methods to ObjectReferenceTemplate template virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void); @@ -59,8 +53,7 @@ namespace TAO /// Set a different ort_factory to be used. virtual int set_obj_ref_factory ( - PortableInterceptor::ObjectReferenceFactory * current_factory - ACE_ENV_ARG_DECL); + PortableInterceptor::ObjectReferenceFactory * current_factory); /** * @see @c TAO::ORT_Adapter for details. @@ -72,14 +65,13 @@ namespace TAO * Methods */ //@{ - virtual char * tao_server_id (ACE_ENV_SINGLE_ARG_DECL) + virtual char * tao_server_id (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * tao_orb_id (ACE_ENV_SINGLE_ARG_DECL) + virtual char * tao_orb_id (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableInterceptor::AdapterName * tao_adapter_name ( - ACE_ENV_SINGLE_ARG_DECL) + virtual PortableInterceptor::AdapterName * tao_adapter_name (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -92,8 +84,7 @@ namespace TAO //@{ virtual CORBA::Object_ptr make_object ( const char * repository_id, - const PortableInterceptor::ObjectId & id - ACE_ENV_ARG_DECL) + const PortableInterceptor::ObjectId & id) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -111,10 +102,6 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* TAO_ORT_ADAPTER_IMPL_H */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp index 5aade26a354..eb25db6608c 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp @@ -29,21 +29,21 @@ namespace TAO } char * - ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ObjectReferenceTemplate::server_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->server_id_); } char * - ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ObjectReferenceTemplate::orb_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->orb_id_); } PortableInterceptor::AdapterName * - ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL) + ObjectReferenceTemplate::adapter_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::AdapterName *adapter_name = 0; @@ -56,7 +56,6 @@ namespace TAO TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return adapter_name; } @@ -65,7 +64,7 @@ namespace TAO ObjectReferenceTemplate::make_object ( const char *, const PortableInterceptor::ObjectId & - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil(poa_.in())) @@ -73,7 +72,7 @@ namespace TAO TAO_Root_POA* tao_poa = dynamic_cast<TAO_Root_POA*>(poa_.in()); - return tao_poa->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER); + return tao_poa->invoke_key_to_object (); } } diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h index cb19700492a..eeb4cae1deb 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h @@ -69,14 +69,13 @@ namespace TAO * PortableInterceptor::ObjectReferenceTemplate ValueType. */ //@{ - virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * server_id (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * orb_id (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableInterceptor::AdapterName * adapter_name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual PortableInterceptor::AdapterName * adapter_name (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -89,11 +88,8 @@ namespace TAO //@{ virtual CORBA::Object_ptr make_object ( const char * repository_id, - const PortableInterceptor::ObjectId & id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + const PortableInterceptor::ObjectId & id) + ACE_THROW_SPEC ((CORBA::SystemException)); //@} protected: diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 08d10c311ef..3c109659ae8 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -192,8 +192,7 @@ CORBA::Object::_servant (void) const // logical type ID is passed as a parameter. CORBA::Boolean -CORBA::Object::_is_a (const char *type_id - ACE_ENV_ARG_DECL) +CORBA::Object::_is_a (const char *type_id) { TAO_OBJECT_IOR_EVALUATE_RETURN; @@ -222,8 +221,7 @@ CORBA::Object::_is_a (const char *type_id return true; return this->proxy_broker ()->_is_a (this, - type_id - ACE_ENV_ARG_PARAMETER); + type_id); } const char* @@ -270,13 +268,12 @@ CORBA::Object::_stubobj (void) } CORBA::ULong -CORBA::Object::_hash (CORBA::ULong maximum - ACE_ENV_ARG_DECL) +CORBA::Object::_hash (CORBA::ULong maximum) { TAO_OBJECT_IOR_EVALUATE_RETURN; if (this->protocol_proxy_ != 0) - return this->protocol_proxy_->hash (maximum ACE_ENV_ARG_PARAMETER); + return this->protocol_proxy_->hash (maximum); else { // Locality-constrained object. @@ -293,8 +290,7 @@ CORBA::Object::_hash (CORBA::ULong maximum } CORBA::Boolean -CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj - ACE_ENV_ARG_DECL_NOT_USED) +CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj) ACE_THROW_SPEC (()) { if (other_obj == this) @@ -313,7 +309,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj // TAO's extensions TAO::ObjectKey * -CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Object::_key (void) { TAO_OBJECT_IOR_EVALUATE_RETURN; @@ -370,8 +366,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, CORBA::NVList_ptr arg_list, CORBA::NamedValue_ptr result, CORBA::Request_ptr &request, - CORBA::Flags req_flags - ACE_ENV_ARG_DECL) + CORBA::Flags req_flags) { TAO_OBJECT_IOR_EVALUATE; @@ -381,7 +376,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, // object references. if (ctx != 0 || this->protocol_proxy_ == 0) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } TAO_Dynamic_Adapter *dynamic_adapter = @@ -398,7 +393,6 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, 0, request, req_flags - ACE_ENV_ARG_PARAMETER ); } #endif @@ -412,8 +406,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, CORBA::ExceptionList_ptr exceptions, CORBA::ContextList_ptr, CORBA::Request_ptr &request, - CORBA::Flags req_flags - ACE_ENV_ARG_DECL) + CORBA::Flags req_flags) { TAO_OBJECT_IOR_EVALUATE; @@ -423,7 +416,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, // object references. if (ctx != 0 || this->protocol_proxy_ == 0) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } TAO_Dynamic_Adapter *dynamic_adapter = @@ -439,15 +432,12 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, result, exceptions, request, - req_flags - ACE_ENV_ARG_PARAMETER - ); + req_flags); } #endif CORBA::Request_ptr -CORBA::Object::_request (const char *operation - ACE_ENV_ARG_DECL) +CORBA::Object::_request (const char *operation) { TAO_OBJECT_IOR_EVALUATE_RETURN; if (this->protocol_proxy_) @@ -461,7 +451,6 @@ CORBA::Object::_request (const char *operation this, this->protocol_proxy_->orb_core ()->orb (), operation - ACE_ENV_ARG_PARAMETER ); } else @@ -476,61 +465,54 @@ CORBA::Object::_request (const char *operation // the latter case, return true. CORBA::Boolean -CORBA::Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Object::_non_existent (void) { TAO_OBJECT_IOR_EVALUATE_RETURN; CORBA::Boolean retval = false; - ACE_TRY + try { - retval = this->proxy_broker ()->_non_existent (this - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + retval = this->proxy_broker ()->_non_existent (this); } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch ( ::CORBA::OBJECT_NOT_EXIST&) { retval = true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (retval); return retval; } CORBA::InterfaceDef_ptr -CORBA::Object::_get_interface (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Object::_get_interface (void) { TAO_OBJECT_IOR_EVALUATE_RETURN; - return this->proxy_broker ()->_get_interface (this - ACE_ENV_ARG_PARAMETER); + return this->proxy_broker ()->_get_interface (this); } CORBA::ImplementationDef_ptr -CORBA::Object::_get_implementation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Object::_get_implementation (void) { return 0; } CORBA::Object_ptr -CORBA::Object::_get_component (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Object::_get_component (void) { TAO_OBJECT_IOR_EVALUATE_RETURN; - return this->proxy_broker ()->_get_component (this - ACE_ENV_ARG_PARAMETER); + return this->proxy_broker ()->_get_component (this); } char* -CORBA::Object::_repository_id (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Object::_repository_id (void) { TAO_OBJECT_IOR_EVALUATE_RETURN; - return this->proxy_broker ()->_repository_id (this - ACE_ENV_ARG_PARAMETER); + return this->proxy_broker ()->_repository_id (this); } #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -545,28 +527,24 @@ CORBA::Object::_repository_id (ACE_ENV_SINGLE_ARG_DECL) CORBA::Policy_ptr CORBA::Object::_get_policy ( - CORBA::PolicyType type - ACE_ENV_ARG_DECL) + CORBA::PolicyType type) { TAO_OBJECT_IOR_EVALUATE_RETURN; if (this->protocol_proxy_) - return this->protocol_proxy_->get_policy (type - ACE_ENV_ARG_PARAMETER); + return this->protocol_proxy_->get_policy (type); else ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ()); } CORBA::Policy_ptr CORBA::Object::_get_cached_policy ( - TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL) + TAO_Cached_Policy_Type type) { TAO_OBJECT_IOR_EVALUATE_RETURN; if (this->protocol_proxy_) - return this->protocol_proxy_->get_cached_policy (type - ACE_ENV_ARG_PARAMETER); + return this->protocol_proxy_->get_cached_policy (type); else ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ()); } @@ -574,8 +552,7 @@ CORBA::Object::_get_cached_policy ( CORBA::Object_ptr CORBA::Object::_set_policy_overrides ( const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL) + CORBA::SetOverrideType set_add) { TAO_OBJECT_IOR_EVALUATE_RETURN; @@ -584,9 +561,7 @@ CORBA::Object::_set_policy_overrides ( TAO_Stub* stub = this->protocol_proxy_->set_policy_overrides (policies, - set_add - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + set_add); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -600,7 +575,6 @@ CORBA::Object::_set_policy_overrides ( 0, ENOMEM), CORBA::COMPLETED_MAYBE)); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); // If the stub is collocated and we don't have a collocated server we need // to reinitialize it to get it. @@ -615,58 +589,46 @@ CORBA::Object::_set_policy_overrides ( } CORBA::PolicyList * -CORBA::Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types - ACE_ENV_ARG_DECL) +CORBA::Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types) { TAO_OBJECT_IOR_EVALUATE_RETURN; if (this->protocol_proxy_) - return this->protocol_proxy_->get_policy_overrides (types - ACE_ENV_ARG_PARAMETER); + return this->protocol_proxy_->get_policy_overrides (types); else ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CORBA::Boolean CORBA::Object::_validate_connection ( - CORBA::PolicyList_out inconsistent_policies - ACE_ENV_ARG_DECL) + CORBA::PolicyList_out inconsistent_policies) { TAO_OBJECT_IOR_EVALUATE_RETURN; inconsistent_policies = 0; - CORBA::Boolean retval = 0; - -#if (TAO_HAS_MINIMUM_CORBA == 1) - - ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check - - retval = false; -#else + CORBA::Boolean retval = false; +#if (TAO_HAS_MINIMUM_CORBA == 0) // If the object is collocated then use non_existent to see whether // it's there. if (this->_is_collocated ()) - return !(this->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER)); + return !(this->_non_existent ()); TAO::LocateRequest_Invocation_Adapter tao_call (this); - ACE_TRY + try { - tao_call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tao_call.invoke (); } - ACE_CATCH (CORBA::INV_POLICY, ex) + catch ( ::CORBA::INV_POLICY&) { inconsistent_policies = tao_call.get_inconsistent_policies (); retval = false; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (false); retval = true; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -678,7 +640,7 @@ CORBA::Object::_validate_connection ( CORBA::ORB_ptr -CORBA::Object::_get_orb (ACE_ENV_SINGLE_ARG_DECL) +CORBA::Object::_get_orb (void) { if (this->orb_core_ != 0) { @@ -772,12 +734,10 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) TAO_Stub *objdata = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO_Connector_Registry *connector_registry = - orb_core->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb_core->connector_registry (); for (CORBA::ULong i = 0; i != profile_count; ++i) { @@ -819,22 +779,18 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) objdata = orb_core->create_stub (obj->ior_->type_id.in (), - mp - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + mp); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, ACE_TEXT ("TAO - ERROR creating stub ") ACE_TEXT ("object when demarshaling object ") ACE_TEXT ("reference.")); return; } - ACE_ENDTRY; - ACE_CHECK; TAO_Stub_Auto_Ptr safe_objdata (objdata); @@ -917,12 +873,10 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) TAO_Stub *objdata = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO_Connector_Registry *connector_registry = - orb_core->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb_core->connector_registry (); for (CORBA::ULong i = 0; i != profile_count && cdr.good_bit (); ++i) { @@ -947,22 +901,18 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) objdata = orb_core->create_stub (type_hint.in (), - mp - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + mp); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, ACE_TEXT ("TAO - ERROR creating stub ") ACE_TEXT ("object when demarshaling object ") ACE_TEXT ("reference.\n")); return 0; } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_objdata (objdata); diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index d0a0f44d12d..55bb36094ee 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -119,8 +119,7 @@ namespace CORBA static CORBA::Object_ptr _nil (void); /// No-op it is just here to simplify some templates. - static CORBA::Object_ptr _narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + static CORBA::Object_ptr _narrow (CORBA::Object_ptr obj); // These calls correspond to over-the-wire operations, or at least // do so in many common cases. The normal implementation assumes a @@ -129,8 +128,7 @@ namespace CORBA // appropriate. /// Determine if we are of the type specified by the "logical_type_id" - virtual CORBA::Boolean _is_a (const char *logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Boolean _is_a (const char *logical_type_id); /// The repository ID for the most derived class, this is an /// implementation method and does no remote invocations! @@ -144,8 +142,7 @@ namespace CORBA * different ORB protocols are in use) there is no default * implementation. */ - virtual CORBA::ULong _hash (CORBA::ULong maximum - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::ULong _hash (CORBA::ULong maximum); /** * Try to determine if this object is the same as other_obj. This @@ -153,36 +150,25 @@ namespace CORBA * private state. Since that changes easily (when different ORB * protocols are in use) there is no default implementation. */ - virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj) ACE_THROW_SPEC (()); #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual CORBA::Boolean _non_existent (void); /// This method is deprecated in the CORBA 2.2 spec, we just return 0 /// every time. - virtual CORBA::ImplementationDef_ptr _get_implementation ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual CORBA::ImplementationDef_ptr _get_implementation (void); /// Get info about the object from the Interface Repository. - virtual InterfaceDef_ptr _get_interface ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual InterfaceDef_ptr _get_interface (void); /// Get info about the object from the Interface Repository. - virtual CORBA::Object_ptr _get_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual CORBA::Object_ptr _get_component (void); /// Get the repository id. - virtual char * _repository_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual char * _repository_id (void); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) // DII operations to create a request. @@ -196,8 +182,7 @@ namespace CORBA CORBA::NVList_ptr arg_list, CORBA::NamedValue_ptr result, CORBA::Request_ptr &request, - CORBA::Flags req_flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::Flags req_flags); virtual void _create_request (CORBA::Context_ptr ctx, const char *operation, @@ -206,8 +191,7 @@ namespace CORBA CORBA::ExceptionList_ptr exclist, CORBA::ContextList_ptr ctxtlist, CORBA::Request_ptr &request, - CORBA::Flags req_flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::Flags req_flags); #endif // The default implementation of this method uses the same simple, @@ -216,37 +200,29 @@ namespace CORBA // implementation. /// DII operation to create a request. - virtual CORBA::Request_ptr _request (const char *operation - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Request_ptr _request (const char *operation); #endif /* TAO_HAS_MINIMUM_CORBA */ #if (TAO_HAS_CORBA_MESSAGING == 1) - CORBA::Policy_ptr _get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::Policy_ptr _get_policy (CORBA::PolicyType type); - CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type); CORBA::Object_ptr _set_policy_overrides ( const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::SetOverrideType set_add); CORBA::PolicyList * _get_policy_overrides ( - const CORBA::PolicyTypeSeq & types - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + const CORBA::PolicyTypeSeq & types); CORBA::Boolean _validate_connection ( - CORBA::PolicyList_out inconsistent_policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::PolicyList_out inconsistent_policies); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - virtual CORBA::ORB_ptr _get_orb ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); + virtual CORBA::ORB_ptr _get_orb (void); /** * @name Reference Count Managment @@ -306,7 +282,7 @@ namespace CORBA /// Return the object key as an out parameter. Caller should release /// return value when finished with it. - virtual TAO::ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO::ObjectKey *_key (void); /// Constructor Object (TAO_Stub *p, diff --git a/TAO/tao/Object.inl b/TAO/tao/Object.inl index e8c1606bb73..d2d859dc510 100644 --- a/TAO/tao/Object.inl +++ b/TAO/tao/Object.inl @@ -67,8 +67,7 @@ CORBA::Object::_nil (void) ACE_INLINE CORBA::Object_ptr -CORBA::Object::_narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED) +CORBA::Object::_narrow (CORBA::Object_ptr obj) { return CORBA::Object::_duplicate (obj); } diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index 86a84a450ca..aaa686edadb 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -51,7 +51,7 @@ namespace TAO { public: bool operator () (const TAO::ObjectKey &lhs, - const TAO::ObjectKey &rhs) const; + const TAO::ObjectKey &rhs) const; }; /** diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index 69b1a7559bc..a8c625b6e46 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -59,8 +59,7 @@ public: */ virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR* argv [] - ACE_ENV_ARG_DECL_NOT_USED) + ACE_TCHAR* argv []) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h index b0aa8a56cc5..4bcc45d4ced 100644 --- a/TAO/tao/Object_Proxy_Broker.h +++ b/TAO/tao/Object_Proxy_Broker.h @@ -20,14 +20,14 @@ #define TAO_OBJECT_PROXY_BROKER_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "tao/TAO_Export.h" -#include "tao/Basic_Types.h" #include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -38,8 +38,6 @@ namespace CORBA class Object; typedef Object *Object_ptr; - - class Environment; } namespace TAO @@ -58,24 +56,17 @@ namespace TAO virtual ~Object_Proxy_Broker (void); virtual CORBA::Boolean _is_a (CORBA::Object_ptr target, - const char *logical_type_id - ACE_ENV_ARG_DECL) = 0; + const char *logical_type_id) = 0; #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) = 0; + virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target) = 0; - virtual CORBA::InterfaceDef *_get_interface ( - CORBA::Object_ptr target - ACE_ENV_ARG_DECL - ) = 0; + virtual CORBA::InterfaceDef *_get_interface (CORBA::Object_ptr target) = 0; - virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) = 0; + virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target) = 0; - virtual char * _repository_id (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) = 0; + virtual char * _repository_id (CORBA::Object_ptr target) = 0; #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ }; diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index f5071ad0466..a23bb503ff7 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -2,7 +2,6 @@ #include "tao/Object_Ref_Table.h" #include "tao/ORB.h" -#include "tao/Environment.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/SystemException.h" diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index 920b0155f1c..142afaab8b3 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -30,11 +30,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace CORBA -{ - class Environment; -} - /** * @class TAO_Object_Ref_Table * diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp index 6a6808b2738..7892e35bf4a 100644 --- a/TAO/tao/Object_T.cpp +++ b/TAO/tao/Object_T.cpp @@ -15,17 +15,14 @@ namespace TAO T * Narrow_Utils<T>::narrow (CORBA::Object_ptr obj, const char *repo_id, - Proxy_Broker_Factory pbf - ACE_ENV_ARG_DECL) + Proxy_Broker_Factory pbf) { if (CORBA::is_nil (obj)) { return T::_nil (); } - CORBA::Boolean const is_it = obj->_is_a (repo_id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (T::_nil ()); + CORBA::Boolean const is_it = obj->_is_a (repo_id); if (is_it == false) { @@ -34,33 +31,26 @@ namespace TAO return TAO::Narrow_Utils<T>::unchecked_narrow (obj, repo_id, - pbf - ACE_ENV_ARG_PARAMETER); + pbf); } template<typename T> T * Narrow_Utils<T>::unchecked_narrow (CORBA::Object_ptr obj, Proxy_Broker_Factory pbf) { - ACE_DECLARE_NEW_CORBA_ENV; - T *proxy = 0; - ACE_TRY + try { proxy = TAO::Narrow_Utils<T>::unchecked_narrow (obj, 0, - pbf - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + pbf); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Swallow the exception return T::_nil (); } - ACE_ENDTRY; - ACE_CHECK_RETURN (proxy); return proxy; } @@ -68,8 +58,7 @@ namespace TAO template<typename T> T * Narrow_Utils<T>::unchecked_narrow (CORBA::Object_ptr obj, const char *, - Proxy_Broker_Factory pbf - ACE_ENV_ARG_DECL) + Proxy_Broker_Factory pbf) { if (CORBA::is_nil (obj)) { diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h index 0fee83b8170..df39e83d6d6 100644 --- a/TAO/tao/Object_T.h +++ b/TAO/tao/Object_T.h @@ -49,8 +49,7 @@ namespace TAO static T_ptr narrow (CORBA::Object_ptr, const char *repo_id, - Proxy_Broker_Factory - ACE_ENV_ARG_DECL); + Proxy_Broker_Factory); // Version used the operators. static T_ptr unchecked_narrow (CORBA::Object_ptr, @@ -58,8 +57,7 @@ namespace TAO static T_ptr unchecked_narrow (CORBA::Object_ptr, const char *repo_id, - Proxy_Broker_Factory - ACE_ENV_ARG_DECL); + Proxy_Broker_Factory); private: // Code for lazily evaluated IORs. diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp index 969f8adfde2..dd606ef9a8f 100644 --- a/TAO/tao/PI/ClientRequestDetails.cpp +++ b/TAO/tao/PI/ClientRequestDetails.cpp @@ -17,7 +17,7 @@ namespace TAO void ClientRequestDetails::apply_policies ( const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) + ) { // Flag to check for duplicate ProcessingModePolicy objects in the list. bool processing_mode_applied = false; @@ -36,8 +36,7 @@ namespace TAO // Obtain the PolicyType from the current Policy object. const CORBA::PolicyType policy_type = - policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy->policy_type (); if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE) { @@ -45,7 +44,7 @@ namespace TAO { // This is the second time we have run into this policy type, // and that is not allowed. - ACE_THROW (CORBA::INV_POLICY ()); + throw ( ::CORBA::INV_POLICY ()); } // Flip the flag to true in order to trap any dupes. @@ -55,18 +54,16 @@ namespace TAO PortableInterceptor::ProcessingModePolicy_var pm_policy = PortableInterceptor::ProcessingModePolicy::_narrow ( policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Save the value of the ProcessingModePolicy in our data member. this->processing_mode_ = - pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + pm_policy->processing_mode (); } else { // We don't support the current policy type. - ACE_THROW (CORBA::INV_POLICY ()); + throw ( ::CORBA::INV_POLICY ()); } } } diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h index ec4666ae047..80abab464d6 100644 --- a/TAO/tao/PI/ClientRequestDetails.h +++ b/TAO/tao/PI/ClientRequestDetails.h @@ -55,7 +55,7 @@ namespace TAO ClientRequestDetails (void); void apply_policies (const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + ); /// Returns true if the ProcessingMode setting permits the "firing" /// of the associated client request interceptor based upon the diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index f3df9f77449..93eff12f2fb 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -63,7 +63,7 @@ IOP::ServiceContext * TAO_ClientRequestInfo::get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceContext_var service_context; @@ -83,31 +83,28 @@ TAO_ClientRequestInfo::get_service_context_i ( } CORBA::Object_ptr -TAO_ClientRequestInfo::target (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::target (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->check_validity (); return CORBA::Object::_duplicate (this->invocation_->target ()); } CORBA::Object_ptr -TAO_ClientRequestInfo::effective_target (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::effective_target (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->check_validity (); return CORBA::Object::_duplicate (this->invocation_->effective_target ()); } IOP::TaggedProfile * -TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::effective_profile (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); IOP::TaggedProfile *tagged_profile = 0; ACE_NEW_THROW_EX (tagged_profile, @@ -117,7 +114,6 @@ TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); IOP::TaggedProfile_var safe_tagged_profile = tagged_profile; @@ -145,11 +141,10 @@ TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL) // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::received_exception (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); if (this->invocation_->reply_status () != PortableInterceptor::SYSTEM_EXCEPTION && this->invocation_->reply_status () != PortableInterceptor::USER_EXCEPTION) @@ -171,7 +166,6 @@ TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); CORBA::Any_var caught_exception_var = temp; @@ -186,11 +180,10 @@ TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL) char * TAO_ClientRequestInfo::received_exception_id ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); CORBA::Exception *caught_exception = invocation_->caught_exception (); @@ -208,11 +201,10 @@ TAO_ClientRequestInfo::received_exception_id ( IOP::TaggedComponent * TAO_ClientRequestInfo::get_effective_component ( IOP::ComponentId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); TAO_Stub *stub = this->invocation_->effective_target ()->_stubobj (); @@ -238,7 +230,6 @@ TAO_ClientRequestInfo::get_effective_component ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); IOP::TaggedComponent_var safe_tagged_component = tagged_component; @@ -259,11 +250,10 @@ TAO_ClientRequestInfo::get_effective_component ( IOP::TaggedComponentSeq * TAO_ClientRequestInfo::get_effective_components ( IOP::ComponentId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); TAO_Stub *stub = this->invocation_->target ()->_stubobj (); @@ -292,7 +282,6 @@ TAO_ClientRequestInfo::get_effective_components ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); safe_tagged_components = tagged_components; } @@ -319,17 +308,16 @@ TAO_ClientRequestInfo::get_effective_components ( CORBA::Policy_ptr TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->check_validity (); // @@ Do we need to look anywhere else for the request policies? #if TAO_HAS_CORBA_MESSAGING == 1 return this->invocation_->target ()->_get_policy (type - ACE_ENV_ARG_PARAMETER); + ); #else ACE_UNUSED_ARG (type); @@ -346,11 +334,10 @@ void TAO_ClientRequestInfo::add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); // Get the service context from the list TAO_Service_Context &service_context_list = @@ -358,17 +345,16 @@ TAO_ClientRequestInfo::add_request_service_context ( if (service_context_list.set_context (service_context, replace) == 0) { - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO)); } } CORBA::ULong -TAO_ClientRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::request_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // @todo We may have to worry about AMI once we support interceptors // in AMI requests since the Invocation object no longer @@ -450,27 +436,24 @@ TAO_ClientRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL) } char * -TAO_ClientRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::operation (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); return CORBA::string_dup ( this->invocation_->operation_details ().opname ()); } Dynamic::ParameterList * -TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::arguments (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_RequestInfo_Util::make_parameter_list (); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -480,7 +463,7 @@ TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) return safe_parameter_list._retn (); - //return this->invocation_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); + //return this->invocation_->arguments (); } bool @@ -502,15 +485,13 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList ¶m_list) } Dynamic::ExceptionList * -TAO_ClientRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::exceptions (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_RequestInfo_Util::make_exception_list (); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -545,11 +526,10 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list) } Dynamic::ContextList * -TAO_ClientRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::contexts (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), @@ -557,11 +537,10 @@ TAO_ClientRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL) } Dynamic::RequestContext * -TAO_ClientRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::operation_context (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), @@ -569,17 +548,15 @@ TAO_ClientRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Any * -TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::result (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // Generate the result on demand. static const CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_RequestInfo_Util::make_any (tk_void_any); CORBA::Any_var safe_result_any = result_any; @@ -602,31 +579,28 @@ TAO_ClientRequestInfo::result (CORBA::Any *any) } CORBA::Boolean -TAO_ClientRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::response_expected (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); return this->invocation_->response_expected (); } Messaging::SyncScope -TAO_ClientRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::sync_scope (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); return this->invocation_->operation_details ().response_flags (); } PortableInterceptor::ReplyStatus -TAO_ClientRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::reply_status (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableInterceptor::SYSTEM_EXCEPTION); + this->check_validity (); if (this->invocation_->reply_status() == -1) { @@ -640,11 +614,10 @@ TAO_ClientRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Object_ptr -TAO_ClientRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::forward_reference (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->check_validity (); if (this->invocation_->reply_status() != PortableInterceptor::LOCATION_FORWARD) { @@ -661,25 +634,23 @@ TAO_ClientRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL) CORBA::Any * TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); return this->rs_pi_current_.get_slot (id - ACE_ENV_ARG_PARAMETER); + ); } IOP::ServiceContext * TAO_ClientRequestInfo::get_request_service_context ( IOP::ServiceId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // Get the service context from the list TAO_Service_Context &service_context_list = @@ -687,17 +658,16 @@ TAO_ClientRequestInfo::get_request_service_context ( return this->get_service_context_i (service_context_list, id - ACE_ENV_ARG_PARAMETER); + ); } IOP::ServiceContext * TAO_ClientRequestInfo::get_reply_service_context ( IOP::ServiceId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // Get the service context from the list TAO_Service_Context &service_context_list = @@ -705,14 +675,14 @@ TAO_ClientRequestInfo::get_reply_service_context ( return this->get_service_context_i (service_context_list, id - ACE_ENV_ARG_PARAMETER); + ); } void -TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::check_validity (void) { if (this->invocation_ == 0) - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index 4671889f2b1..22abd55b4d9 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -79,50 +79,50 @@ public: /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. virtual CORBA::ULong request_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the operation name for the current request. virtual char * operation ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of arguments passed to the current operation. virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of exceptions the current operation is capable /// of throwing. virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ContextList * contexts ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::RequestContext * operation_context ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the result of the current request. If there is no return /// value then an Any with tk_void TypeCode is returned. This is /// method is not valid for oneway operations. virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns true for a two-way operation, and false otherwise. virtual CORBA::Boolean response_expected ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)) ; /// Return the sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. virtual Messaging::SyncScope sync_scope ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the reply status for the current request. @@ -132,18 +132,18 @@ public: * TRANSPORT_RETRY, UNKNOWN. */ virtual PortableInterceptor::ReplyStatus reply_status ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// If the reply status is PortableInterceptor::LOCATION_FORWARD or /// return the object reference to which the request was forwarded. virtual CORBA::Object_ptr forward_reference ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)) ; virtual CORBA::Any * get_slot ( PortableInterceptor::SlotId id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); @@ -151,30 +151,30 @@ public: /// from the request service context list. virtual IOP::ServiceContext * get_request_service_context ( IOP::ServiceId id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the IOP::ServiceContext with the given IOP::ServiceId /// from the reply service context list. virtual IOP::ServiceContext * get_reply_service_context ( IOP::ServiceId id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the (initial, non-forwarded, or permanently forwarded) /// object reference of the target. virtual CORBA::Object_ptr target ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the object reference for the current target. The target /// may change in the even of a location forward. virtual CORBA::Object_ptr effective_target ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IOP::TaggedProfile * effective_profile ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return an Any containing the received exception, if any. @@ -183,12 +183,12 @@ public: * @note There is no trivial way to extract the exception from an Any. */ virtual CORBA::Any * received_exception ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the repository ID for the received exception. virtual char * received_exception_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the first IOP::TaggedComponent that matches the given @@ -196,7 +196,7 @@ public: /// target. virtual IOP::TaggedComponent * get_effective_component ( IOP::ComponentId id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return all IOP::TaggedComponent(s) that match the given @@ -204,14 +204,14 @@ public: /// target. virtual IOP::TaggedComponentSeq * get_effective_components ( IOP::ComponentId id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the policy of the given type in effect for the current /// request. virtual CORBA::Policy_ptr get_request_policy ( CORBA::PolicyType type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the IOP::ServiceContext to the request (outgoing) @@ -219,7 +219,7 @@ public: virtual void add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /* @@ -253,7 +253,7 @@ private: /// Check if this ClientRequestInfo object is called within the /// context of a request. - void check_validity (ACE_ENV_SINGLE_ARG_DECL); + void check_validity (void); /// Setup thread scope and request scope /// PortableInterceptor::Current objects. @@ -263,7 +263,7 @@ private: IOP::ServiceContext *get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp index 1d1dd7429b2..4d903c3ef9c 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp @@ -24,14 +24,14 @@ namespace TAO void ClientRequestInterceptor_Adapter_Impl::send_request ( Invocation_Base &invocation - ACE_ENV_ARG_DECL) + ) { // This method implements one of the "starting" client side // interception point. bool const is_remote_request = invocation.is_remote_request(); - ACE_TRY + try { TAO_ClientRequestInfo ri (&invocation); @@ -44,8 +44,7 @@ namespace TAO { registered.interceptor_-> send_request (&ri - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } // The starting interception point completed successfully. @@ -53,21 +52,18 @@ namespace TAO ++invocation.stack_size (); } } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + catch ( ::PortableInterceptor::ForwardRequest& exc) { this->process_forward_request (invocation, exc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_ENDTRY; - ACE_CHECK; } void ClientRequestInterceptor_Adapter_Impl::receive_reply ( Invocation_Base &invocation - ACE_ENV_ARG_DECL) + ) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -99,8 +95,7 @@ namespace TAO registered.interceptor_-> receive_reply ( &ri - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } @@ -112,7 +107,7 @@ namespace TAO void ClientRequestInterceptor_Adapter_Impl::receive_exception ( Invocation_Base &invocation - ACE_ENV_ARG_DECL) + ) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -122,7 +117,7 @@ namespace TAO // Notice that the interceptors are processed in the opposite order // they were pushed onto the stack since this is an "ending" // interception point. - ACE_TRY + try { TAO_ClientRequestInfo ri (&invocation); @@ -145,19 +140,17 @@ namespace TAO registered.interceptor_-> receive_exception ( &ri - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + catch ( ::PortableInterceptor::ForwardRequest& exc) { this->process_forward_request (invocation, exc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // The receive_exception() interception point in the remaining // interceptors must be called so call this method (not the @@ -171,8 +164,7 @@ namespace TAO invocation.exception (&ACE_ANY_EXCEPTION); - this->receive_exception (invocation ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_exception (invocation); PortableInterceptor::ReplyStatus status = this->reply_status (invocation); @@ -182,16 +174,14 @@ namespace TAO // LOCATION_FORWARD). if (status == PortableInterceptor::SYSTEM_EXCEPTION || status == PortableInterceptor::USER_EXCEPTION) - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } void ClientRequestInterceptor_Adapter_Impl::receive_other ( Invocation_Base &invocation - ACE_ENV_ARG_DECL) + ) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -202,7 +192,7 @@ namespace TAO // they were pushed onto the stack since this is an "ending" // interception point. - ACE_TRY + try { TAO_ClientRequestInfo ri (&invocation); @@ -222,22 +212,16 @@ namespace TAO if (registered.details_.should_be_processed (is_remote_request)) { - registered.interceptor_-> - receive_other ( - &ri - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + registered.interceptor_->receive_other (&ri); } } } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + catch ( ::PortableInterceptor::ForwardRequest& exc) { this->process_forward_request (invocation, - exc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + exc); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // The receive_exception() interception point in the remaining // interceptors must be called so call this method (not the @@ -251,8 +235,7 @@ namespace TAO invocation.exception (&ACE_ANY_EXCEPTION); - this->receive_exception (invocation ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_exception (invocation); PortableInterceptor::ReplyStatus status = this->reply_status (invocation); @@ -262,53 +245,41 @@ namespace TAO // LOCATION_FORWARD). if (status == PortableInterceptor::SYSTEM_EXCEPTION || status == PortableInterceptor::USER_EXCEPTION) - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } void ClientRequestInterceptor_Adapter_Impl::process_forward_request ( Invocation_Base &invocation, - PortableInterceptor::ForwardRequest &exc - ACE_ENV_ARG_DECL) + PortableInterceptor::ForwardRequest &exc) { invocation.forwarded_reference (exc.forward.in ()); // receive_other() is potentially invoked recursively. - this->receive_other (invocation - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->receive_other (invocation); } void ClientRequestInterceptor_Adapter_Impl::add_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInterceptor_ptr interceptor) { - this->interceptor_list_.add_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->interceptor_list_.add_interceptor (interceptor); } void ClientRequestInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) + const CORBA::PolicyList& policies) { this->interceptor_list_.add_interceptor (interceptor, - policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies); } void - ClientRequestInterceptor_Adapter_Impl::destroy_interceptors ( - ACE_ENV_SINGLE_ARG_DECL) + ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (void) { - this->interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->interceptor_list_.destroy_interceptors (); } PortableInterceptor::ReplyStatus diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h index 4b1a7ebc70c..f37ef7e108d 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h @@ -79,36 +79,36 @@ namespace TAO /// This method implements one of the "starting" client side /// interception points. virtual void send_request (Invocation_Base &invocation - ACE_ENV_ARG_DECL); + ); /// This method implements one of the "ending" client side /// interception point. virtual void receive_reply (Invocation_Base &invocation - ACE_ENV_ARG_DECL); + ); /// This method implements one of the "ending" client side /// interception point. virtual void receive_exception (Invocation_Base &invocation - ACE_ENV_ARG_DECL); + ); /// This method implements one of the "ending" client side /// interception point. virtual void receive_other (Invocation_Base &invocation - ACE_ENV_ARG_DECL); + ); //@} /// Register an interceptor. virtual void add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL); + ); /// Register an interceptor with policies. virtual void add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + ); - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); + virtual void destroy_interceptors (void); virtual PortableInterceptor::ReplyStatus reply_status ( TAO::Invocation_Base const &invocation_base); @@ -120,7 +120,7 @@ namespace TAO /// to notifying the Invocation object of the LOCATION_FORWARD. void process_forward_request (Invocation_Base &invocation, PortableInterceptor::ForwardRequest &exc - ACE_ENV_ARG_DECL); + ); private: diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index fe216233ca9..55cb166bcad 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -45,7 +45,7 @@ namespace TAO void Interceptor_List<InterceptorType,DetailsType>::add_interceptor ( InterceptorType_ptr_type interceptor - ACE_ENV_ARG_DECL) + ) { if (!CORBA::is_nil (interceptor)) { @@ -59,8 +59,7 @@ namespace TAO /// If the Interceptor is not anonymous, make sure an /// Interceptor with the same isn't already registered. CORBA::String_var name = - interceptor->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + interceptor->name (); if (ACE_OS::strlen (name.in ()) != 0) { @@ -87,7 +86,7 @@ namespace TAO if (ACE_OS::strcmp (existing_name.in (), name.in ()) == 0) { - ACE_THROW (PortableInterceptor::ORBInitInfo::DuplicateName ()); + throw (PortableInterceptor::ORBInitInfo::DuplicateName ()); } } } @@ -103,7 +102,7 @@ namespace TAO } else { - ACE_THROW ( + throw ( CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, @@ -120,7 +119,7 @@ namespace TAO Interceptor_List<InterceptorType,DetailsType>::add_interceptor ( InterceptorType_ptr_type interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) + ) { if (!CORBA::is_nil (interceptor)) { @@ -134,8 +133,7 @@ namespace TAO /// If the Interceptor is not anonymous, make sure an /// Interceptor with the same isn't already registered. CORBA::String_var name = - interceptor->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + interceptor->name (); if (ACE_OS::strlen (name.in ()) != 0) { @@ -162,7 +160,7 @@ namespace TAO if (ACE_OS::strcmp (existing_name.in (), name.in ()) == 0) { - ACE_THROW (PortableInterceptor::ORBInitInfo::DuplicateName ()); + throw (PortableInterceptor::ORBInitInfo::DuplicateName ()); } } } @@ -170,8 +168,7 @@ namespace TAO // Create a DetailsType object, and attempt to apply the policies. DetailsType details; - details.apply_policies(policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + details.apply_policies(policies); /// Increase the length of the Interceptor sequence by one. const size_t new_len = old_len + 1; @@ -186,7 +183,7 @@ namespace TAO } else { - ACE_THROW ( + throw ( CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, @@ -201,12 +198,12 @@ namespace TAO template <typename InterceptorType, typename DetailsType> void Interceptor_List<InterceptorType,DetailsType>::destroy_interceptors ( - ACE_ENV_SINGLE_ARG_DECL) + void) { size_t const len = this->interceptors_.size (); size_t ilen = len; - ACE_TRY + try { for (size_t k = 0; k < len; ++k) { @@ -215,8 +212,7 @@ namespace TAO // invocation occurs afterwards. --ilen; - this->interceptor (k)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->interceptor (k)->destroy (); // Since Interceptor::destroy() can throw an exception, // decrease the size of the interceptor array incrementally @@ -226,7 +222,7 @@ namespace TAO this->interceptors_.size (ilen); } } - ACE_CATCHALL + catch (...) { // Exceptions should not be propagated beyond this call. if (TAO_debug_level > 3) @@ -237,8 +233,6 @@ namespace TAO ACE_TEXT ("::destroy_interceptors () \n"))); } } - ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index 5160ec03377..5cfc907fd76 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -66,14 +66,14 @@ namespace TAO void add_interceptor ( InterceptorType_ptr_type i - ACE_ENV_ARG_DECL); + ); /// Register an interceptor with policies. void add_interceptor (InterceptorType_ptr_type i, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + ); - void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); + void destroy_interceptors (void); /// Return the registered interceptor in sequence element @a index. RegisteredInterceptor& registered_interceptor ( diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index 7dbc9cb0bb4..9bda8e24fec 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -76,11 +76,10 @@ TAO_ORBInitInfo::~TAO_ORBInitInfo (void) } CORBA::StringSeq * -TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::arguments (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // In accordance with the C++ mapping for sequences, it is up to the // caller to deallocate storage for returned sequences. @@ -93,7 +92,6 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); CORBA::StringSeq_var safe_args (args); @@ -107,11 +105,10 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) } char * -TAO_ORBInitInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::orb_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // In accordance with the C++ mapping for strings, return a copy. @@ -119,7 +116,7 @@ TAO_ORBInitInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL) } IOP::CodecFactory_ptr -TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::codec_factory (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->codec_factory_.in ())) @@ -141,8 +138,7 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL) if (loader != 0) { CORBA::Object_var cf = - loader->create_object (this->orb_core_->orb (), 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (IOP::CodecFactory::_nil ()); + loader->create_object (this->orb_core_->orb (), 0, 0); this->codec_factory_ = IOP::CodecFactory::_narrow (cf.in ()); } @@ -155,37 +151,33 @@ void TAO_ORBInitInfo::register_initial_reference ( const char * id, CORBA::Object_ptr obj - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); if (id == 0 || ACE_OS::strlen (id) == 0) - ACE_THROW (PortableInterceptor::ORBInitInfo::InvalidName ()); - ACE_CHECK; + throw (PortableInterceptor::ORBInitInfo::InvalidName ()); if (CORBA::is_nil (obj)) - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, + throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, CORBA::COMPLETED_NO)); - ACE_CHECK; TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table (); if (table.register_initial_reference (id, obj) == -1) - ACE_THROW (PortableInterceptor::ORBInitInfo::InvalidName ()); + throw (PortableInterceptor::ORBInitInfo::InvalidName ()); } CORBA::Object_ptr TAO_ORBInitInfo::resolve_initial_references ( const char * id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->check_validity (); if (id == 0 || ACE_OS::strlen (id) == 0) ACE_THROW_RETURN (PortableInterceptor::ORBInitInfo::InvalidName (), @@ -196,25 +188,23 @@ TAO_ORBInitInfo::resolve_initial_references ( // mechanism. return this->orb_core_->orb ()->resolve_initial_references (id - ACE_ENV_ARG_PARAMETER); + ); } void TAO_ORBInitInfo::add_client_request_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)) { # if TAO_HAS_INTERCEPTORS == 1 - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); - this->orb_core_->add_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->orb_core_->add_interceptor (interceptor); #else ACE_UNUSED_ARG (interceptor); - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -225,20 +215,18 @@ TAO_ORBInitInfo::add_client_request_interceptor ( void TAO_ORBInitInfo::add_server_request_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)) { # if TAO_HAS_INTERCEPTORS == 1 - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); - this->orb_core_->add_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->orb_core_->add_interceptor (interceptor); #else ACE_UNUSED_ARG (interceptor); - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -249,37 +237,35 @@ TAO_ORBInitInfo::add_server_request_interceptor ( void TAO_ORBInitInfo::add_ior_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); this->orb_core_->add_interceptor (interceptor - ACE_ENV_ARG_PARAMETER); + ); } void TAO_ORBInitInfo::add_client_request_interceptor_with_policy ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName, CORBA::PolicyError)) { # if TAO_HAS_INTERCEPTORS == 1 - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); this->orb_core_->add_interceptor (interceptor, policies - ACE_ENV_ARG_PARAMETER); + ); #else ACE_UNUSED_ARG (interceptor); ACE_UNUSED_ARG (policies); - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -291,23 +277,22 @@ void TAO_ORBInitInfo::add_server_request_interceptor_with_policy ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName, CORBA::PolicyError)) { # if TAO_HAS_INTERCEPTORS == 1 - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); this->orb_core_->add_interceptor (interceptor, policies - ACE_ENV_ARG_PARAMETER); + ); #else ACE_UNUSED_ARG (interceptor); ACE_UNUSED_ARG (policies); - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -319,13 +304,12 @@ void TAO_ORBInitInfo::add_ior_interceptor_with_policy ( PortableInterceptor::IORInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName, CORBA::PolicyError)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); // Since there are currently no PI Policies that pertain to // IOR Interceptors, we will always raise the NO_IMPLEMENT @@ -333,7 +317,7 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy ( // is currently not implemented/supported. ACE_UNUSED_ARG (interceptor); ACE_UNUSED_ARG (policies); - ACE_THROW (CORBA::NO_IMPLEMENT ( + throw ( ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), @@ -341,11 +325,10 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy ( } PortableInterceptor::SlotId -TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::allocate_slot_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); #if TAO_HAS_INTERCEPTORS == 1 // No need to acquire a lock. This only gets called during ORB @@ -365,32 +348,30 @@ void TAO_ORBInitInfo::register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); TAO::PolicyFactory_Registry_Adapter *registry = this->orb_core_->policy_factory_registry (); if (registry == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } registry->register_policy_factory (type, policy_factory - ACE_ENV_ARG_PARAMETER); + ); } size_t TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); size_t slot_id = 0; @@ -409,7 +390,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup } void -TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::check_validity (void) { if (this->orb_core_ == 0) { @@ -419,23 +400,22 @@ TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) // this instance to zero when it is done initializing the ORB, // which is why we base "existence" on the validity of the ORB // core pointer. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (0, + throw ( ::CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO)); } } CORBA::ORB_ptr -TAO_ORBInitInfo::_get_orb (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::_get_orb (void) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ORB::_nil ()); + this->check_validity (); return CORBA::ORB::_duplicate (this->orb_core_->orb ()); } TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { if (CORBA::is_nil (_tao_objref)) diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index 63c78095104..72c2cb20624 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -78,18 +78,18 @@ public: /// Return the argument vector for the ORB currently being /// initialized as a string sequence. virtual CORBA::StringSeq * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the ORBid for the ORB currently being initialized. virtual char * orb_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the CodecFactory for the ORB currently being /// initialized. virtual IOP::CodecFactory_ptr codec_factory ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Register a mapping between a string and a corresponding object @@ -105,7 +105,7 @@ public: virtual void register_initial_reference ( const char * id, CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName)); @@ -114,7 +114,7 @@ public: /// since the ORB may not be fully initialized yet. virtual CORBA::Object_ptr resolve_initial_references ( const char * id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName)); @@ -122,7 +122,7 @@ public: /// being initialized. virtual void add_client_request_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)); @@ -130,7 +130,7 @@ public: /// being initialized. virtual void add_server_request_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)); @@ -138,7 +138,7 @@ public: /// initialized. virtual void add_ior_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)); @@ -147,7 +147,7 @@ public: virtual void add_client_request_interceptor_with_policy ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName, CORBA::PolicyError)); @@ -157,7 +157,7 @@ public: virtual void add_server_request_interceptor_with_policy ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName, CORBA::PolicyError)); @@ -167,7 +167,7 @@ public: virtual void add_ior_interceptor_with_policy ( PortableInterceptor::IORInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName, CORBA::PolicyError)); @@ -175,7 +175,7 @@ public: /// Reserve a slot in table found within the /// PortableInterceptor::Current object. virtual PortableInterceptor::SlotId allocate_slot_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Register a policy factory of the given policy type with the ORB @@ -183,11 +183,11 @@ public: virtual void register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ORB_ptr _get_orb ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); //@} @@ -210,7 +210,7 @@ public: */ size_t allocate_tss_slot_id ( ACE_CLEANUP_FUNC cleanup - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a pointer to the ORB Core associated with the ORB being @@ -249,12 +249,12 @@ public: static TAO_ORBInitInfo_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); static TAO_ORBInitInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); static TAO_ORBInitInfo_ptr _nil (void) @@ -274,7 +274,7 @@ protected: /// Check if this ORBInitInfo instance is valid. Once post_init() /// has been called on each of the ORBInitializers, this ORBInitInfo /// is no longer valid. Throw an exception in that case. - void check_validity (ACE_ENV_SINGLE_ARG_DECL); + void check_validity (void); private: diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index 1b20c74dcdb..2d45c545dd6 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -42,8 +42,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[]) PortableInterceptor::ORBInitializer_var orb_initializer; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { /// Register the PI ORBInitializer. @@ -54,15 +53,13 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[]) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; orb_initializer = temp_orb_initializer; this->register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { @@ -71,7 +68,6 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[]) } return -1; } - ACE_ENDTRY; #endif /* !TAO_AS_STATIC_LIBS && TAO_HAS_INTERCEPTORS == 1 */ return 0; } @@ -97,7 +93,7 @@ TAO::ORBInitializer_Registry::fini (void) void TAO::ORBInitializer_Registry::register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init - ACE_ENV_ARG_DECL) + ) { if (!CORBA::is_nil (init)) { @@ -109,14 +105,14 @@ TAO::ORBInitializer_Registry::register_orb_initializer ( size_t const cur_len = this->initializers_.size (); size_t const new_len = cur_len + 1; if (this->initializers_.size (new_len) != 0) - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); // Add the given ORBInitializer to the sequence. this->initializers_[cur_len] = PortableInterceptor::ORBInitializer::_duplicate (init); } else - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -129,7 +125,7 @@ TAO::ORBInitializer_Registry::pre_init ( int argc, char *argv[], PortableInterceptor::SlotId &slotid - ACE_ENV_ARG_DECL) + ) { ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, @@ -152,15 +148,13 @@ TAO::ORBInitializer_Registry::pre_init ( 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); TAO_ORBInitInfo_var orb_init_info_ = orb_init_info_temp; for (size_t i = 0; i < initializer_count; ++i) { this->initializers_[i]->pre_init (orb_init_info_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } slotid = orb_init_info_temp->slot_count (); @@ -181,7 +175,7 @@ TAO::ORBInitializer_Registry::post_init ( int argc, char *argv[], PortableInterceptor::SlotId slotid - ACE_ENV_ARG_DECL) + ) { if (pre_init_count > 0) { @@ -201,15 +195,13 @@ TAO::ORBInitializer_Registry::post_init ( 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; TAO_ORBInitInfo_var orb_init_info_ = orb_init_info_temp; for (size_t i = 0; i < pre_init_count; ++i) { this->initializers_[i]->post_init (orb_init_info_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } #if TAO_HAS_INTERCEPTORS == 1 @@ -230,8 +222,7 @@ TAO::ORBInitializer_Registry::post_init ( if (pi) { - pi->initialize (slot_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + pi->initialize (slot_count); } } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h index cac58a1d4e0..42209ab9be2 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h @@ -65,7 +65,7 @@ namespace TAO /// array. virtual void register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init - ACE_ENV_ARG_DECL); + ); /// Begin initialization of all registered ORBInitializers before /// the ORB itself is initialized. @@ -74,7 +74,7 @@ namespace TAO int argc, char *argv[], PortableInterceptor::SlotId &slotid - ACE_ENV_ARG_DECL); + ); /// Complete initialization of all registered ORBInitializers after /// the ORB has been initialized. @@ -84,7 +84,7 @@ namespace TAO int argc, char *argv[], PortableInterceptor::SlotId slotid - ACE_ENV_ARG_DECL); + ); private: // Prevent copying diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index 61a039a52ed..7035d1aa465 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -35,8 +35,7 @@ TAO_PI_Init::Initializer (void) PortableInterceptor::ORBInitializer_var orb_initializer; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { /// Register the PI ORBInitializer. @@ -47,15 +46,13 @@ TAO_PI_Init::Initializer (void) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { @@ -64,7 +61,6 @@ TAO_PI_Init::Initializer (void) } return -1; } - ACE_ENDTRY; #endif /* TAO_HAS_INTERCEPTORS == 1 */ return status; } diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp index d49e331f594..3230ee92e5d 100644 --- a/TAO/tao/PI/PICurrent.cpp +++ b/TAO/tao/PI/PICurrent.cpp @@ -32,28 +32,25 @@ TAO::PICurrent::~PICurrent (void) CORBA::Any * TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { - this->check_validity (identifier ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (identifier); - return this->tsc ()->get_slot (identifier ACE_ENV_ARG_PARAMETER); + return this->tsc ()->get_slot (identifier); } void TAO::PICurrent::set_slot (PortableInterceptor::SlotId identifier, const CORBA::Any &data - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { - this->check_validity (identifier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (identifier); - this->tsc ()->set_slot (identifier, data ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->tsc ()->set_slot (identifier, data); } namespace @@ -90,30 +87,30 @@ TAO::PICurrent::tsc (void) void TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier - ACE_ENV_ARG_DECL) + ) { // If the slot_count is zero, no initialization has been done (if there are // no slots, then the PICurrent_impl object is not created as there is no // data to copy). if (0 == this->slot_count_) - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO)); // No need to acquire a lock for this check. At this point, these // attributes are read only. if (identifier >= this->slot_count_) - ACE_THROW (PortableInterceptor::InvalidSlot ()); + throw (PortableInterceptor::InvalidSlot ()); } CORBA::ORB_ptr -TAO::PICurrent::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::PICurrent::_get_orb (void) { return CORBA::ORB::_duplicate (this->orb_core_.orb ()); } void TAO::PICurrent::initialize (PortableInterceptor::SlotId sc - ACE_ENV_ARG_DECL) + ) { // Only allow a single initialization; sc is the number of // allocated PICurrent data slots the end user wants. If 0 @@ -125,7 +122,7 @@ TAO::PICurrent::initialize (PortableInterceptor::SlotId sc // It MUST be called BEFORE we attempt to get/set any // PICurrent slot data. if (0 != orb_core_.add_tss_cleanup_func (CleanUpPICurrent, this->tss_slot_)) - ACE_THROW (CORBA::NO_MEMORY ( + throw ( ::CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, ENOMEM), diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h index 4cc3e99a218..97985e1d80d 100644 --- a/TAO/tao/PI/PICurrent.h +++ b/TAO/tao/PI/PICurrent.h @@ -72,20 +72,20 @@ namespace TAO /// Retrieve information stored in the slot table at the given /// SlotId. virtual CORBA::Any *get_slot (PortableInterceptor::SlotId id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); /// Set information in the slot table at the given SlotId. virtual void set_slot (PortableInterceptor::SlotId identifier, const CORBA::Any & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); //@} virtual CORBA::ORB_ptr _get_orb ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); /// Number of slots allocated in the slot table. @@ -97,10 +97,10 @@ namespace TAO /// Verify the validity of the given SlotId. void check_validity (const PortableInterceptor::SlotId &identifier - ACE_ENV_ARG_DECL); + ); /// Initialize the PICurrent object. - void initialize (PortableInterceptor::SlotId sc ACE_ENV_ARG_DECL); + void initialize (PortableInterceptor::SlotId sc); protected: /// Destructor diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp index 7cb54b6df2c..5de7cd7f8b1 100644 --- a/TAO/tao/PI/PICurrent_Impl.cpp +++ b/TAO/tao/PI/PICurrent_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Any * TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -33,7 +33,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Lazy copy of self detected at %N,%l\n"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } // Get the slot table that is currently active @@ -49,7 +49,6 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (any); } else { @@ -63,7 +62,6 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (any); } return any; @@ -72,7 +70,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier void TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier, const CORBA::Any & data - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -93,7 +91,7 @@ TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier, // slots for the reason stated above. if (identifier >= this->slot_table_.size () && this->slot_table_.size (identifier + 1) != 0) - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); this->slot_table_[identifier] = CORBA::Any (data); } diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index 11876b31acb..ec1c051f91e 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -59,14 +59,14 @@ namespace TAO /// Retrieve information stored in the slot table at the given /// SlotId. CORBA::Any *get_slot (PortableInterceptor::SlotId identifier - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); /// Set information in the slot table at the given SlotId. void set_slot (PortableInterceptor::SlotId identifier, const CORBA::Any & data - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp index 639ad627d58..7f5587703c4 100644 --- a/TAO/tao/PI/PICurrent_Loader.cpp +++ b/TAO/tao/PI/PICurrent_Loader.cpp @@ -32,7 +32,7 @@ TAO_PICurrent_Loader::create_object ( CORBA::ORB_ptr orb, int, ACE_TCHAR *[] - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = CORBA::Object::_nil (); diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h index a1b4e48cfa9..8b6e981c62c 100644 --- a/TAO/tao/PI/PICurrent_Loader.h +++ b/TAO/tao/PI/PICurrent_Loader.h @@ -41,7 +41,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp index c138481d1ee..efdf142fb7a 100644 --- a/TAO/tao/PI/PI_ORBInitializer.cpp +++ b/TAO/tao/PI/PI_ORBInitializer.cpp @@ -16,18 +16,14 @@ ACE_RCSID (tao, "$Id$") void -TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_NOT_USED) +TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_UNUSED_ARG (info); } void -TAO_PI_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { // The PI policy factory is stateless and reentrant, so share a @@ -42,22 +38,17 @@ TAO_PI_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; this->policy_factory_ = policy_factory; } - - this->register_policy_factories (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->register_policy_factories (info); } void TAO_PI_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) { // Register the PI policy factory. @@ -72,14 +63,12 @@ TAO_PI_ORBInitializer::register_policy_factories ( for (CORBA::PolicyType *i = type; i != end; ++i) { - ACE_TRY + try { info->register_policy_factory (*i, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->policy_factory_.in ()); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch ( ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -90,15 +79,13 @@ TAO_PI_ORBInitializer::register_policy_factories ( // ORBInitializer. return; } - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Rethrow any other exceptions... - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h index 92d62abfef6..f77777cafe6 100644 --- a/TAO/tao/PI/PI_ORBInitializer.h +++ b/TAO/tao/PI/PI_ORBInitializer.h @@ -50,11 +50,11 @@ public: //@{ void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -64,7 +64,7 @@ private: /// Register PortableInterceptor policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); + ); /// Instance of the PI policy factory. diff --git a/TAO/tao/PI/PI_PolicyFactory.cpp b/TAO/tao/PI/PI_PolicyFactory.cpp index 3f82ffff341..c314da293f4 100644 --- a/TAO/tao/PI/PI_PolicyFactory.cpp +++ b/TAO/tao/PI/PI_PolicyFactory.cpp @@ -15,7 +15,7 @@ CORBA::Policy_ptr TAO_PI_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { @@ -34,7 +34,6 @@ TAO_PI_PolicyFactory::create_policy ( TAO_ProcessingModePolicy (policy_value), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return processing_mode_policy; } diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h index eb7e4968015..17bd5d9bd0a 100644 --- a/TAO/tao/PI/PI_PolicyFactory.h +++ b/TAO/tao/PI/PI_PolicyFactory.h @@ -38,7 +38,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory public: CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp index 9c4ed43e4af..8fcaedadd74 100644 --- a/TAO/tao/PI/PolicyFactoryC.cpp +++ b/TAO/tao/PI/PolicyFactoryC.cpp @@ -89,7 +89,7 @@ PortableInterceptor::PolicyFactory::~PolicyFactory (void) PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow ( ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PolicyFactory::_duplicate ( @@ -100,7 +100,7 @@ PortableInterceptor::PolicyFactory::_narrow ( PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_unchecked_narrow ( ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PolicyFactory::_duplicate ( @@ -128,7 +128,7 @@ PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj) ::CORBA::Boolean PortableInterceptor::PolicyFactory::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -168,7 +168,7 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) // Hand-crafted. ::CORBA::Policy_ptr PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index 9737af6be89..6b1f0a47ecd 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -108,12 +108,12 @@ namespace PortableInterceptor static PolicyFactory_ptr _narrow ( ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PolicyFactory_ptr _unchecked_narrow ( ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PolicyFactory_ptr _nil (void) @@ -129,7 +129,7 @@ namespace PortableInterceptor virtual ::CORBA::Policy_ptr create_policy ( ::CORBA::PolicyType type, const ::CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( ::CORBA::SystemException, @@ -139,7 +139,7 @@ namespace PortableInterceptor // Hand-crafted addition. virtual ::CORBA::Policy_ptr _create_policy ( CORBA::PolicyType type - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -151,7 +151,7 @@ namespace PortableInterceptor virtual ::CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp index f91af3df5da..5b0b76860a8 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.cpp +++ b/TAO/tao/PI/PolicyFactory_Registry.cpp @@ -34,11 +34,11 @@ void TAO_PolicyFactory_Registry::register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - ACE_ENV_ARG_DECL) + ) { if (CORBA::is_nil (policy_factory)) { - ACE_THROW (CORBA::BAD_PARAM ( + throw ( ::CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -59,13 +59,13 @@ TAO_PolicyFactory_Registry::register_policy_factory ( if (result == 1) { // PolicyFactory of given type already exists. - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 16, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 16, CORBA::COMPLETED_NO)); } else { // Could not add PolicyFactory due to internal bind failures. - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } } } @@ -73,7 +73,7 @@ TAO_PolicyFactory_Registry::register_policy_factory ( CORBA::Policy_ptr TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type, const CORBA::Any &value - ACE_ENV_ARG_DECL) + ) { PortableInterceptor::PolicyFactory_ptr policy_factory = PortableInterceptor::PolicyFactory::_nil (); @@ -89,12 +89,12 @@ TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type, return policy_factory->create_policy (type, value - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Policy_ptr TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) { PortableInterceptor::PolicyFactory_ptr policy_factory = PortableInterceptor::PolicyFactory::_nil (); @@ -110,7 +110,7 @@ TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type } return policy_factory->_create_policy (type - ACE_ENV_ARG_PARAMETER); + ); } bool diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h index 882f386c70c..18ceb0a92d4 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.h +++ b/TAO/tao/PI/PolicyFactory_Registry.h @@ -71,18 +71,18 @@ public: void register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - ACE_ENV_ARG_DECL); + ); /// Construct a policy of the given type with the information /// contained in the CORBA::Any @a value. CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value - ACE_ENV_ARG_DECL); + ); /// Create an empty policy, usually to be filled in later by /// demarshaling. CORBA::Policy_ptr _create_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL); + ); /// Check if a @c PolicyFactory corresponding to the given type, /// exists. diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp index 9f2feccfe82..9530a0956c2 100644 --- a/TAO/tao/PI/ProcessingModePolicy.cpp +++ b/TAO/tao/PI/ProcessingModePolicy.cpp @@ -21,33 +21,32 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy } CORBA::Policy_ptr -TAO_ProcessingModePolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_ProcessingModePolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ProcessingModePolicy *copy = 0; ACE_NEW_THROW_EX (copy, TAO_ProcessingModePolicy (this->processing_mode_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void -TAO_ProcessingModePolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ProcessingModePolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } PortableInterceptor::ProcessingMode -TAO_ProcessingModePolicy::processing_mode (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ProcessingModePolicy::processing_mode (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return processing_mode_; } CORBA::PolicyType -TAO_ProcessingModePolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ProcessingModePolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE; diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h index fe2c82462bf..0b6fbebbcbb 100644 --- a/TAO/tao/PI/ProcessingModePolicy.h +++ b/TAO/tao/PI/ProcessingModePolicy.h @@ -47,16 +47,16 @@ public: TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode); virtual PortableInterceptor::ProcessingMode processing_mode - (ACE_ENV_SINGLE_ARG_DECL) + (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp index 65d42175dd2..e05c080d831 100644 --- a/TAO/tao/PI/RequestInfo_Util.cpp +++ b/TAO/tao/PI/RequestInfo_Util.cpp @@ -19,7 +19,7 @@ ACE_RCSID (tao, TAO_BEGIN_VERSIONED_NAMESPACE_DECL Dynamic::ParameterList * -TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL) +TAO_RequestInfo_Util::make_parameter_list (void) { Dynamic::ParameterList *parameter_list = 0; ACE_NEW_THROW_EX (parameter_list, @@ -36,7 +36,7 @@ TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL) +TAO_RequestInfo_Util::make_exception_list (void) { Dynamic::ExceptionList *exception_list = 0; ACE_NEW_THROW_EX (exception_list, @@ -53,7 +53,7 @@ TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL) } Dynamic::ContextList * -TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL) +TAO_RequestInfo_Util::make_context_list (void) { Dynamic::ContextList *context_list = 0; ACE_NEW_THROW_EX (context_list, @@ -70,7 +70,7 @@ TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL) } Dynamic::RequestContext * -TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL) +TAO_RequestInfo_Util::make_request_context (void) { Dynamic::RequestContext *request_context = 0; ACE_NEW_THROW_EX (request_context, @@ -88,7 +88,7 @@ TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL) CORBA::Any * TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any - ACE_ENV_ARG_DECL) + ) { CORBA::Any *any = 0; ACE_NEW_THROW_EX (any, @@ -98,7 +98,6 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (any); if (tk_void_any) { diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h index 4d18f4d2309..240984f3b02 100644 --- a/TAO/tao/PI/RequestInfo_Util.h +++ b/TAO/tao/PI/RequestInfo_Util.h @@ -34,7 +34,6 @@ namespace CORBA { class StringSeq; class Any; - class Environment; } namespace Dynamic @@ -66,19 +65,19 @@ public: */ //@{ static Dynamic::ParameterList * make_parameter_list ( - ACE_ENV_SINGLE_ARG_DECL); + void); static Dynamic::ExceptionList * make_exception_list ( - ACE_ENV_SINGLE_ARG_DECL); + void); static Dynamic::ContextList * make_context_list ( - ACE_ENV_SINGLE_ARG_DECL); + void); static Dynamic::RequestContext * make_request_context ( - ACE_ENV_SINGLE_ARG_DECL); + void); static CORBA::Any * make_any (CORBA::Boolean tk_void_any - ACE_ENV_ARG_DECL); + ); //@} }; diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index abc2da4613c..46f8afebce5 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -38,8 +38,7 @@ TAO_PI_Server_Loader::init (int, initialized = true; // Register the ORB initializer. - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { /// Register the Messaging ORBInitializer. PortableInterceptor::ORBInitializer_ptr temp_orb_initializer = @@ -52,23 +51,19 @@ TAO_PI_Server_Loader::init (int, TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; PortableInterceptor::ORBInitializer_var orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:"); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h index 6b4784fb607..0a38c59d9e4 100644 --- a/TAO/tao/PI_Server/Policy_Creator_T.h +++ b/TAO/tao/PI_Server/Policy_Creator_T.h @@ -32,7 +32,7 @@ namespace TAO POLICYTYPE *& policy, POLICYVALUE &value, const CORBA::Any& val - ACE_ENV_ARG_DECL) + ) { if ((val >>= value) == 0) ACE_THROW (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE)); @@ -41,7 +41,6 @@ namespace TAO POLICYTYPE (value), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK; } } } diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp index 301ea9d90b5..795a3b3f768 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp @@ -17,27 +17,23 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_PortableServer_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_PortableServer_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_PortableServer_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) { #if !defined (CORBA_E_MICRO) // Register the PortableServer policy factories. @@ -49,7 +45,6 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::PolicyFactory_var policy_factory = tmp; @@ -75,14 +70,13 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( i != end; ++i) { - ACE_TRY + try { info->register_policy_factory (*i, policy_factory.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch ( ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -93,15 +87,13 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( // ORBInitializer. return; } - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Rethrow any other exceptions... - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } #else ACE_UNUSED_ARG (info); diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h index 8aba0600ea2..0227fa0d23b 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h @@ -42,11 +42,11 @@ public: //@{ void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -55,7 +55,7 @@ private: /// Register PortableServer policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp index eaa42cf7ff5..7b337421ed3 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp @@ -21,7 +21,7 @@ CORBA::Policy_ptr TAO_PortableServer_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { @@ -33,8 +33,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::ThreadPolicy *thread_policy = 0; PortableServer::ThreadPolicyValue thr_value; - TAO::Portable_Server::create_policy (thread_policy, thr_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (thread_policy, thr_value, value); return thread_policy; } @@ -45,8 +44,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::LifespanPolicy *lifespan_policy = 0; PortableServer::LifespanPolicyValue lifespan_value; - TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value); return lifespan_policy; } @@ -56,8 +54,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::IdUniquenessPolicy *id_uniqueness_policy = 0; PortableServer::IdUniquenessPolicyValue id_uniqueness_value; - TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value); return id_uniqueness_policy; } @@ -67,8 +64,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::IdAssignmentPolicy *id_assignment_policy = 0; PortableServer::IdAssignmentPolicyValue id_assignment_value; - TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value); return id_assignment_policy; } @@ -80,8 +76,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::ImplicitActivationPolicy *implicit_activatation_policy = 0; PortableServer::ImplicitActivationPolicyValue implicit_activation_value; - TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value); return implicit_activatation_policy; } @@ -91,8 +86,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::ServantRetentionPolicy *servant_retention_policy = 0; PortableServer::ServantRetentionPolicyValue servant_retention_value; - TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value); return servant_retention_policy; } @@ -102,8 +96,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::RequestProcessingPolicy *request_processing_policy = 0; PortableServer::RequestProcessingPolicyValue request_processing_value; - TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value); return request_processing_policy; } diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h index 1a0c06ff21a..f6c07dfca62 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h @@ -33,7 +33,7 @@ class TAO_PortableServer_PolicyFactory public: CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp index 7a7714e00c7..eb4e2ef455f 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp @@ -34,12 +34,12 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions, CORBA::OctetSeq_out oc - ACE_ENV_ARG_DECL) + ) { // This method implements one of the "starting" server side // interception point. - ACE_TRY + try { oc = 0; @@ -61,8 +61,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( registered.interceptor_-> tao_ft_interception_point (&request_info, oc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } if (oc != 0) @@ -73,8 +72,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return; } @@ -84,7 +82,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( ++server_request.interceptor_count (); } } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + catch ( ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -94,11 +92,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_ENDTRY; - ACE_CHECK; } void @@ -109,7 +104,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) + ) { // This method implements one of the "intermediate" server side // interception point. @@ -124,10 +119,10 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( // evaluates to "true," then it is likely that a starting // interception point was never invoked. This is of course, an // internal error that must be corrected. - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } - ACE_TRY + try { // Copy the request scope current (RSC) to the thread scope // current (TSC) upon leaving this scope, i.e. just after the @@ -153,12 +148,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( { registered.interceptor_-> receive_request_service_contexts (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + catch ( ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -168,11 +162,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_ENDTRY; - ACE_CHECK; } #elif TAO_HAS_EXTENDED_FT_INTERCEPTORS == 0 @@ -188,12 +179,12 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) + ) { // This method implements one of the "starting" server side // interception point if extended interceptors are not in place. - ACE_TRY + try { // Copy the request scope current (RSC) to the thread scope // current (TSC) upon leaving this scope, i.e. just after the @@ -220,8 +211,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( { registered.interceptor_-> receive_request_service_contexts (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } // The starting interception point completed successfully. @@ -229,7 +219,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( ++server_request.interceptor_count (); } } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + catch ( ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -239,11 +229,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_ENDTRY; - ACE_CHECK; } #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/ @@ -256,7 +243,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) + ) { // This method implements an "intermediate" server side interception // point. Interceptors are invoked in the same order they were @@ -272,7 +259,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( // evaluates to "true," then it is likely that a starting // interception point was never invoked. This is of course, an // internal error that must be corrected. - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } TAO::ServerRequestInfo request_info (server_request, @@ -282,7 +269,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( exceptions, nexceptions); - ACE_TRY + try { bool is_remote_request = !server_request.collocated (); @@ -295,8 +282,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( { registered.interceptor_-> receive_request (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } // Note that no interceptors are pushed on to or popped off @@ -304,7 +290,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( // an intermediate interception point. } } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + catch ( ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -314,11 +300,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_ENDTRY; - ACE_CHECK; } @@ -330,7 +313,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply ( void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) + ) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -366,8 +349,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply ( { registered.interceptor_-> send_reply (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } @@ -384,7 +366,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) + ) { // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. @@ -402,7 +384,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( exceptions, nexceptions); - ACE_TRY + try { // Unwind the flow stack. size_t const len = server_request.interceptor_count (); @@ -422,12 +404,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( { registered.interceptor_-> send_exception (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + catch ( ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -437,10 +418,9 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // The send_exception() interception point in the remaining // interceptors must be called so call this method (not the @@ -460,8 +440,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); PortableInterceptor::ReplyStatus status = server_request.reply_status (); @@ -471,10 +450,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( // LOCATION_FORWARD). if (status == PortableInterceptor::SYSTEM_EXCEPTION || status == PortableInterceptor::USER_EXCEPTION) - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } void @@ -485,7 +462,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) + ) { // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. @@ -503,7 +480,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( // they were pushed onto the stack since this is an "ending" server // side interception point. - ACE_TRY + try { // Unwind the flow stack. size_t const len = server_request.interceptor_count (); @@ -523,12 +500,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( { registered.interceptor_-> send_other (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + catch ( ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -538,37 +514,34 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_ENDTRY; - ACE_CHECK; } void TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) + ) { - this->interceptor_list_.add_interceptor (interceptor ACE_ENV_ARG_PARAMETER); + this->interceptor_list_.add_interceptor (interceptor); } void TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) + ) { this->interceptor_list_.add_interceptor (interceptor, policies - ACE_ENV_ARG_PARAMETER); + ); } void TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors ( - ACE_ENV_SINGLE_ARG_DECL) + void) { - this->interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER); + this->interceptor_list_.destroy_interceptors (); } TAO::PICurrent_Impl * @@ -592,14 +565,13 @@ void TAO::ServerRequestInterceptor_Adapter_Impl::execute_command ( TAO_ServerRequest & server_request, TAO::Upcall_Command & command - ACE_ENV_ARG_DECL) + ) { TAO::PICurrent_Guard const pi_guard (server_request, true /* Copy TSC to RSC */); // The actual upcall. - command.execute (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + command.execute (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index cd2930965f1..d9d403925c7 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -93,7 +93,7 @@ namespace TAO CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions, CORBA::OctetSeq_out oc - ACE_ENV_ARG_DECL); + ); #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/ /// This method implements the "intermediate" server side @@ -110,7 +110,7 @@ namespace TAO void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL); + ); /// This method an "intermediate" server side interception point. void receive_request ( @@ -120,7 +120,7 @@ namespace TAO void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL); + ); /// This method implements one of the "ending" server side /// interception points. @@ -131,7 +131,7 @@ namespace TAO void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL); + ); /// This method implements one of the "ending" server side /// interception points. @@ -142,7 +142,7 @@ namespace TAO void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL); + ); /// This method implements one of the "ending" server side /// interception points. @@ -153,20 +153,20 @@ namespace TAO void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions - ACE_ENV_ARG_DECL); + ); //@} /// Register an interceptor. virtual void add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL); + ); virtual void add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + ); - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); + virtual void destroy_interceptors (void); virtual TAO::PICurrent_Impl *allocate_pi_current (void); @@ -176,7 +176,7 @@ namespace TAO virtual void execute_command ( TAO_ServerRequest &server_request, TAO::Upcall_Command &command - ACE_ENV_ARG_DECL); + ); private: diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp index c06a9429d1d..166da908552 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.cpp +++ b/TAO/tao/PI_Server/ServerRequestDetails.cpp @@ -17,7 +17,7 @@ namespace TAO void ServerRequestDetails::apply_policies ( const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) + ) { // Flag to check for duplicate ProcessingModePolicy objects in the list. bool processing_mode_applied = false; @@ -36,8 +36,7 @@ namespace TAO // Obtain the PolicyType from the current Policy object. const CORBA::PolicyType policy_type = - policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy->policy_type (); if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE) { @@ -45,7 +44,7 @@ namespace TAO { // This is the second time we have run into this policy type, // and that is not allowed. - ACE_THROW (CORBA::INV_POLICY ()); + throw ( ::CORBA::INV_POLICY ()); } // Flip the flag to true in order to trap any dupes. @@ -55,18 +54,16 @@ namespace TAO PortableInterceptor::ProcessingModePolicy_var pm_policy = PortableInterceptor::ProcessingModePolicy::_narrow ( policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Save the value of the ProcessingModePolicy in our data member. this->processing_mode_ = - pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + pm_policy->processing_mode (); } else { // We don't support the current policy type. - ACE_THROW (CORBA::INV_POLICY ()); + throw ( ::CORBA::INV_POLICY ()); } } } diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h index fc34a6a66f5..e513b153961 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.h +++ b/TAO/tao/PI_Server/ServerRequestDetails.h @@ -54,7 +54,7 @@ namespace TAO ServerRequestDetails (void); void apply_policies (const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + ); /// Returns true if the ProcessingMode setting permits the "firing" /// of the associated server request interceptor based upon the diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index 65695dc5317..d686d43b5e0 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -32,7 +32,7 @@ ACE_RCSID (PI_Server, TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ULong -TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::ServerRequestInfo::request_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // The request ID returned by this method need not correspond to the @@ -71,14 +71,14 @@ TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO::ServerRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::ServerRequestInfo::operation (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->server_request_.operation ()); } Dynamic::ParameterList * -TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::arguments (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->args_ == 0) @@ -90,8 +90,7 @@ TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) // Generate the argument list on demand. Dynamic::ParameterList * const parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_RequestInfo_Util::make_parameter_list (); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -120,7 +119,7 @@ TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::exceptions (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->args_ == 0) @@ -132,8 +131,7 @@ TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL) // Generate the exception list on demand. Dynamic::ExceptionList * const exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_RequestInfo_Util::make_exception_list (); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -154,7 +152,7 @@ TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL) } Dynamic::ContextList * -TAO::ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::contexts (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, @@ -163,7 +161,7 @@ TAO::ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL) } Dynamic::RequestContext * -TAO::ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::operation_context (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, @@ -172,7 +170,7 @@ TAO::ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Any * -TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::result (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->args_ == 0) @@ -188,8 +186,7 @@ TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL) CORBA::Any * result_any = TAO_RequestInfo_Util::make_any (tk_void_any - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::Any_var safe_result_any = result_any; @@ -202,14 +199,14 @@ TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Boolean -TAO::ServerRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::ServerRequestInfo::response_expected (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->server_request_.response_expected (); } Messaging::SyncScope -TAO::ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::sync_scope (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.sync_with_server ()) @@ -221,7 +218,7 @@ TAO::ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL) } PortableInterceptor::ReplyStatus -TAO::ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::reply_status (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.reply_status () == -1) @@ -234,7 +231,7 @@ TAO::ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Object_ptr -TAO::ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::forward_reference (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.reply_status () != PortableInterceptor::LOCATION_FORWARD) @@ -249,7 +246,7 @@ TAO::ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL) CORBA::Any * TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -264,20 +261,19 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id if (pi_current == 0) ACE_THROW_RETURN (CORBA::INTERNAL (), 0); - pi_current->check_validity (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + pi_current->check_validity (id); // Retrieve the request scope PICurrent object. TAO::PICurrent_Impl *rsc = this->server_request_.rs_pi_current (); - return rsc->get_slot (id ACE_ENV_ARG_PARAMETER); + return rsc->get_slot (id); } IOP::ServiceContext * TAO::ServerRequestInfo::get_request_service_context ( IOP::ServiceId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Service_Context &service_context_list = @@ -285,13 +281,13 @@ TAO::ServerRequestInfo::get_request_service_context ( return this->get_service_context_i (service_context_list, id - ACE_ENV_ARG_PARAMETER); + ); } IOP::ServiceContext * TAO::ServerRequestInfo::get_reply_service_context ( IOP::ServiceId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Service_Context & service_context_list = @@ -299,14 +295,14 @@ TAO::ServerRequestInfo::get_reply_service_context ( return this->get_service_context_i (service_context_list, id - ACE_ENV_ARG_PARAMETER); + ); } IOP::ServiceContext * TAO::ServerRequestInfo::get_service_context_i ( TAO_Service_Context & service_context_list, IOP::ServiceId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceContext_var service_context; @@ -329,7 +325,7 @@ TAO::ServerRequestInfo::get_service_context_i ( // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::sending_exception (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.reply_status () != PortableInterceptor::SYSTEM_EXCEPTION @@ -353,7 +349,6 @@ TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); CORBA::Any_var caught_exception_var = temp; @@ -364,7 +359,7 @@ TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL) } char * -TAO::ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::server_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) @@ -378,7 +373,7 @@ TAO::ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL) } char * -TAO::ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::orb_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) @@ -391,7 +386,7 @@ TAO::ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL) } PortableInterceptor::AdapterName * -TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::adapter_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // The adapter_name attribute defines a name for the object adapter @@ -402,7 +397,7 @@ TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL) if (this->servant_upcall_ != 0) return this->servant_upcall_->poa ().adapter_name ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), @@ -410,7 +405,7 @@ TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL) } PortableInterceptor::ObjectId * -TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::object_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) @@ -427,7 +422,6 @@ TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); PortableInterceptor::ObjectId_var obj_id = tmp; @@ -453,11 +447,11 @@ TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL) } CORBA::OctetSeq * -TAO::ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL) +TAO::ServerRequestInfo::adapter_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) - return this->servant_upcall_->poa ().id (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->servant_upcall_->poa ().id (); ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), @@ -466,7 +460,7 @@ TAO::ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL) char * TAO::ServerRequestInfo::target_most_derived_interface ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::Servant const servant = @@ -486,14 +480,13 @@ TAO::ServerRequestInfo::target_most_derived_interface ( CORBA::Policy_ptr TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) { CORBA::Policy_var policy = - this->servant_upcall_->poa ().get_policy (type ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->servant_upcall_->poa ().get_policy (type); if (!CORBA::is_nil (policy.in ())) { @@ -519,7 +512,7 @@ TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type void TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, const CORBA::Any &data - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -532,21 +525,19 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, dynamic_cast <TAO::PICurrent*> (pi_current_obj); if (pi_current == 0) - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); - pi_current->check_validity (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + pi_current->check_validity (id); // Retrieve the "request scope current" (RSC). TAO::PICurrent_Impl * rsc = this->server_request_.rs_pi_current (); - rsc->set_slot (id, data ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + rsc->set_slot (id, data); } CORBA::Boolean TAO::ServerRequestInfo::target_is_a (const char * id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Implemented in the generated skeleton. @@ -565,14 +556,14 @@ TAO::ServerRequestInfo::target_is_a (const char * id } return servant->_is_a (id - ACE_ENV_ARG_PARAMETER); + ); } void TAO::ServerRequestInfo::add_reply_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the service context from the list @@ -581,7 +572,7 @@ TAO::ServerRequestInfo::add_reply_service_context ( if (service_context_list.set_context (service_context, replace) == 0) { - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO)); } } diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index 1ba2e9c0026..c19c6893f6f 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -83,49 +83,49 @@ namespace TAO /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. - virtual CORBA::ULong request_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::ULong request_id (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the operation name for the current request. - virtual char * operation (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * operation (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of arguments passed to the current operation. virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of exceptions the current operation is capable /// of throwing. virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ContextList * contexts ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::RequestContext * operation_context ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the result of the current request. If there is no /// return value then an @c Any with @c tk_void @c TypeCode is /// returned. This method is not valid for oneway operations. virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns @c true for a two-way operation, and @c false otherwise. virtual CORBA::Boolean response_expected ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the @c sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// @c CORBA::BAD_INV_ORDER exception is thrown. virtual Messaging::SyncScope sync_scope ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the reply status for the current request. @@ -135,20 +135,20 @@ namespace TAO * @c TRANSPORT_RETRY, @c UNKNOWN.. */ virtual PortableInterceptor::ReplyStatus reply_status ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// If the reply status is /// @c PortableInterceptor::LOCATION_FORWARD return the /// object reference to which the request was forwarded. virtual CORBA::Object_ptr forward_reference ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)) ; /// Retrieve data from the "request scope" @c PICurrent object. virtual CORBA::Any * get_slot ( PortableInterceptor::SlotId id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); @@ -156,14 +156,14 @@ namespace TAO /// @c IOP::ServiceId from the request service context list. virtual IOP::ServiceContext * get_request_service_context ( IOP::ServiceId id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the @c IOP::ServiceContext with the given /// @c IOP::ServiceId from the reply service context list. virtual IOP::ServiceContext * get_reply_service_context ( IOP::ServiceId id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return an @c Any containing the exception being sent, if any. @@ -173,59 +173,59 @@ namespace TAO * @c Any. */ virtual CORBA::Any * sending_exception ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the @c ObjectId for the target object. virtual PortableInterceptor::ObjectId * object_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the @c AdapterId for the POA handling the current /// request. virtual CORBA::OctetSeq * adapter_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the server_id of the server. The value is passed to /// the ORB via @c -ORBServerId parameter. - virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * server_id (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the ORBId value that is passed to the @c ORB_init /// call. - virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * orb_id (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the name of the object adapter that services requests /// for the invoked object. virtual PortableInterceptor::AdapterName * adapter_name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the most derived interface of the target object. virtual char * target_most_derived_interface ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the policy of the given type in effect for the current /// request. virtual CORBA::Policy_ptr get_server_policy ( CORBA::PolicyType type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Insert data into the "request scope" @c PICurrent object. virtual void set_slot (PortableInterceptor::SlotId id, const CORBA::Any & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); /// Returns true if the target's type corresponds to the given /// @c RepositoryId. virtual CORBA::Boolean target_is_a (const char * id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the @c IOP::ServiceContext to the reply (outgoing) @@ -233,7 +233,7 @@ namespace TAO virtual void add_reply_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); public: @@ -270,7 +270,7 @@ namespace TAO IOP::ServiceContext * get_service_context_i ( TAO_Service_Context & service_context_list, IOP::ServiceId id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp index 6b2190b9629..49e43634e81 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp @@ -90,7 +90,7 @@ PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow ( ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ServerRequestInterceptor::_duplicate ( @@ -101,7 +101,7 @@ PortableInterceptor::ServerRequestInterceptor::_narrow ( PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow ( ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ServerRequestInterceptor::_duplicate ( @@ -129,7 +129,7 @@ PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterc ::CORBA::Boolean PortableInterceptor::ServerRequestInterceptor::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index ec784b9d706..0414e800f56 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -130,12 +130,12 @@ namespace PortableInterceptor static ServerRequestInterceptor_ptr _narrow ( ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerRequestInterceptor_ptr _unchecked_narrow ( ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerRequestInterceptor_ptr _nil (void) @@ -153,7 +153,7 @@ namespace PortableInterceptor virtual void tao_ft_interception_point ( ::PortableInterceptor::ServerRequestInfo_ptr ri, ::CORBA::OctetSeq_out os - ACE_ENV_ARG_DECL_NOT_USED + ) ACE_THROW_SPEC (( ::CORBA::SystemException, @@ -167,7 +167,7 @@ namespace PortableInterceptor virtual void receive_request_service_contexts ( ::PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( ::CORBA::SystemException, @@ -179,7 +179,7 @@ namespace PortableInterceptor virtual void receive_request ( ::PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( ::CORBA::SystemException, @@ -191,7 +191,7 @@ namespace PortableInterceptor virtual void send_reply ( ::PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -202,7 +202,7 @@ namespace PortableInterceptor virtual void send_exception ( ::PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( ::CORBA::SystemException, @@ -214,7 +214,7 @@ namespace PortableInterceptor virtual void send_other ( ::PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( ::CORBA::SystemException, @@ -226,7 +226,7 @@ namespace PortableInterceptor virtual ::CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index e51f5208e3d..84528418d76 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -167,7 +167,7 @@ void CORBA::PolicyError::_raise (void) const void CORBA::PolicyError::_tao_encode ( TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL + ) const { if (cdr << *this) @@ -175,12 +175,12 @@ void CORBA::PolicyError::_tao_encode ( return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::PolicyError::_tao_decode ( TAO_InputCDR &cdr - ACE_ENV_ARG_DECL + ) { if (cdr >> *this) @@ -188,7 +188,7 @@ void CORBA::PolicyError::_tao_decode ( return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } @@ -303,7 +303,7 @@ void CORBA::InvalidPolicies::_raise (void) const void CORBA::InvalidPolicies::_tao_encode ( TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL + ) const { if (cdr << *this) @@ -311,12 +311,12 @@ void CORBA::InvalidPolicies::_tao_encode ( return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::InvalidPolicies::_tao_decode ( TAO_InputCDR &cdr - ACE_ENV_ARG_DECL + ) { if (cdr >> *this) @@ -324,7 +324,7 @@ void CORBA::InvalidPolicies::_tao_decode ( return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } @@ -408,7 +408,7 @@ TAO::Collocation_Proxy_Broker * // be\be_visitor_operation/operation_cs.cpp:78 CORBA::PolicyType CORBA::Policy::policy_type ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -440,8 +440,7 @@ CORBA::PolicyType CORBA::Policy::policy_type ( this->the_TAO_Policy_Proxy_Broker_ ); - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval.excp ()); + _tao_call.invoke (0, 0); return _tao_retval.retn (); } @@ -450,7 +449,7 @@ CORBA::PolicyType CORBA::Policy::policy_type ( // be\be_visitor_operation/operation_cs.cpp:78 ::CORBA::Policy_ptr CORBA::Policy::copy ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -482,8 +481,7 @@ CORBA::PolicyType CORBA::Policy::policy_type ( this->the_TAO_Policy_Proxy_Broker_ ); - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval.excp ()); + _tao_call.invoke (0, 0); return _tao_retval.retn (); } @@ -492,7 +490,7 @@ CORBA::PolicyType CORBA::Policy::policy_type ( // be\be_visitor_operation/operation_cs.cpp:78 void CORBA::Policy::destroy ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -524,8 +522,7 @@ void CORBA::Policy::destroy ( this->the_TAO_Policy_Proxy_Broker_ ); - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + _tao_call.invoke (0, 0); } CORBA::Policy::Policy (void) @@ -558,7 +555,7 @@ CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer) CORBA::Policy_ptr CORBA::Policy::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL + ) { return @@ -566,14 +563,14 @@ CORBA::Policy::_narrow ( _tao_objref, "IDL:omg.org/CORBA/Policy:1.0", CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer - ACE_ENV_ARG_PARAMETER + ); } CORBA::Policy_ptr CORBA::Policy::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL + ) { return @@ -581,7 +578,7 @@ CORBA::Policy::_unchecked_narrow ( _tao_objref, "IDL:omg.org/CORBA/Policy:1.0", CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer - ACE_ENV_ARG_PARAMETER + ); } @@ -605,7 +602,7 @@ CORBA::Policy::_tao_release (Policy_ptr obj) CORBA::Boolean CORBA::Policy::_is_a ( const char *value - ACE_ENV_ARG_DECL + ) { if ( @@ -625,7 +622,7 @@ CORBA::Policy::_is_a ( { return this->::CORBA::Object::_is_a ( value - ACE_ENV_ARG_PARAMETER + ); } } @@ -694,7 +691,7 @@ CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer) CORBA::PolicyManager_ptr CORBA::PolicyManager::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PolicyManager::_duplicate ( @@ -705,7 +702,7 @@ CORBA::PolicyManager::_narrow ( CORBA::PolicyManager_ptr CORBA::PolicyManager::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PolicyManager::_duplicate ( @@ -733,7 +730,7 @@ CORBA::PolicyManager::_tao_release (PolicyManager_ptr obj) CORBA::Boolean CORBA::PolicyManager::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -823,7 +820,7 @@ CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer) CORBA::PolicyCurrent_ptr CORBA::PolicyCurrent::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PolicyCurrent::_duplicate ( @@ -834,7 +831,7 @@ CORBA::PolicyCurrent::_narrow ( CORBA::PolicyCurrent_ptr CORBA::PolicyCurrent::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PolicyCurrent::_duplicate ( @@ -862,7 +859,7 @@ CORBA::PolicyCurrent::_tao_release (PolicyCurrent_ptr obj) CORBA::Boolean CORBA::PolicyCurrent::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 633fb0db338..829c4027622 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -143,12 +143,12 @@ namespace CORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL + ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL + ); // TAO_IDL - Generated from @@ -196,12 +196,12 @@ namespace CORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL + ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL + ); // TAO_IDL - Generated from @@ -264,12 +264,12 @@ namespace CORBA static Policy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Policy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Policy_ptr _nil (void) @@ -283,7 +283,7 @@ namespace CORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::PolicyType policy_type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -293,7 +293,7 @@ namespace CORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -303,7 +303,7 @@ namespace CORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -314,7 +314,7 @@ namespace CORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -407,12 +407,12 @@ namespace CORBA static PolicyManager_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PolicyManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PolicyManager_ptr _nil (void) @@ -427,7 +427,7 @@ namespace CORBA virtual ::CORBA::PolicyList * get_policy_overrides ( const ::CORBA::PolicyTypeSeq & ts - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -439,7 +439,7 @@ namespace CORBA virtual void set_policy_overrides ( const ::CORBA::PolicyList & policies, ::CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -451,7 +451,7 @@ namespace CORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -516,12 +516,12 @@ namespace CORBA static PolicyCurrent_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PolicyCurrent_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PolicyCurrent_ptr _nil (void) @@ -536,7 +536,7 @@ namespace CORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h index 16746514518..01620c2d43d 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.h +++ b/TAO/tao/PolicyFactory_Registry_Adapter.h @@ -37,8 +37,6 @@ namespace CORBA typedef Policy *Policy_ptr; class Any; - - class Environment; } namespace PortableInterceptor @@ -68,18 +66,18 @@ namespace TAO virtual void register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Construct a policy of the given type with the information /// contained in the CORBA::Any @a value. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Create an empty policy, usually to be filled in later by /// demarshaling. virtual CORBA::Policy_ptr _create_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Check if a @c PolicyFactory corresponding to the given type, /// exists. diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp index 14cb7c89456..f538b416258 100644 --- a/TAO/tao/Policy_Current.cpp +++ b/TAO/tao/Policy_Current.cpp @@ -37,45 +37,45 @@ TAO_Policy_Current::implementation (void) const CORBA::Policy_ptr TAO_Policy_Current::get_policy ( CORBA::PolicyType policy - ACE_ENV_ARG_DECL) + ) { TAO_Policy_Current_Impl &impl = this->implementation (); - return impl.get_policy (policy ACE_ENV_ARG_PARAMETER); + return impl.get_policy (policy); } CORBA::PolicyList * TAO_Policy_Current::get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Policy_Current_Impl &impl = this->implementation (); - return impl.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER); + return impl.get_policy_overrides (ts); } void TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::InvalidPolicies)) { TAO_Policy_Current_Impl &impl = this->implementation (); - impl.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER); + impl.set_policy_overrides (policies, set_add); } CORBA::Policy_ptr TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL) + ) { TAO_Policy_Current_Impl &impl = this->implementation (); return impl.get_cached_policy (type - ACE_ENV_ARG_PARAMETER); + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h index 889c1971d24..62bbd4e456b 100644 --- a/TAO/tao/Policy_Current.h +++ b/TAO/tao/Policy_Current.h @@ -50,24 +50,24 @@ public: /// Obtain a single policy. CORBA::Policy_ptr get_policy ( CORBA::PolicyType policy - ACE_ENV_ARG_DECL); + ); /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + ); // = The CORBA::PolicyManager operations virtual CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::InvalidPolicies)); diff --git a/TAO/tao/Policy_Current_Impl.cpp b/TAO/tao/Policy_Current_Impl.cpp index 9600341a74f..d5c986a4f41 100644 --- a/TAO/tao/Policy_Current_Impl.cpp +++ b/TAO/tao/Policy_Current_Impl.cpp @@ -19,22 +19,22 @@ void TAO_Policy_Current_Impl::set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL + ) { this->manager_impl_.set_policy_overrides (policies, set_add - ACE_ENV_ARG_PARAMETER); + ); } CORBA::PolicyList * TAO_Policy_Current_Impl::get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - ACE_ENV_ARG_DECL + ) { return this->manager_impl_.get_policy_overrides (ts - ACE_ENV_ARG_PARAMETER); + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h index f5a2c15fca1..7be08d5dc8e 100644 --- a/TAO/tao/Policy_Current_Impl.h +++ b/TAO/tao/Policy_Current_Impl.h @@ -48,21 +48,21 @@ public: /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - ACE_ENV_ARG_DECL); + ); /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + ); // = The CORBA::PolicyManager operations CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); void set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); private: /// The implementation. diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl index c7cc06d9743..0c9a9536e8b 100644 --- a/TAO/tao/Policy_Current_Impl.inl +++ b/TAO/tao/Policy_Current_Impl.inl @@ -13,17 +13,17 @@ TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void) ACE_INLINE CORBA::Policy_ptr TAO_Policy_Current_Impl::get_policy ( CORBA::PolicyType policy - ACE_ENV_ARG_DECL) + ) { - return this->manager_impl_.get_policy (policy ACE_ENV_ARG_PARAMETER); + return this->manager_impl_.get_policy (policy); } ACE_INLINE CORBA::Policy_ptr TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL) + ) { return this->manager_impl_.get_cached_policy (type - ACE_ENV_ARG_PARAMETER); + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index a46a6a948a6..750dcbaa7e9 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -17,22 +17,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::PolicyList * TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); - return this->impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER); + return this->impl_.get_policy_overrides (ts); } void TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::InvalidPolicies)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); - this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER); + this->impl_.set_policy_overrides (policies, set_add); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 38b5b11d152..b3297a727d3 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -48,23 +48,23 @@ public: /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - ACE_ENV_ARG_DECL); + ); /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + ); // = The CORBA::PolicyManager operations virtual CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::InvalidPolicies)); diff --git a/TAO/tao/Policy_Manager.inl b/TAO/tao/Policy_Manager.inl index b982fad4f14..4d61f6110da 100644 --- a/TAO/tao/Policy_Manager.inl +++ b/TAO/tao/Policy_Manager.inl @@ -13,15 +13,15 @@ TAO_Policy_Manager::TAO_Policy_Manager (void) ACE_INLINE CORBA::Policy_ptr TAO_Policy_Manager::get_policy ( CORBA::PolicyType policy - ACE_ENV_ARG_DECL) + ) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); - return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER); + return this->impl_.get_policy (policy); } ACE_INLINE CORBA::Policy_ptr TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL) + ) { // @@ Previous code used a "double-checked locking hack" to check @@ -32,7 +32,7 @@ TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.get_cached_policy (type - ACE_ENV_ARG_PARAMETER); + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index 5b0eda9ad12..bbbba6d016c 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -1,7 +1,6 @@ // $Id$ #include "tao/Policy_Set.h" -#include "tao/Environment.h" #include "tao/SystemException.h" #include "tao/debug.h" @@ -26,17 +25,14 @@ TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope) TAO_Policy_Set::~TAO_Policy_Set (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cleanup_i (); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Ignore exceptions... } - ACE_ENDTRY; } TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) @@ -51,7 +47,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) // Copy over the policy list. this->policy_list_.length (rhs.policy_list_.length ()); - ACE_TRY_NEW_ENV + try { for (CORBA::ULong i = 0; i < rhs.policy_list_.length (); ++i) { @@ -63,8 +59,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) } CORBA::Policy_var copy = - policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy->copy (); // Add the "cacheable" policies into the cache. if (copy->_tao_cached_type () != TAO_CACHED_POLICY_UNCACHED) @@ -76,31 +71,28 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) this->policy_list_[i] = copy._retn (); } - ACE_TRY_CHECK; } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 4) - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, "TAO_Policy_Set::TAO_Policy_Set"); // "Try" to make this recoverable as we must have run out of memory. this->policy_list_.length (0); } - ACE_ENDTRY; } void TAO_Policy_Set::copy_from (TAO_Policy_Set *source - ACE_ENV_ARG_DECL) + ) { if (source == 0) { return; } - this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->cleanup_i (); for (CORBA::ULong i = 0; i < source->policy_list_.length (); ++i) { @@ -113,12 +105,11 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source if (! this->compatible_scope (policy->_tao_scope())) { - ACE_THROW (CORBA::NO_PERMISSION ()); + throw ( ::CORBA::NO_PERMISSION ()); } CORBA::Policy_var copy = - policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy->copy (); CORBA::ULong const length = this->policy_list_.length (); this->policy_list_.length (length + 1); @@ -134,14 +125,13 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source } void -TAO_Policy_Set::cleanup_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Policy_Set::cleanup_i (void) { const CORBA::ULong len = this->policy_list_.length (); // Cleanup the policy list. for (CORBA::ULong i = 0; i < len; ++i) { - this->policy_list_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->policy_list_[i]->destroy (); this->policy_list_[i] = CORBA::Policy::_nil (); } @@ -158,18 +148,17 @@ TAO_Policy_Set::cleanup_i (ACE_ENV_SINGLE_ARG_DECL) void TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL) + ) { // @@ The spec does not say what to do on this case. if (set_add != CORBA::SET_OVERRIDE && set_add != CORBA::ADD_OVERRIDE) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); } if (set_add == CORBA::SET_OVERRIDE) { - this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->cleanup_i (); } // Flag, indicating whether we have already overridden @@ -188,8 +177,7 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies, } const CORBA::PolicyType policy_type = - policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy->policy_type (); if (policy_type == TAO_RT_SERVER_PROTOCOL_POLICY_TYPE) { @@ -201,32 +189,29 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies, // responsibility of the user to return it to consistent state. if (server_protocol_set) { - ACE_THROW (CORBA::INV_POLICY ()); + throw ( ::CORBA::INV_POLICY ()); } server_protocol_set = true; } - this->set_policy (policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->set_policy (policy); } } void TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL) + ) { if (! this->compatible_scope (policy->_tao_scope())) { - ACE_THROW (CORBA::NO_PERMISSION ()); + throw ( ::CORBA::NO_PERMISSION ()); } const CORBA::PolicyType policy_type = - policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy->policy_type (); - CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Policy_var copy = policy->copy (); CORBA::ULong j = 0; const CORBA::ULong length = this->policy_list_.length (); @@ -234,13 +219,11 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy while (j != length) { CORBA::ULong current = - this->policy_list_[j]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->policy_list_[j]->policy_type (); if (current == policy_type) { - this->policy_list_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->policy_list_[j]->destroy (); this->policy_list_[j] = copy.ptr (); break; @@ -270,7 +253,7 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy CORBA::PolicyList * TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types - ACE_ENV_ARG_DECL) + ) { CORBA::ULong const slots = types.length (); CORBA::PolicyList *policy_list_ptr = 0; @@ -281,7 +264,6 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types ACE_NEW_THROW_EX (policy_list_ptr, CORBA::PolicyList (this->policy_list_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return policy_list_ptr; } @@ -289,7 +271,6 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types ACE_NEW_THROW_EX (policy_list_ptr, CORBA::PolicyList (slots), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::PolicyList_var policy_list (policy_list_ptr); policy_list->length (slots); @@ -303,8 +284,7 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types for (CORBA::ULong i = 0; i < length; ++i) { CORBA::ULong const current = - this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->policy_list_[i]->policy_type (); if (current != slot) { @@ -324,15 +304,14 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types CORBA::Policy_ptr TAO_Policy_Set::get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) { const CORBA::ULong length = this->policy_list_.length (); for (CORBA::ULong i = 0; i < length; ++i) { const CORBA::ULong current = - this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->policy_list_[i]->policy_type (); if (current != type) { @@ -359,7 +338,7 @@ TAO_Policy_Set::get_cached_const_policy (TAO_Cached_Policy_Type type) const CORBA::Policy_ptr TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL_NOT_USED) + ) { if (type != TAO_CACHED_POLICY_UNCACHED && type < TAO_CACHED_POLICY_MAX_CACHED) diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h index 873e114f321..36f426dd5ed 100644 --- a/TAO/tao/Policy_Set.h +++ b/TAO/tao/Policy_Set.h @@ -55,7 +55,7 @@ public: /// Copy the state from @a source, it uses the copy() operator to /// obtain independent copies of all the policies. void copy_from (TAO_Policy_Set* source - ACE_ENV_ARG_DECL); + ); /** * Modify the list of policies to include @a policies. @@ -66,17 +66,17 @@ public: */ void set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL); + ); /// Get the values (if any) for the policies in @a types, if @a /// types is an empty list the method returns *all* the current /// policies. CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types - ACE_ENV_ARG_DECL); + ); /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - ACE_ENV_ARG_DECL); + ); /// Obtain a cached policy for speedy lookups. /** @@ -91,11 +91,11 @@ public: /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + ); /// Utility method to set a single policy. void set_policy (const CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL); + ); /// Returns the policy at the specified index. /// @c CORBA::Policy::_nil () is returned if the policy doesn't @@ -108,7 +108,7 @@ private: /// Remove and destroy all the policy objects owned by this policy /// manager. - void cleanup_i (ACE_ENV_SINGLE_ARG_DECL); + void cleanup_i (void); /// Utility method to determine if a policy's scope is compatible with ours. CORBA::Boolean compatible_scope (TAO_Policy_Scope policy_scope) const; diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp index b9753bd0fc2..e367522f078 100644 --- a/TAO/tao/Policy_Validator.cpp +++ b/TAO/tao/Policy_Validator.cpp @@ -1,7 +1,6 @@ // $Id$ #include "tao/Policy_Validator.h" -#include "tao/Environment.h" #include "tao/debug.h" #include "ace/Log_Msg.h" @@ -24,9 +23,9 @@ TAO_Policy_Validator::~TAO_Policy_Validator (void) delete this->next_; } -TAO_ORB_Core & +TAO_ORB_Core & TAO_Policy_Validator::orb_core() const -{ +{ return this->orb_core_; } @@ -67,29 +66,25 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator) void TAO_Policy_Validator::validate (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { - this->validate_impl (policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->validate_impl (policies); if (this->next_ != 0) { - this->next_->validate (policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->next_->validate (policies); } } void TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { - this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->merge_policies_impl (policies); if (this->next_) { - this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->next_->merge_policies (policies); } } diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h index 6cc2eb6aab5..747d991d4df 100644 --- a/TAO/tao/Policy_Validator.h +++ b/TAO/tao/Policy_Validator.h @@ -36,8 +36,6 @@ class TAO_ORB_Core; namespace CORBA { typedef ULong PolicyType; - - class Environment; } /** @@ -67,13 +65,13 @@ public: * if that is not the case. */ void validate (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); /** * Add/merge policies. **/ void merge_policies (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); /** * Return whether the specified policy type is legal for the @@ -100,10 +98,10 @@ public: protected: virtual void validate_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void merge_policies_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) = 0; diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp index eafd895d3a6..f07d536b979 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp @@ -18,7 +18,7 @@ TAO_Acceptor_Filter_Factory::~TAO_Acceptor_Filter_Factory(void) TAO_Acceptor_Filter* TAO_Acceptor_Filter_Factory::create_object (TAO_POA_Manager& ) { - TAO_Acceptor_Filter *filter; + TAO_Acceptor_Filter *filter = 0; ACE_NEW_RETURN (filter, TAO_Default_Acceptor_Filter (), diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index a0996627247..d58ba68db7b 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -78,15 +78,14 @@ TAO_Active_Object_Map::set_system_id_size TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, int unique_id_policy, int persistent_id_policy, - const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters - ACE_ENV_ARG_DECL) + const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters) : user_id_map_ (0), servant_map_ (0), id_uniqueness_strategy_ (0), lifespan_strategy_ (0), id_assignment_strategy_ (0), id_hint_strategy_ (0), - using_active_maps_ (0) + using_active_maps_ (false) { TAO_Active_Object_Map::set_system_id_size (creation_parameters); @@ -97,14 +96,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, ACE_NEW_THROW_EX (id_uniqueness_strategy, TAO_Unique_Id_Strategy, CORBA::NO_MEMORY ()); - ACE_CHECK; } else { ACE_NEW_THROW_EX (id_uniqueness_strategy, TAO_Multiple_Id_Strategy, CORBA::NO_MEMORY ()); - ACE_CHECK; } // Give ownership to the auto pointer. @@ -117,14 +114,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, ACE_NEW_THROW_EX (lifespan_strategy, TAO_Persistent_Strategy, CORBA::NO_MEMORY ()); - ACE_CHECK; } else { ACE_NEW_THROW_EX (lifespan_strategy, TAO_Transient_Strategy, CORBA::NO_MEMORY ()); - ACE_CHECK; } // Give ownership to the auto pointer. @@ -137,21 +132,18 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, ACE_NEW_THROW_EX (id_assignment_strategy, TAO_User_Id_Strategy, CORBA::NO_MEMORY ()); - ACE_CHECK; } else if (unique_id_policy) { ACE_NEW_THROW_EX (id_assignment_strategy, TAO_System_Id_With_Unique_Id_Strategy, CORBA::NO_MEMORY ()); - ACE_CHECK; } else { ACE_NEW_THROW_EX (id_assignment_strategy, TAO_System_Id_With_Multiple_Id_Strategy, CORBA::NO_MEMORY ()); - ACE_CHECK; } // Give ownership to the auto pointer. @@ -162,19 +154,17 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, || creation_parameters.allow_reactivation_of_system_ids_) && creation_parameters.use_active_hint_in_ids_) { - this->using_active_maps_ = 1; + this->using_active_maps_ = true; ACE_NEW_THROW_EX (id_hint_strategy, TAO_Active_Hint_Strategy (creation_parameters.active_object_map_size_), CORBA::NO_MEMORY ()); - ACE_CHECK; } else { ACE_NEW_THROW_EX (id_hint_strategy, TAO_No_Hint_Strategy, CORBA::NO_MEMORY ()); - ACE_CHECK; } // Give ownership to the auto pointer. @@ -190,7 +180,6 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, ACE_NEW_THROW_EX (sm, servant_linear_map (creation_parameters.active_object_map_size_), CORBA::NO_MEMORY ()); - ACE_CHECK; break; #else ACE_ERROR ((LM_ERROR, @@ -205,7 +194,6 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, ACE_NEW_THROW_EX (sm, servant_hash_map (creation_parameters.active_object_map_size_), CORBA::NO_MEMORY ()); - ACE_CHECK; break; } } @@ -224,7 +212,6 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, ACE_NEW_THROW_EX (uim, user_id_linear_map (creation_parameters.active_object_map_size_), CORBA::NO_MEMORY ()); - ACE_CHECK; break; #else ACE_ERROR ((LM_ERROR, @@ -239,7 +226,6 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, ACE_NEW_THROW_EX (uim, user_id_hash_map (creation_parameters.active_object_map_size_), CORBA::NO_MEMORY ()); - ACE_CHECK; break; } } @@ -252,14 +238,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, ACE_NEW_THROW_EX (uim, user_id_linear_map (creation_parameters.active_object_map_size_), CORBA::NO_MEMORY ()); - ACE_CHECK; break; case TAO_DYNAMIC_HASH: ACE_NEW_THROW_EX (uim, user_id_hash_map (creation_parameters.active_object_map_size_), CORBA::NO_MEMORY ()); - ACE_CHECK; break; #else case TAO_LINEAR: @@ -274,12 +258,11 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, case TAO_ACTIVE_DEMUX: default: - this->using_active_maps_ = 1; + this->using_active_maps_ = true; ACE_NEW_THROW_EX (uim, user_id_active_map (creation_parameters.active_object_map_size_), CORBA::NO_MEMORY ()); - ACE_CHECK; break; } } diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 7232685a272..807d142e29c 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -50,8 +50,7 @@ public: TAO_Active_Object_Map (int user_id_policy, int unique_id_policy, int persistent_id_policy, - const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters - ACE_ENV_ARG_DECL); + const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters); /// Destructor. ~TAO_Active_Object_Map (void); @@ -228,7 +227,7 @@ public: /// Flag to see if we are using active maps in this active object /// map. - int using_active_maps_; + bool using_active_maps_; /// Size of the system id produced by the map. static size_t system_id_size_; diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp index 33c267042ba..4af1c0925f4 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp @@ -65,7 +65,7 @@ namespace TAO void Active_Policy_Strategies::update (Cached_Policies &policies, ::TAO_Root_POA *poa - ACE_ENV_ARG_DECL) + ) { this->thread_strategy_factory_ = ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategyFactory"); @@ -134,103 +134,89 @@ namespace TAO if (this->lifespan_strategy_ != 0) { - this->lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->lifespan_strategy_->strategy_init (poa); } if (this->request_processing_strategy_ != 0) { - this->request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->request_processing_strategy_->strategy_init (poa, policies.servant_retention()); } if (this->id_uniqueness_strategy_ != 0) { - this->id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->id_uniqueness_strategy_->strategy_init (poa); } if (this->implicit_activation_strategy_ != 0) { - this->implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->implicit_activation_strategy_->strategy_init (poa); } if (this->thread_strategy_ != 0) { - this->thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->thread_strategy_->strategy_init (poa); } if (this->servant_retention_strategy_ != 0) { - this->servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->servant_retention_strategy_->strategy_init (poa); } if (this->id_assignment_strategy_ != 0) { - this->id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->id_assignment_strategy_->strategy_init (poa); } } void - Active_Policy_Strategies::cleanup (ACE_ENV_SINGLE_ARG_DECL) + Active_Policy_Strategies::cleanup (void) { if (this->lifespan_strategy_ != 0) { - this->lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->lifespan_strategy_factory_->destroy (lifespan_strategy_); this->lifespan_strategy_ = 0; } if (this->request_processing_strategy_ != 0) { - this->request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->request_processing_strategy_factory_->destroy (request_processing_strategy_); this->request_processing_strategy_ = 0; } if (this->id_uniqueness_strategy_ != 0) { - this->id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_); this->id_uniqueness_strategy_ = 0; } if (this->implicit_activation_strategy_ != 0) { - this->implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_); this->implicit_activation_strategy_ = 0; } if (this->thread_strategy_ != 0) { - this->thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->thread_strategy_factory_->destroy (thread_strategy_); this->thread_strategy_ = 0; } if (this->servant_retention_strategy_ != 0) { - this->servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->servant_retention_strategy_factory_->destroy (servant_retention_strategy_); this->servant_retention_strategy_ = 0; } if (this->id_assignment_strategy_ != 0) { - this->id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->id_assignment_strategy_factory_->destroy (id_assignment_strategy_); this->id_assignment_strategy_ = 0; } diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index 685c6978c2b..829acb189c5 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -58,9 +58,9 @@ namespace TAO void update (Cached_Policies &policies, TAO_Root_POA* poa - ACE_ENV_ARG_DECL); + ); - void cleanup (ACE_ENV_SINGLE_ARG_DECL); + void cleanup (void); ThreadStrategy *thread_strategy (void) const; diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp index 1b97b7269b8..1a36cac5f5d 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.cpp +++ b/TAO/tao/PortableServer/Adapter_Activator.cpp @@ -27,8 +27,7 @@ namespace TAO CORBA::Boolean Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, - const char *name - ACE_ENV_ARG_DECL) + const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) { // Default policies @@ -38,25 +37,19 @@ namespace TAO PortableServer::POA_var child = parent->create_POA (name, this->poa_manager_.in (), - default_policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + default_policies); - ACE_TRY + try { - child->the_activator (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + child->the_activator (this); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { (void) child->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); return false; } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); // Finally everything is fine return true; diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h index 9d70eaabddf..71bff543e51 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.h +++ b/TAO/tao/PortableServer/Adapter_Activator.h @@ -45,8 +45,7 @@ namespace TAO Adapter_Activator (PortableServer::POAManager_ptr poa_manager); CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, - const char *name - ACE_ENV_ARG_DECL) + const char *name) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 26939a27be7..a407e7b23a4 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -21,8 +21,7 @@ namespace TAO { CORBA::Boolean Collocated_Object_Proxy_Broker::_is_a (CORBA::Object_ptr target, - const char *type_id - ACE_ENV_ARG_DECL) + const char *type_id) { TAO_Stub *stub = target->_stubobj (); @@ -40,24 +39,17 @@ namespace TAO stub->profile_in_use ()->object_key (), "_is_a", forward_to.out () - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (0); - servant_upcall.pre_invoke_collocated_request ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_CHECK_RETURN (0); + servant_upcall.pre_invoke_collocated_request (); - return servant_upcall.servant ()->_is_a (type_id - ACE_ENV_ARG_PARAMETER); + return servant_upcall.servant ()->_is_a (type_id); } // Direct collocation strategy is used. if (target->_servant () != 0) { - return target->_servant ()->_is_a (type_id - ACE_ENV_ARG_PARAMETER); + return target->_servant ()->_is_a (type_id); } return 0; @@ -66,13 +58,12 @@ namespace TAO #if (TAO_HAS_MINIMUM_CORBA == 0) char * - Collocated_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Collocated_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target) { TAO_Stub *stub = target->_stubobj (); char * _tao_retval = 0; - ACE_TRY + try { // Which collocation strategy should we use? if (stub != 0 && @@ -80,51 +71,37 @@ namespace TAO ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA) { TAO::Portable_Server::Servant_Upcall servant_upcall ( - stub->servant_orb_var ()->orb_core () - ); + stub->servant_orb_var ()->orb_core ()); CORBA::Object_var forward_to; servant_upcall.prepare_for_upcall ( stub->profile_in_use ()->object_key (), "_repository_id", - forward_to.out () - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; + forward_to.out ()); _tao_retval = - servant_upcall.servant ()->_repository_id ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + servant_upcall.servant ()->_repository_id (); } // Direct collocation strategy is used. else if (target->_servant () != 0) { - _tao_retval = - target->_servant ()->_repository_id ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + _tao_retval = target->_servant ()->_repository_id (); } } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch ( ::CORBA::OBJECT_NOT_EXIST&) { // Ignore this exception. } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval); return _tao_retval; } CORBA::Boolean - Collocated_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Collocated_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target) { CORBA::Boolean _tao_retval = true; @@ -145,27 +122,18 @@ namespace TAO target->_stubobj ()->object_key (), "_non_existent", forward_to.out () - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (_tao_retval); - servant_upcall.pre_invoke_collocated_request ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_CHECK_RETURN (_tao_retval); + servant_upcall.pre_invoke_collocated_request (); _tao_retval = - servant_upcall.servant ()->_non_existent ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_CHECK_RETURN (_tao_retval); + servant_upcall.servant ()->_non_existent (); } // Direct collocation strategy is used. else if (target->_servant () != 0) { _tao_retval = - target->_servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval); + target->_servant ()->_non_existent (); } return _tao_retval; @@ -173,13 +141,13 @@ namespace TAO CORBA::Object_ptr Collocated_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + ) { CORBA::Object_var _tao_retval (CORBA::Object::_nil ()); TAO_Stub *stub = target->_stubobj (); - ACE_TRY + try { // Which collocation strategy should we use? if (stub != 0 && @@ -195,50 +163,38 @@ namespace TAO stub->profile_in_use ()->object_key (), "_component", forward_to.out () - ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; _tao_retval = - servant_upcall.servant ()->_get_component ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + servant_upcall.servant ()->_get_component (); } // Direct collocation strategy is used. else if (target->_servant () != 0) { _tao_retval = - target->_servant ()->_get_component ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + target->_servant ()->_get_component (); } } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch ( ::CORBA::OBJECT_NOT_EXIST&) { // Ignore this exception. } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval._retn ()); return _tao_retval._retn (); } CORBA::InterfaceDef_ptr - Collocated_Object_Proxy_Broker::_get_interface ( - CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Collocated_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target) { CORBA::InterfaceDef_ptr _tao_retval = 0; TAO_Stub *stub = target->_stubobj (); - ACE_TRY + try { // Which collocation strategy should we use? if (stub != 0 && @@ -255,41 +211,28 @@ namespace TAO target->_stubobj ()->object_key (), "_interface", forward_to.out () - ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; - servant_upcall.pre_invoke_collocated_request ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + servant_upcall.pre_invoke_collocated_request (); _tao_retval = - servant_upcall.servant ()->_get_interface ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + servant_upcall.servant ()->_get_interface (); } // Direct collocation strategy is used. else if (target->_servant () != 0) { _tao_retval = - target->_servant ()->_get_interface ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + target->_servant ()->_get_interface (); } } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch ( ::CORBA::OBJECT_NOT_EXIST&) { // Ignore this exception. } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval); return _tao_retval; } diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h index cd28b880933..a07598ca017 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h @@ -45,24 +45,17 @@ namespace TAO /// Please see the documentation in Object_Proxy_Broker.h for /// details. virtual CORBA::Boolean _is_a (CORBA::Object_ptr target, - const char *logical_type_id - ACE_ENV_ARG_DECL); + const char *logical_type_id); #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target - ACE_ENV_ARG_DECL); + virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target); - virtual CORBA::InterfaceDef * _get_interface ( - CORBA::Object_ptr target - ACE_ENV_ARG_DECL - ); + virtual CORBA::InterfaceDef * _get_interface (CORBA::Object_ptr target); - virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target - ACE_ENV_ARG_DECL); + virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target); - virtual char * _repository_id (CORBA::Object_ptr target - ACE_ENV_ARG_DECL); + virtual char * _repository_id (CORBA::Object_ptr target); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/DII_Arguments_Converter.h b/TAO/tao/PortableServer/DII_Arguments_Converter.h index 2849d7fc42a..60109b80891 100644 --- a/TAO/tao/PortableServer/DII_Arguments_Converter.h +++ b/TAO/tao/PortableServer/DII_Arguments_Converter.h @@ -34,20 +34,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * @brief TAO_DII_Arguments_Converter. * * Abstract class that convert the DII arguments in NVList to the - * list of arguments. This is a base class for the actual implementation + * list of arguments. This is a base class for the actual implementation * in the DynamicInterface library. */ class TAO_PortableServer_Export TAO_DII_Arguments_Converter : public ACE_Service_Object { public: - + virtual ~TAO_DII_Arguments_Converter (void); - + virtual void convert ( TAO_ServerRequest & server_request, TAO::Argument * const args[], - size_t nargs - ACE_ENV_ARG_DECL) = 0; - + size_t nargs) = 0; }; diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index 8152f2fb385..bc26578dca1 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -25,100 +25,84 @@ TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void) void TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) CORBA::Policy_var policy = policies.get_cached_policy (TAO_CACHED_POLICY_SERVANT_RETENTION - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::ServantRetentionPolicy_var srp = PortableServer::ServantRetentionPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::ServantRetentionPolicyValue servant_retention = - srp->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + srp->value (); policy = policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::RequestProcessingPolicy_var rpp = PortableServer::RequestProcessingPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::RequestProcessingPolicyValue request_processing = - rpp->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + rpp->value (); // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or // USE_SERVANT_MANAGER policies. if (servant_retention == PortableServer::NON_RETAIN) if (request_processing != PortableServer::USE_SERVANT_MANAGER && request_processing != PortableServer::USE_DEFAULT_SERVANT) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); // USE_ACTIVE_OBJECT_MAP_ONLY requires the RETAIN policy. if (request_processing == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY) if (servant_retention != PortableServer::RETAIN) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS - ACE_ENV_ARG_PARAMETER); + ); - ACE_CHECK; PortableServer::IdUniquenessPolicy_var iup = PortableServer::IdUniquenessPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::IdUniquenessPolicyValue id_uniqueness = - iup->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + iup->value (); policy = policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::ImplicitActivationPolicy_var iap = PortableServer::ImplicitActivationPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::ImplicitActivationPolicyValue implicit_activation = - iap->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + iap->value (); policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::IdAssignmentPolicy_var idap = PortableServer::IdAssignmentPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::IdAssignmentPolicyValue id_assignment = - idap->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + idap->value (); // USE_DEFAULT_SERVANT requires the MULTIPLE_ID policy. if (request_processing == PortableServer::USE_DEFAULT_SERVANT) if (id_uniqueness != PortableServer::MULTIPLE_ID) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); // IMPLICIT_ACTIVATION requires the SYSTEM_ID and RETAIN policies. if (implicit_activation == PortableServer::IMPLICIT_ACTIVATION) if (servant_retention != PortableServer::RETAIN || id_assignment != PortableServer::SYSTEM_ID) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); #else /* TAO_HAS_MINIMUM_POA == 0 */ ACE_UNUSED_ARG (policies); - ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* TAO_HAS_MINIMUM_POA == 0 */ } @@ -150,7 +134,7 @@ TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type) void TAO_POA_Default_Policy_Validator::merge_policies_impl ( TAO_Policy_Set & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h index ce099b9d402..236fe985b63 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.h +++ b/TAO/tao/PortableServer/Default_Policy_Validator.h @@ -46,11 +46,11 @@ protected: * if that is not the case. */ void validate_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); /// Add/merge policies. void merge_policies_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); /** * Return whether the specified policy type is legal for the diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index d964a4d4f90..63e6773dac9 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -20,8 +20,7 @@ TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + TAO_Object_Adapter *object_adapter) { TAO_Root_POA *poa = 0; @@ -33,9 +32,8 @@ TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, lock, thread_lock, orb_core, - object_adapter - ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); + object_adapter), + CORBA::NO_MEMORY ()); return poa; } @@ -45,8 +43,7 @@ TAO_Default_Servant_Dispatcher::pre_invoke_remote_request ( TAO_Root_POA &, CORBA::Short, TAO_ServerRequest &, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & - ACE_ENV_ARG_DECL_NOT_USED) + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &) { } @@ -54,8 +51,7 @@ void TAO_Default_Servant_Dispatcher::pre_invoke_collocated_request ( TAO_Root_POA &, CORBA::Short, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & - ACE_ENV_ARG_DECL_NOT_USED) + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &) { } diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index e5f5f2b71db..5b988184834 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -44,15 +44,13 @@ public: TAO_Root_POA &poa, CORBA::Short servant_priority, TAO_ServerRequest &req, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL); + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state); /// Pre_invoke collocated request. void pre_invoke_collocated_request ( TAO_Root_POA &poa, CORBA::Short servant_priority, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL); + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state); /// Post_invoke request. void post_invoke ( @@ -67,8 +65,7 @@ public: ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); + TAO_Object_Adapter *object_adapter); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp index d7ce947dbae..e13c20b8f7f 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp @@ -26,10 +26,8 @@ TAO::Direct_Collocation_Upcall_Wrapper::upcall ( int num_args, const char * op, size_t op_len, - TAO::Collocation_Strategy strategy - ACE_ENV_ARG_DECL -) -ACE_THROW_SPEC ((CORBA::Exception)) + TAO::Collocation_Strategy strategy) + ACE_THROW_SPEC ((CORBA::Exception)) { TAO_Abstract_ServantBase * const servant = obj->_servant (); @@ -41,33 +39,29 @@ ACE_THROW_SPEC ((CORBA::Exception)) if (status == -1) { - ACE_THROW (CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); + throw ( ::CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); } - ACE_TRY + try { collocated_skel (servant, args, - num_args - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + num_args); } #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - ACE_CATCH (PortableServer::ForwardRequest, forward_request) + catch ( ::PortableServer::ForwardRequest& forward_request) { forward_obj = CORBA::Object::_duplicate (forward_request.forward_reference.in ()); return; } #else - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_UNUSED_ARG (forward_obj); - ACE_RE_THROW; + throw; } #endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/ - ACE_ENDTRY; - ACE_CHECK; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h index edc4c39f479..e84fb58ade4 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h @@ -33,8 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { - class Environment; - class Object; typedef Object *Object_ptr; typedef TAO_Pseudo_Var_T<Object> Object_var; @@ -63,9 +61,7 @@ namespace TAO int num_args, const char * op, size_t op_len, - TAO::Collocation_Strategy strategy - ACE_ENV_ARG_DECL - ) + TAO::Collocation_Strategy strategy) ACE_THROW_SPEC ((CORBA::Exception)); }; diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp index 7d036f83c72..619f02bc679 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp @@ -20,33 +20,32 @@ namespace TAO } CORBA::Policy_ptr - IdAssignmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) + IdAssignmentPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { IdAssignmentPolicy *copy = 0; ACE_NEW_THROW_EX (copy, IdAssignmentPolicy (this->value_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void - IdAssignmentPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + IdAssignmentPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::IdAssignmentPolicyValue - IdAssignmentPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + IdAssignmentPolicy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType - IdAssignmentPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + IdAssignmentPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::ID_ASSIGNMENT_POLICY_ID; diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index 83cec156f2c..cf9db21a4f1 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -45,16 +45,16 @@ namespace TAO public: IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - ::PortableServer::IdAssignmentPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ::PortableServer::IdAssignmentPolicyValue value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp index 969a6bfa112..eb32db2161c 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp @@ -14,13 +14,12 @@ namespace TAO namespace Portable_Server { void - IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/ - ACE_ENV_ARG_DECL_NOT_USED) + IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/) { } void - IdAssignmentStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + IdAssignmentStrategy::strategy_cleanup(void) { } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h index d53a67c62b3..b9c826c6758 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h @@ -32,9 +32,9 @@ namespace TAO : public Policy_Strategy { public: - virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL); + virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); /** * Returns the key type the says which specific policy we have diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h index 2d0dd83a80c..e6fe455dd42 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h @@ -41,7 +41,7 @@ namespace TAO virtual void destroy ( IdAssignmentStrategy *strategy - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index 475632c8363..8b37f9918dc 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -48,8 +48,7 @@ namespace TAO void IdAssignmentStrategyFactoryImpl::destroy ( - IdAssignmentStrategy * /*strategy*/ - ACE_ENV_ARG_DECL_NOT_USED) + IdAssignmentStrategy * /*strategy*/) { // Noop because both types are singletons } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h index 1e7cadb3267..a42768ac668 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h @@ -37,9 +37,7 @@ namespace TAO virtual IdAssignmentStrategy* create ( ::PortableServer::IdAssignmentPolicyValue value); - virtual void destroy ( - IdAssignmentStrategy *strategy - ACE_ENV_ARG_DECL); + virtual void destroy (IdAssignmentStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp index 8796492f65d..4949af6817b 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp @@ -20,33 +20,32 @@ namespace TAO } CORBA::Policy_ptr - IdUniquenessPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) + IdUniquenessPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { IdUniquenessPolicy *copy = 0; ACE_NEW_THROW_EX (copy, IdUniquenessPolicy (this->value_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void - IdUniquenessPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + IdUniquenessPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::IdUniquenessPolicyValue - IdUniquenessPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + IdUniquenessPolicy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType - IdUniquenessPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + IdUniquenessPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::ID_UNIQUENESS_POLICY_ID; diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index f1446d6e2fe..944738e6b94 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -45,16 +45,16 @@ namespace TAO public: IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - ::PortableServer::IdUniquenessPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ::PortableServer::IdUniquenessPolicyValue value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h index b3f973ef19f..c3387398970 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h @@ -42,7 +42,7 @@ namespace TAO /// Cleanup the given strategy instance virtual void destroy ( IdUniquenessStrategy *strategy - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index 47530f5a9a9..64adaf777f5 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -57,7 +57,7 @@ namespace TAO void IdUniquenessStrategyFactoryImpl::destroy ( IdUniquenessStrategy *strategy - ACE_ENV_ARG_DECL) + ) { switch (strategy->type ()) { @@ -73,8 +73,7 @@ namespace TAO if (strategy_factory != 0) { - strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + strategy_factory->destroy (strategy); } break; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h index 8846237437d..fe78dfe3f9f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h @@ -39,7 +39,7 @@ namespace TAO virtual void destroy ( IdUniquenessStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index 8fb4db2d48b..84cdac1b80d 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -14,22 +14,19 @@ namespace TAO namespace Portable_Server { void - IdUniquenessStrategyMultiple::strategy_init ( - TAO_Root_POA * /*poa*/ - ACE_ENV_ARG_DECL_NOT_USED) + IdUniquenessStrategyMultiple::strategy_init (TAO_Root_POA * /*poa*/) { } void - IdUniquenessStrategyMultiple::strategy_cleanup( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + IdUniquenessStrategyMultiple::strategy_cleanup (void) { } bool - IdUniquenessStrategyMultiple::is_servant_activation_allowed ( - PortableServer::Servant /*servant*/, - bool & /*wait_occurred_restart_call*/) + IdUniquenessStrategyMultiple::is_servant_activation_allowed + (PortableServer::Servant/*servant*/, + bool &/*wait_occurred_restart_call*/) { // With the multiple id strategy we can always activate the servant // another time @@ -43,7 +40,7 @@ namespace TAO } ::PortableServer::IdUniquenessPolicyValue - IdUniquenessStrategyMultiple::type() const + IdUniquenessStrategyMultiple::type () const { return ::PortableServer::MULTIPLE_ID; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index 92179068d95..a385f72c0c5 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -33,9 +33,9 @@ namespace TAO : public IdUniquenessStrategy { public: - virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL); + virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup (void); virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index 061cb611907..b2e3e2b2dbb 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -22,14 +22,14 @@ namespace TAO void IdUniquenessStrategyUnique::strategy_init ( TAO_Root_POA *poa - ACE_ENV_ARG_DECL_NOT_USED) + ) { poa_ = poa; } void IdUniquenessStrategyUnique::strategy_cleanup ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) { poa_ = 0; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index 8bcdbe180f7..ef39a1dad61 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -36,9 +36,9 @@ namespace TAO IdUniquenessStrategyUnique (void); virtual void strategy_init (TAO_Root_POA *poa - ACE_ENV_ARG_DECL); + ); - virtual void strategy_cleanup (ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup (void); virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index b29178c143f..391077edfc1 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -40,10 +40,9 @@ namespace TAO void IdUniquenessStrategyUniqueFactoryImpl::destroy ( IdUniquenessStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h index 721ae2a6eb9..5b031d00bbd 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h @@ -39,7 +39,7 @@ namespace TAO virtual void destroy ( IdUniquenessStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h index e5b55bd6077..2f5bef0c049 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.h +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h @@ -51,10 +51,10 @@ namespace TAO virtual ~ImR_Client_Adapter (void); /// ImplRepo helper method, notify the ImplRepo on startup - virtual void imr_notify_startup (TAO_Root_POA* poa ACE_ENV_ARG_DECL) = 0; + virtual void imr_notify_startup (TAO_Root_POA* poa ) = 0; /// ImplRepo helper method, notify the ImplRepo on shutdown - virtual void imr_notify_shutdown (TAO_Root_POA* poa ACE_ENV_ARG_DECL) = 0; + virtual void imr_notify_shutdown (TAO_Root_POA* poa ) = 0; }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp index c683f2640c7..287d32547e0 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp @@ -20,33 +20,32 @@ namespace TAO } CORBA::Policy_ptr - ImplicitActivationPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) + ImplicitActivationPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ImplicitActivationPolicy *copy = 0; ACE_NEW_THROW_EX (copy, ImplicitActivationPolicy (this->value_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void - ImplicitActivationPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ImplicitActivationPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::ImplicitActivationPolicyValue - ImplicitActivationPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ImplicitActivationPolicy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType - ImplicitActivationPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ImplicitActivationPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID; diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h index fb0a3d99179..50f1465a0c5 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h @@ -45,16 +45,16 @@ namespace TAO public: ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - ::PortableServer::ImplicitActivationPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ::PortableServer::ImplicitActivationPolicyValue value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp index f2761572e36..ad404a21c14 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp @@ -13,16 +13,13 @@ namespace TAO namespace Portable_Server { void - ImplicitActivationStrategy::strategy_init ( - TAO_Root_POA * /*poa*/ - ACE_ENV_ARG_DECL_NOT_USED) + ImplicitActivationStrategy::strategy_init (TAO_Root_POA * /*poa*/) { // dependent on type create the correct strategy. } void - ImplicitActivationStrategy::strategy_cleanup( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ImplicitActivationStrategy::strategy_cleanup (void) { } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h index 22ca61b5cbf..852ade6ac1b 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h @@ -30,9 +30,9 @@ namespace TAO : public Policy_Strategy { public: - virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL); + virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); virtual bool allow_implicit_activation (void) const = 0; }; diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h index f5d1a8aa5f4..9444ff5b91b 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h @@ -41,7 +41,7 @@ namespace TAO virtual void destroy ( ImplicitActivationStrategy *strategy - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index 0fa7771687c..1656fcd5c12 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -50,7 +50,7 @@ namespace TAO void ImplicitActivationStrategyFactoryImpl::destroy ( ImplicitActivationStrategy * /*strategy*/ - ACE_ENV_ARG_DECL_NOT_USED) + ) { // Noop because both types are singletons } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h index 6b9e87ef7f3..ca6cd277172 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h @@ -40,7 +40,7 @@ namespace TAO virtual void destroy ( ImplicitActivationStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp index b61dd7b3cbb..32d14ed4fe0 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.cpp +++ b/TAO/tao/PortableServer/LifespanPolicy.cpp @@ -20,33 +20,32 @@ namespace TAO } CORBA::Policy_ptr - LifespanPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) + LifespanPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { LifespanPolicy *copy = 0; ACE_NEW_THROW_EX (copy, LifespanPolicy (this->value_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void - LifespanPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LifespanPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::LifespanPolicyValue - LifespanPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LifespanPolicy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType - LifespanPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LifespanPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::LIFESPAN_POLICY_ID; diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h index 8782763623f..50c3246bc08 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.h +++ b/TAO/tao/PortableServer/LifespanPolicy.h @@ -45,16 +45,16 @@ namespace TAO public: LifespanPolicy (::PortableServer::LifespanPolicyValue value); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - ::PortableServer::LifespanPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ::PortableServer::LifespanPolicyValue value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp index aea66e7161c..46ae7a9c870 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.cpp +++ b/TAO/tao/PortableServer/LifespanStrategy.cpp @@ -27,16 +27,13 @@ namespace TAO } void - LifespanStrategy::strategy_init ( - TAO_Root_POA *poa - ACE_ENV_ARG_DECL_NOT_USED) + LifespanStrategy::strategy_init (TAO_Root_POA *poa) { poa_ = poa; } void - LifespanStrategy::strategy_cleanup( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LifespanStrategy::strategy_cleanup (void) { poa_ = 0; } diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index 895c20335d8..70e0c06c04d 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -37,15 +37,15 @@ namespace TAO public: LifespanStrategy (void); - virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL); + virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); void create (const char *name, const TAO::ObjectKey &key); - virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void notify_startup (void) = 0; - virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void notify_shutdown (void) = 0; /** * Validate the passed object key if it belongs to this POA. @@ -70,7 +70,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const = 0; /// Check the state of the POA. - virtual void check_state (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void check_state (void) = 0; virtual ::PortableServer::LifespanPolicyValue type() const = 0; diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h index 085e2c75228..01b13ba6e45 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactory.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h @@ -42,7 +42,7 @@ namespace TAO /// Cleanup the given strategy instance virtual void destroy ( LifespanStrategy *strategy - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; } } diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index 07e24aebc59..02b20df1881 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -52,7 +52,7 @@ namespace TAO void LifespanStrategyFactoryImpl::destroy ( LifespanStrategy *strategy - ACE_ENV_ARG_DECL) + ) { switch (strategy->type ()) { @@ -63,8 +63,7 @@ namespace TAO if (strategy_factory != 0) { - strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + strategy_factory->destroy (strategy); } break; } @@ -75,8 +74,7 @@ namespace TAO if (strategy_factory != 0) { - strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + strategy_factory->destroy (strategy); } break; } diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h index e0ece8266bb..e2a9074a622 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h @@ -40,7 +40,7 @@ namespace TAO /// Cleanup the given strategy instance virtual void destroy ( LifespanStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 6b2e3420c14..266c037036f 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -23,10 +23,9 @@ namespace TAO void LifespanStrategyPersistent::strategy_init ( TAO_Root_POA *poa - ACE_ENV_ARG_DECL) + ) { - LifespanStrategy::strategy_init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + LifespanStrategy::strategy_init (poa); this->use_imr_ = this->poa_->orb_core ().use_implrepo (); } @@ -68,7 +67,7 @@ namespace TAO } void - LifespanStrategyPersistent::notify_startup (ACE_ENV_SINGLE_ARG_DECL) + LifespanStrategyPersistent::notify_startup (void) { if (this->use_imr_) { @@ -97,8 +96,7 @@ namespace TAO if (adapter != 0) { - adapter->imr_notify_startup (this->poa_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + adapter->imr_notify_startup (this->poa_); } else { @@ -109,13 +107,13 @@ namespace TAO ACE_TEXT ("(%P|%t) ERROR: No ImR_Client library ") ACE_TEXT ("available but use IMR has been specified.\n"))); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } } } void - LifespanStrategyPersistent::notify_shutdown (ACE_ENV_SINGLE_ARG_DECL) + LifespanStrategyPersistent::notify_shutdown (void) { ImR_Client_Adapter *adapter = ACE_Dynamic_Service<ImR_Client_Adapter>::instance ( @@ -124,8 +122,7 @@ namespace TAO if (adapter != 0) { - adapter->imr_notify_shutdown (this->poa_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + adapter->imr_notify_shutdown (this->poa_); } } @@ -135,10 +132,9 @@ namespace TAO } void - LifespanStrategyPersistent::check_state (ACE_ENV_SINGLE_ARG_DECL) + LifespanStrategyPersistent::check_state (void) { - this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->poa_->tao_poa_manager().check_state (); } ::PortableServer::LifespanPolicyValue diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 01634563c72..ce8c9a7bdd6 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -36,11 +36,11 @@ namespace TAO public: LifespanStrategyPersistent (); - virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL); + virtual void strategy_init(TAO_Root_POA *poa); - virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL); + virtual void notify_startup (void); - virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL); + virtual void notify_shutdown (void); char key_type (void) const; @@ -55,7 +55,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; /// Check the state of the POA. - virtual void check_state (ACE_ENV_SINGLE_ARG_DECL); + virtual void check_state (void); virtual ::PortableServer::LifespanPolicyValue type() const; diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp index ab24406bf5f..29ed3ec4cac 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp @@ -40,10 +40,9 @@ namespace TAO void LifespanStrategyPersistentFactoryImpl::destroy ( LifespanStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h index b32a3c63440..4be1c1e4a6c 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h @@ -40,7 +40,7 @@ namespace TAO /// Cleanup the given strategy instance virtual void destroy ( LifespanStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp index d1859883dac..44529b50eab 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp @@ -25,12 +25,12 @@ namespace TAO } void - LifespanStrategyTransient::notify_startup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LifespanStrategyTransient::notify_startup (void) { } void - LifespanStrategyTransient::notify_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LifespanStrategyTransient::notify_shutdown (void) { } @@ -41,9 +41,10 @@ namespace TAO } bool - LifespanStrategyTransient::validate ( - CORBA::Boolean is_persistent, - const TAO::Portable_Server::Temporary_Creation_Time &creation_time) const + LifespanStrategyTransient::validate (CORBA::Boolean is_persistent, + const TAO::Portable_Server:: + Temporary_Creation_Time + &creation_time) const { return (!is_persistent && this->creation_time_ == creation_time); } @@ -53,30 +54,32 @@ namespace TAO { CORBA::ULong keylength = sizeof (char); - #if (POA_NO_TIMESTAMP == 0) - // Calculate the space required for the timestamp. - keylength += TAO::Portable_Server::Creation_Time::creation_time_length (); - #endif /* POA_NO_TIMESTAMP */ +#if (POA_NO_TIMESTAMP == 0) + // Calculate the space required for the timestamp. + keylength += TAO::Portable_Server::Creation_Time::creation_time_length + (); +#endif /* POA_NO_TIMESTAMP */ return keylength; } void - LifespanStrategyTransient::create_key ( - CORBA::Octet *buffer, - CORBA::ULong& starting_at) + LifespanStrategyTransient::create_key (CORBA::Octet *buffer, + CORBA::ULong &starting_at) { // Copy the persistence byte. - buffer[starting_at] = (CORBA::Octet) this->key_type (); + buffer[starting_at] = (CORBA::Octet)this->key_type (); starting_at += this->key_type_length (); - #if (POA_NO_TIMESTAMP == 0) - // Then copy the timestamp for transient POAs. - ACE_OS::memcpy (&buffer[starting_at], - this->creation_time_.creation_time (), - TAO::Portable_Server::Creation_Time::creation_time_length ()); - starting_at += TAO::Portable_Server::Creation_Time::creation_time_length (); - #endif /* POA_NO_TIMESTAMP */ +#if (POA_NO_TIMESTAMP == 0) + // Then copy the timestamp for transient POAs. + ACE_OS::memcpy (&buffer[starting_at], + this->creation_time_.creation_time (), + TAO::Portable_Server::Creation_Time::creation_time_length + ()); + starting_at += TAO::Portable_Server::Creation_Time::creation_time_length + (); +#endif /* POA_NO_TIMESTAMP */ } char @@ -86,19 +89,18 @@ namespace TAO } void - LifespanStrategyTransient::check_state (ACE_ENV_SINGLE_ARG_DECL) + LifespanStrategyTransient::check_state (void) { - if (this->poa_->tao_poa_manager().get_state_i () == - PortableServer::POAManager::INACTIVE) - { - ACE_THROW (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 4, + if (this->poa_->tao_poa_manager ().get_state_i () == + PortableServer::POAManager::INACTIVE) + { + throw (::CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO)); - } + } else - { - this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - } + { + this->poa_->tao_poa_manager ().check_state (); + } } bool @@ -108,7 +110,7 @@ namespace TAO } ::PortableServer::LifespanPolicyValue - LifespanStrategyTransient::type() const + LifespanStrategyTransient::type () const { return ::PortableServer::TRANSIENT; } diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index 6638973712f..46ebb3f5a15 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -35,9 +35,9 @@ namespace TAO public: LifespanStrategyTransient (void); - virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL); + virtual void notify_startup (void); - virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL); + virtual void notify_shutdown (void); char key_type (void) const; @@ -52,7 +52,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; /// Check the state of the POA. - virtual void check_state (ACE_ENV_SINGLE_ARG_DECL); + virtual void check_state (void); virtual ::PortableServer::LifespanPolicyValue type() const; diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp index 896745f0846..0072ac6fd52 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp @@ -40,10 +40,9 @@ namespace TAO void LifespanStrategyTransientFactoryImpl::destroy ( LifespanStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h index e3a8c076934..dd238cad044 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h @@ -41,7 +41,7 @@ namespace TAO /// Cleanup the given strategy instance virtual void destroy ( LifespanStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp index 007b1ca5e05..db75f2be412 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.cpp +++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp @@ -16,9 +16,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, void * - ACE_ENV_ARG_DECL) + ) { - ACE_THROW (CORBA::BAD_OPERATION ()); + throw ( ::CORBA::BAD_OPERATION ()); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h index dd3d9447932..d4cc2342b5f 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.h +++ b/TAO/tao/PortableServer/Local_Servant_Base.h @@ -43,12 +43,12 @@ class TAO_PortableServer_Export TAO_Local_ServantBase protected: /// This is an auxiliary method for _this(). Make sure *not* to /// register with the default POA. - TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + TAO_Stub *_create_stub (void); /// Throws CORBA::BAD_OPERATION exception. void _dispatch (TAO_ServerRequest &request, void *servant_upcall - ACE_ENV_ARG_DECL); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Local_Servant_Base.inl b/TAO/tao/PortableServer/Local_Servant_Base.inl index f811de25b9f..20eaf3f2e55 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.inl +++ b/TAO/tao/PortableServer/Local_Servant_Base.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Stub * -TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Local_ServantBase::_create_stub (void) { return 0; } diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index 2660f700538..06a3422e1eb 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -69,18 +69,16 @@ namespace TAO if (this->poa_.waiting_destruction () && this->poa_.outstanding_requests () == 0) { - ACE_TRY_NEW_ENV + try { - this->poa_.complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->poa_.complete_destruction_i (); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // Ignore exceptions ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_POA::complete_destruction_i"); } - ACE_ENDTRY; } // If locking is enabled. diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h index 34d89eb42db..8fab6447616 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -64,12 +64,12 @@ namespace TAO const char *orb_id, PortableInterceptor::AdapterName *, PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Set a different ort_factory to be used. virtual int set_obj_ref_factory ( PortableInterceptor::ObjectReferenceFactory *current_factory - ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ) = 0; /// Accessor methods to ObjectReferenceTemplate template virtual PortableInterceptor::ObjectReferenceTemplate * @@ -99,7 +99,7 @@ namespace TAO virtual CORBA::Object_ptr make_object ( const char * repository_id, const PortableInterceptor::ObjectId & id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index eba1da2172c..f51d64f3313 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -243,56 +243,49 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ void TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { // Initialize the default policies. #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO::Portable_Server::ThreadPolicy thread_policy (PortableServer::ORB_CTRL_MODEL); - policies.merge_policy (&thread_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.merge_policy (&thread_policy); #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if !defined (CORBA_E_MICRO) // Lifespan policy. TAO::Portable_Server::LifespanPolicy lifespan_policy (PortableServer::TRANSIENT); - policies.merge_policy (&lifespan_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.merge_policy (&lifespan_policy); #endif #if !defined (CORBA_E_MICRO) // ID uniqueness policy. TAO::Portable_Server::IdUniquenessPolicy id_uniqueness_policy (PortableServer::UNIQUE_ID); - policies.merge_policy (&id_uniqueness_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.merge_policy (&id_uniqueness_policy); #endif #if !defined (CORBA_E_MICRO) // ID assignment policy. TAO::Portable_Server::IdAssignmentPolicy id_assignment_policy (PortableServer::SYSTEM_ID); - policies.merge_policy (&id_assignment_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.merge_policy (&id_assignment_policy); #endif #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) // Implicit activation policy. TAO::Portable_Server::ImplicitActivationPolicy implicit_activation_policy (PortableServer::NO_IMPLICIT_ACTIVATION); - policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.merge_policy (&implicit_activation_policy); // Servant retention policy. TAO::Portable_Server::ServantRetentionPolicy servant_retention_policy (PortableServer::RETAIN); - policies.merge_policy (&servant_retention_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.merge_policy (&servant_retention_policy); // Request processing policy. TAO::Portable_Server::RequestProcessingPolicy request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY); - policies.merge_policy (&request_processing_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.merge_policy (&request_processing_policy); #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if defined (CORBA_E_MICRO) ACE_UNUSED_ARG (policies); @@ -350,7 +343,7 @@ int TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key, TAO_ServerRequest &req, CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) + ) { ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START); @@ -365,8 +358,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key, servant_upcall.prepare_for_upcall (key, operation, forward_to - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (result); + ); if (result != TAO_Adapter::DS_OK) return result; @@ -375,22 +367,19 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key, if (req.collocated ()) { servant_upcall.pre_invoke_collocated_request ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (result); + ); } else { servant_upcall.pre_invoke_remote_request (req - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (result); + ); } // Servant dispatch. { ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START); - do_dispatch (req, servant_upcall ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (result); + do_dispatch (req, servant_upcall); } #if TAO_HAS_INTERCEPTORS == 1 @@ -413,7 +402,7 @@ void TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key, PortableServer::ObjectId &system_id, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL) + ) { TAO_Object_Adapter::poa_name poa_system_name; CORBA::Boolean is_root = false; @@ -436,7 +425,7 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key, } if (result != 0) - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); { ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_FIND_POA_START); @@ -446,19 +435,18 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key, is_root, poa_creation_time, poa - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } if (result != 0) - ACE_THROW (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 2, + throw ( ::CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); } int TAO_Object_Adapter::activate_poa (const poa_name &folded_name, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL) + ) { int result = -1; @@ -481,19 +469,16 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name, { TAO_Root_POA *current = 0; - ACE_TRY + try { current = parent->find_POA_i (*iterator, 1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (PortableServer::POA::AdapterNonExistent, ex) + catch ( ::PortableServer::POA::AdapterNonExistent&) { return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); parent = current; } @@ -503,7 +488,6 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name, #else ACE_UNUSED_ARG (folded_name); ACE_UNUSED_ARG (poa); - ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* TAO_HAS_MINIMUM_POA == 0 */ return result; @@ -514,7 +498,7 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name, CORBA::Boolean root, const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL_NOT_USED) + ) { int result = 0; @@ -563,7 +547,7 @@ TAO_Object_Adapter::unbind_poa (TAO_Root_POA *poa, int TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key - ACE_ENV_ARG_DECL) + ) { ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START); @@ -573,15 +557,13 @@ TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key this->locate_poa (key, id, poa - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); PortableServer::Servant servant = 0; TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id, servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); switch (servant_location) { @@ -600,33 +582,26 @@ TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key TAO_SERVANT_LOCATION TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key, - PortableServer::Servant &servant - ACE_ENV_ARG_DECL) + PortableServer::Servant &servant) { PortableServer::ObjectId id; TAO_Root_POA *poa = 0; this->locate_poa (key, id, - poa - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND); + poa); TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id, - servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND); + servant); return servant_location; } void -TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) +TAO_Object_Adapter::open (void) { // Add in the default POA policies to the default list. - this->init_default_policies (this->default_poa_policies () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->init_default_policies (this->default_poa_policies ()); // If a POA extension hasn't changed the servant dispatcher, initialize the // default one. @@ -645,8 +620,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) PortableServer::POAManager_var poa_manager = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME, policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); #else PortableServer::POAManager_ptr poa_manager_ptr; ::CORBA::PolicyList policy_list; @@ -655,7 +629,6 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY (CORBA::SystemException::_tao_minor_code (0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableServer::POAManager_var poa_manager = poa_manager_ptr; // Keep reference of POAManager in TAO_Object_Adapter so the POAManager @@ -666,8 +639,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) // This makes sure that the default resources are open when the Root // POA is created. - this->orb_core_.thread_lane_resources_manager ().open_default_resources (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_core_.thread_lane_resources_manager ().open_default_resources (); TAO_POA_Policy_Set policies (this->default_poa_policies ()); @@ -680,14 +652,12 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) // Implicit activation policy. TAO::Portable_Server::ImplicitActivationPolicy implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); - policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.merge_policy (&implicit_activation_policy); #endif /* TAO_HAS_MINIMUM_POA == 0 */ // Merge policies from the ORB level. this->validator ().merge_policies (policies.policies () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // If any of the policy objects specified are not valid for the ORB // implementation, if conflicting policy objects are specified, or @@ -697,8 +667,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) // policies parameter value of the first offending policy object. policies.validate_policies (this->validator (), this->orb_core_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Construct a new POA TAO_Root_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME); @@ -710,8 +679,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) this->thread_lock (), this->orb_core_, this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // The Object_Adapter will keep a reference to the Root POA so that // on its destruction, it can check whether the Root POA has been @@ -719,22 +687,19 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) this->root_->_add_ref (); // Lock access for the duration of this transaction. - TAO::Portable_Server::POA_Guard poa_guard (*this->root_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + TAO::Portable_Server::POA_Guard poa_guard (*this->root_); // Iterate over the registered IOR interceptors so that they may be // given the opportunity to add tagged components to the profiles // for this servant. - this->root_->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->root_->establish_components (); } void TAO_Object_Adapter::close (int wait_for_completion - ACE_ENV_ARG_DECL) + ) { - this->check_close (wait_for_completion ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->check_close (wait_for_completion); // Shutting down the ORB causes all object adapters to be destroyed, // since they cannot exist in the absence of an ORB. Shut down is @@ -765,8 +730,7 @@ TAO_Object_Adapter::close (int wait_for_completion CORBA::Boolean etherealize_objects = 1; root->destroy (etherealize_objects, wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); ::CORBA::release (root); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) release_poa_manager_factory (factory); @@ -775,12 +739,11 @@ TAO_Object_Adapter::close (int wait_for_completion void TAO_Object_Adapter::check_close (int wait_for_completion - ACE_ENV_ARG_DECL) + ) { TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (), wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } int @@ -793,7 +756,7 @@ int TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) + ) { if (key.length() < TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE || ACE_OS::memcmp (key.get_buffer (), @@ -809,7 +772,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, TAO::ServerRequestInterceptor_Adapter *sri_adapter = orb_core_.serverrequestinterceptor_adapter (); - ACE_TRY + try { if (sri_adapter != 0) { @@ -822,8 +785,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, 0, // exceptions 0, // nexceptions ocs.out () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); /// If we have a cached result, just go ahead and send the reply /// and let us return @@ -854,8 +816,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, 0, // servant_upcall 0, // exceptions 0 // nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // If a PortableInterceptor::ForwardRequest exception was // thrown, then set the forward_to object reference and return @@ -871,10 +832,9 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, result = this->dispatch_servant (key, request, forward_to - ACE_ENV_ARG_PARAMETER); + ); #if TAO_HAS_INTERCEPTORS == 1 - ACE_TRY_CHECK; if (result == TAO_Adapter::DS_FORWARD) { @@ -887,12 +847,11 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, 0, // servant_upcall 0, // exceptions 0 // nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // Just assume the current exception is a system exception, the // status can only change when the interceptor changes this @@ -911,8 +870,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, 0, // servant_upcall 0, // exceptions 0 // nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); status = request.reply_status (); @@ -924,11 +882,9 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, if (status == PortableInterceptor::SYSTEM_EXCEPTION || status == PortableInterceptor::USER_EXCEPTION) { - ACE_RE_THROW; + throw; } } - ACE_ENDTRY; - ACE_CHECK_RETURN (result); #endif /* TAO_HAS_INTERCEPTORS == 1 */ return result; @@ -1026,18 +982,15 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp) TAO_ServantBase *servant = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->find_servant (objkey.in (), servant - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return servant; } @@ -1070,7 +1023,7 @@ int TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa ( const poa_name &system_name, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL) + ) { poa_name folded_name; int result = this->persistent_poa_system_map_.recover_key (system_name, @@ -1091,8 +1044,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa ( result = this->object_adapter_->activate_poa (folded_name, poa - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); } } } @@ -1149,7 +1101,7 @@ int TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa ( const poa_name &system_name, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL) + ) { int result = this->object_adapter_->persistent_poa_name_map_->find (system_name, @@ -1159,8 +1111,7 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa ( result = this->object_adapter_->activate_poa (system_name, poa - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); } return result; @@ -1279,7 +1230,7 @@ TAO_Object_Adapter::iteratable_poa_name::end (void) const } void -TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_DECL) +TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void) { // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of @@ -1293,7 +1244,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG int result = this->non_servant_upcall_condition_.wait (); if (result == -1) - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } } @@ -1301,18 +1252,16 @@ void TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void) { // Non-exception throwing version. - ACE_TRY_NEW_ENV + try { - this->wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->wait_for_non_servant_upcalls_to_complete (); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { ACE_ERROR ((LM_ERROR, "TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete " "threw exception it should not have!\n")); } - ACE_ENDTRY; } void @@ -1327,12 +1276,11 @@ TAO_Object_Adapter::servant_dispatcher (TAO_Servant_Dispatcher *dispatcher) void TAO_Object_Adapter::do_dispatch (TAO_ServerRequest& req, TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL) + ) { upcall.servant ()->_dispatch(req, &upcall - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index b2c6418afc9..1a9c0e22ef3 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -92,21 +92,21 @@ public: int dispatch_servant (const TAO::ObjectKey &key, TAO_ServerRequest &req, CORBA::Object_out forward_to - ACE_ENV_ARG_DECL); + ); int locate_servant (const TAO::ObjectKey &key - ACE_ENV_ARG_DECL); + ); TAO_SERVANT_LOCATION find_servant (const TAO::ObjectKey &key, PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + ); int find_poa (const poa_name &system_name, CORBA::Boolean activate_it, CORBA::Boolean root, const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL); + ); int bind_poa (const poa_name &folded_name, TAO_Root_POA *poa, @@ -118,7 +118,7 @@ public: int activate_poa (const poa_name &folded_name, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL); + ); ACE_Lock &lock (void); @@ -133,7 +133,7 @@ public: TAO_ORB_Core &orb_core (void) const; /// Wait for non-servant upcalls to complete. - void wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_DECL); + void wait_for_non_servant_upcalls_to_complete (void); /// Non-exception throwing version. void wait_for_non_servant_upcalls_to_complete_no_throw (void); @@ -155,20 +155,20 @@ public: /// Initialize the default set of POA policies. void init_default_policies (TAO_POA_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); // = The TAO_Adapter methods, please check tao/Adapter.h for the // documentation - virtual void open (ACE_ENV_SINGLE_ARG_DECL); + virtual void open (void); virtual void close (int wait_for_completion - ACE_ENV_ARG_DECL); + ); virtual void check_close (int wait_for_completion - ACE_ENV_ARG_DECL); + ); virtual int priority (void) const; virtual int dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - ACE_ENV_ARG_DECL); + ); virtual const char *name (void) const; virtual CORBA::Object_ptr root (void); virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, @@ -179,31 +179,31 @@ public: protected: int locate_servant_i (const TAO::ObjectKey &key - ACE_ENV_ARG_DECL); + ); TAO_SERVANT_LOCATION find_servant_i (const TAO::ObjectKey &key, PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + ); void dispatch_servant_i (const TAO::ObjectKey &key, TAO_ServerRequest &req, void *context - ACE_ENV_ARG_DECL); + ); void locate_poa (const TAO::ObjectKey &key, PortableServer::ObjectId &id, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL); + ); int find_transient_poa (const poa_name &system_name, CORBA::Boolean root, const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL); + ); int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL); + ); int bind_transient_poa (TAO_Root_POA *poa, poa_name_out system_name); @@ -222,7 +222,7 @@ protected: virtual void do_dispatch (TAO_ServerRequest& req, TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL); + ); public: @@ -242,7 +242,7 @@ public: virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual int bind_persistent_poa (const poa_name &folded_name, TAO_Root_POA *poa, @@ -277,7 +277,7 @@ public: virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL); + ); virtual int bind_persistent_poa (const poa_name &folded_name, TAO_Root_POA *poa, @@ -315,7 +315,7 @@ public: virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL); + ); virtual int bind_persistent_poa (const poa_name &folded_name, TAO_Root_POA *poa, diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 2fe048e9a5e..0a0777bc6ab 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -51,36 +51,36 @@ TAO_Object_Adapter::transient_poa_name_size () ACE_INLINE int TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key - ACE_ENV_ARG_DECL) + ) { // Lock access for the duration of this transaction. TAO_OBJECT_ADAPTER_GUARD_RETURN (-1); return this->locate_servant_i (key - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE TAO_SERVANT_LOCATION TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key, PortableServer::Servant &servant - ACE_ENV_ARG_DECL) + ) { // Lock access for the duration of this transaction. TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND); return this->find_servant_i (key, servant - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE int TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL) + ) { return this->hint_strategy_->find_persistent_poa (system_name, poa - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE int @@ -89,13 +89,13 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name, CORBA::Boolean root, const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time, TAO_Root_POA *&poa - ACE_ENV_ARG_DECL) + ) { if (activate_it) { return this->find_persistent_poa (system_name, poa - ACE_ENV_ARG_PARAMETER); + ); } else { @@ -103,7 +103,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name, root, poa_creation_time, poa - ACE_ENV_ARG_PARAMETER); + ); } } diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index d573d2c9f8e..87b81a7dec7 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -29,27 +29,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ServerRequest; class TAO_Abstract_ServantBase; -namespace CORBA -{ - class Environment; -} - typedef void (*TAO_Skeleton)( TAO_ServerRequest &, void *, void * -#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) - , CORBA::Environment & -#endif ); typedef void (*TAO_Collocated_Skeleton)( TAO_Abstract_ServantBase *, TAO::Argument **, int -#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) - , CORBA::Environment & -#endif ); /** diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index 344495551a1..aa154e6cacc 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -53,14 +53,14 @@ TAO_POA_Manager::~TAO_POA_Manager (void) } char * -TAO_POA_Manager::get_id (ACE_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::get_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->id_.in ()); } void -TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::activate_i (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { @@ -71,7 +71,7 @@ TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL) if (this->state_ == PortableServer::POAManager::INACTIVE) { - ACE_THROW (PortableServer::POAManager::AdapterInactive ()); + throw (PortableServer::POAManager::AdapterInactive ()); } else { @@ -88,22 +88,20 @@ TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL) } this->adapter_manager_state_changed (this->state_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // This operation changes the state of the POA manager to // inactive. If issued while the POA manager is in the inactive @@ -113,7 +111,7 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, if (this->state_ == PortableServer::POAManager::INACTIVE) { - ACE_THROW (PortableServer::POAManager::AdapterInactive ()); + throw (PortableServer::POAManager::AdapterInactive ()); } else { @@ -157,8 +155,7 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, poa->deactivate_all_objects_i (etherealize_objects, wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } // If the ORB::shutdown operation is called, it makes a call on @@ -168,13 +165,12 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, // of ORB::shutdown. this->adapter_manager_state_changed (this->state_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::State state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::AdapterState adapter_state = @@ -187,8 +183,7 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat { ior_adapter->adapter_manager_state_changed (this->id_.in (), adapter_state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } @@ -196,15 +191,14 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat void TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // This operation changes the state of the POA manager to // holding. If issued while the POA manager is in the inactive @@ -216,7 +210,7 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion if (this->state_ == PortableServer::POAManager::INACTIVE) { - ACE_THROW (PortableServer::POAManager::AdapterInactive ()); + throw (PortableServer::POAManager::AdapterInactive ()); } else { @@ -244,27 +238,24 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion { TAO_Root_POA *poa = *iterator; poa->wait_for_completions (wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } this->adapter_manager_state_changed (this->state_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // This operation changes the state of the POA manager to // discarding. If issued while the POA manager is in the inactive @@ -277,7 +268,7 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion if (this->state_ == PortableServer::POAManager::INACTIVE) { - ACE_THROW (PortableServer::POAManager::AdapterInactive ()); + throw (PortableServer::POAManager::AdapterInactive ()); } else { @@ -306,13 +297,12 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion { TAO_Root_POA *poa = *iterator; poa->wait_for_completions (wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } this->adapter_manager_state_changed (this->state_ - ACE_ENV_ARG_PARAMETER); + ); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -322,10 +312,10 @@ TAO_POA_Manager::remove_poa (TAO_Root_POA *poa) { int const result = this->poa_collection_.remove (poa); - // The #if really only needs to go around the - // "this->poa_manager_factory_.remove_poamanager (this);" line, but it's - // moved out as an optimization for now. If additional non-CORBA/e and - // non-minimum POA code needs to go in that clause the #if would have to + // The #if really only needs to go around the + // "this->poa_manager_factory_.remove_poamanager (this);" line, but it's + // moved out as an optimization for now. If additional non-CORBA/e and + // non-minimum POA code needs to go in that clause the #if would have to // move back in. #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -347,7 +337,7 @@ TAO_POA_Manager::register_poa (TAO_Root_POA *poa) } void -TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::check_state (void) { if (state_ == PortableServer::POAManager::ACTIVE) { @@ -367,7 +357,7 @@ TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL) // should be re-issued. (Of course, an ORB may always reject a // request for other reasons and raise some other system // exception.) - ACE_THROW ( + throw ( CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code ( TAO_POA_DISCARDING, @@ -388,7 +378,7 @@ TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL) // Since there is no queuing in TAO, we immediately raise a // TRANSIENT exception. - ACE_THROW (CORBA::TRANSIENT ( + throw ( ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code ( TAO_POA_HOLDING, 1), @@ -408,7 +398,7 @@ TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL) // co-resident in the same process, the ORB could raise the // OBJ_ADAPTER system exception, with standard minor code 1, to // indicate that the object implementation is unavailable. - ACE_THROW (CORBA::OBJ_ADAPTER ( + throw ( ::CORBA::OBJ_ADAPTER ( CORBA::SystemException::_tao_minor_code ( TAO_POA_INACTIVE, 1), @@ -417,7 +407,7 @@ TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL) } CORBA::ORB_ptr -TAO_POA_Manager::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA_Manager::_get_orb (void) { return CORBA::ORB::_duplicate (this->object_adapter_.orb_core ().orb ()); } diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 386f008e10c..6e37d9db634 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -62,34 +62,34 @@ class TAO_PortableServer_Export TAO_POA_Manager : public: - void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void activate (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); #if (TAO_HAS_MINIMUM_POA == 0) void hold_requests (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void discard_requests (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::POAManager::State get_state (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAManager::State get_state (void) ACE_THROW_SPEC ((CORBA::SystemException)); - char *get_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + char *get_id (void) ACE_THROW_SPEC ((CORBA::SystemException)); TAO_POA_Manager (TAO_Object_Adapter &object_adapter, @@ -104,13 +104,13 @@ public: ~TAO_POA_Manager (void); /// Check the state of this POA manager - void check_state (ACE_ENV_SINGLE_ARG_DECL); + void check_state (void); PortableServer::POAManager::State get_state_i () ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ORB_ptr _get_orb ( - ACE_ENV_SINGLE_ARG_DECL + ); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -119,31 +119,31 @@ public: protected: - void activate_i (ACE_ENV_SINGLE_ARG_DECL) + void activate_i (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); /// Method needed for notifying the IORInterceptors that the state /// of POAManager changed. void adapter_manager_state_changed (PortableServer::POAManager::State state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) void hold_requests_i (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void discard_requests_i (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); @@ -170,7 +170,7 @@ protected: CORBA::String_var id_; #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - + TAO_POAManager_Factory& poa_manager_factory_; CORBA::PolicyList policies_; diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl index 9c47eea1ba6..c8bcd0e7c50 100644 --- a/TAO/tao/PortableServer/POAManager.inl +++ b/TAO/tao/PortableServer/POAManager.inl @@ -14,46 +14,46 @@ TAO_POA_Manager::lock (void) } ACE_INLINE void -TAO_POA_Manager::activate (ACE_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::activate (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; - this->activate_i (ACE_ENV_SINGLE_ARG_PARAMETER); + this->activate_i (); } #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE void TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; - this->hold_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER); + this->hold_requests_i (wait_for_completion); } ACE_INLINE void TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; - this->discard_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER); + this->discard_requests_i (wait_for_completion); } ACE_INLINE void TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { @@ -62,7 +62,7 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, this->deactivate_i (etherealize_objects, wait_for_completion - ACE_ENV_ARG_PARAMETER); + ); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -75,7 +75,7 @@ TAO_POA_Manager::get_state_i (void) } ACE_INLINE PortableServer::POAManager::State -TAO_POA_Manager::get_state (ACE_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::get_state (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access to the POAManager for the duration of this transaction @@ -130,7 +130,7 @@ TAO_POA_Manager::generate_manager_id (void) const #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) -ACE_INLINE +ACE_INLINE CORBA::PolicyList& TAO_POA_Manager::get_policies () { return this->policies_; diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp index a52000bd13b..8fa54df8ab7 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.cpp +++ b/TAO/tao/PortableServer/POAManagerFactory.cpp @@ -27,7 +27,7 @@ TAO_POAManager_Factory::~TAO_POAManager_Factory (void) TAO_POAManager_Factory::create_POAManager ( const char * id, const ::CORBA::PolicyList & policies - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, ::PortableServer::POAManagerFactory::ManagerAlreadyExists, ::CORBA::PolicyError)) @@ -37,13 +37,11 @@ TAO_POAManager_Factory::create_POAManager ( // Merge policies from the ORB level. this->object_adapter_.validator ().merge_policies (tao_policies.policies () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ()); + ); // Merge in any policies that the user may have specified. tao_policies.merge_policies (policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ()); + ); // If any of the policy objects specified are not valid for the ORB // implementation, if conflicting policy objects are specified, or @@ -53,15 +51,13 @@ TAO_POAManager_Factory::create_POAManager ( // policies parameter value of the first offending policy object. tao_policies.validate_policies (this->object_adapter_.validator (), this->object_adapter_.orb_core () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ()); + ); PortableServer::POAManager_var poamanager; if (id != 0) { - poamanager = this->find (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ()); + poamanager = this->find (id); // If we already have a manager with the same name throw an exception if (!CORBA::is_nil (poamanager.in())) @@ -81,7 +77,6 @@ TAO_POAManager_Factory::create_POAManager ( CORBA::NO_MEMORY (CORBA::SystemException::_tao_minor_code (0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ()); poamanager = pm; } @@ -92,7 +87,7 @@ TAO_POAManager_Factory::create_POAManager ( ::PortableServer::POAManagerFactory::POAManagerSeq * TAO_POAManager_Factory::list ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers; @@ -102,7 +97,6 @@ TAO_POAManager_Factory::list ( PortableServer::POAManagerFactory::POAManagerSeq ( number_of_poamanagers), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); poamanagers->length (number_of_poamanagers); @@ -121,7 +115,7 @@ TAO_POAManager_Factory::list ( ::PortableServer::POAManager_ptr TAO_POAManager_Factory::find ( - const char * id ACE_ENV_ARG_DECL) + const char * id ) ACE_THROW_SPEC ((CORBA::SystemException)) { ::PortableServer::POAManager_ptr poamanager = @@ -132,8 +126,7 @@ TAO_POAManager_Factory::find ( ++iterator) { CORBA::String_var poamanagerid = - (*iterator)->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (::PortableServer::POAManager::_nil()); + (*iterator)->get_id (); if (ACE_OS::strcmp (id, poamanagerid.in()) == 0) { diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h index 105bd3aa3d9..ea0fa1d0cee 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.h +++ b/TAO/tao/PortableServer/POAManagerFactory.h @@ -50,17 +50,17 @@ public: virtual ::PortableServer::POAManager_ptr create_POAManager ( const char * id, const ::CORBA::PolicyList & policies - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, ::PortableServer::POAManagerFactory::ManagerAlreadyExists, ::CORBA::PolicyError)); virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::PortableServer::POAManager_ptr find ( - const char * id ACE_ENV_ARG_DECL) + const char * id ) ACE_THROW_SPEC ((CORBA::SystemException)); void remove_all_poamanagers (void); diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 78817e266f0..561ddb683bb 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -44,33 +44,30 @@ namespace TAO void Cached_Policies::update (TAO_POA_Policy_Set &policy_set - ACE_ENV_ARG_DECL) + ) { for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++) { CORBA::Policy_var policy = policy_set.get_policy_by_index (i); this->update_policy (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } void Cached_Policies::update_policy (const CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL) + ) { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) ::PortableServer::ThreadPolicy_var thread = ::PortableServer::ThreadPolicy::_narrow (policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (thread.in ())) { - this->thread_ = thread->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->thread_ = thread->value (); return; } @@ -79,13 +76,11 @@ namespace TAO #if !defined (CORBA_E_MICRO) ::PortableServer::LifespanPolicy_var lifespan = ::PortableServer::LifespanPolicy::_narrow (policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (lifespan.in ())) { - this->lifespan_ = lifespan->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->lifespan_ = lifespan->value (); return; } @@ -94,13 +89,11 @@ namespace TAO #if !defined (CORBA_E_MICRO) ::PortableServer::IdUniquenessPolicy_var id_uniqueness = ::PortableServer::IdUniquenessPolicy::_narrow (policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (id_uniqueness.in ())) { - this->id_uniqueness_ = id_uniqueness->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->id_uniqueness_ = id_uniqueness->value (); return; } @@ -109,13 +102,11 @@ namespace TAO #if !defined (CORBA_E_MICRO) ::PortableServer::IdAssignmentPolicy_var id_assignment = ::PortableServer::IdAssignmentPolicy::_narrow (policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (id_assignment.in ())) { - this->id_assignment_ = id_assignment->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->id_assignment_ = id_assignment->value (); return; } @@ -125,39 +116,33 @@ namespace TAO ::PortableServer::ImplicitActivationPolicy_var implicit_activation = ::PortableServer::ImplicitActivationPolicy::_narrow (policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (implicit_activation.in ())) { - this->implicit_activation_ = implicit_activation->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->implicit_activation_ = implicit_activation->value (); return; } ::PortableServer::ServantRetentionPolicy_var servant_retention = ::PortableServer::ServantRetentionPolicy::_narrow (policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (servant_retention.in ())) { - this->servant_retention_ = servant_retention->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->servant_retention_ = servant_retention->value (); return; } ::PortableServer::RequestProcessingPolicy_var request_processing = ::PortableServer::RequestProcessingPolicy::_narrow (policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (request_processing.in ())) { - this->request_processing_ = request_processing->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->request_processing_ = request_processing->value (); return; } diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index c4b29a57d8e..60465f8238a 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -56,7 +56,7 @@ namespace TAO /// Update the cached policy values. void update (TAO_POA_Policy_Set &policy_set - ACE_ENV_ARG_DECL); + ); /** * @name Accessor methods to cached values. @@ -81,7 +81,7 @@ namespace TAO /// Helper method to update a particular policy. void update_policy (const CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL); + ); ::PortableServer::ThreadPolicyValue thread_; diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp index a1e30c3faed..2dcaf4ceefa 100644 --- a/TAO/tao/PortableServer/POA_Current.cpp +++ b/TAO/tao/PortableServer/POA_Current.cpp @@ -18,7 +18,7 @@ namespace TAO namespace Portable_Server { PortableServer::POA_ptr - POA_Current::get_POA (ACE_ENV_SINGLE_ARG_DECL) + POA_Current::get_POA (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -31,7 +31,7 @@ namespace TAO } PortableServer::ObjectId * - POA_Current::get_object_id (ACE_ENV_SINGLE_ARG_DECL) + POA_Current::get_object_id (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -44,7 +44,7 @@ namespace TAO } PortableServer::Servant - POA_Current::get_servant (ACE_ENV_SINGLE_ARG_DECL) + POA_Current::get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -57,7 +57,7 @@ namespace TAO } CORBA::Object_ptr - POA_Current::get_reference (ACE_ENV_SINGLE_ARG_DECL) + POA_Current::get_reference (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index 4af15a2b241..57a97f0e37e 100644 --- a/TAO/tao/PortableServer/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -48,7 +48,7 @@ namespace TAO * Can raise the @c NoContext exception if this function is * not invoked in the context of an upcall. */ - PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr get_POA (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); @@ -57,7 +57,7 @@ namespace TAO * raise the @c NoContext exception if this function is not * invoked in the context of an upcall. */ - PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL) + PortableServer::ObjectId *get_object_id (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); @@ -70,7 +70,7 @@ namespace TAO * Object::is_equivalent operation to compare the two references may not * necessarily return true. */ - CORBA::Object_ptr get_reference (ACE_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr get_reference (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); @@ -79,7 +79,7 @@ namespace TAO * context it is called. If called outside the context of the POA * dispatched operation, a NoContext exception is raised */ - PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL) + PortableServer::Servant get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp index 081147aad3c..5656041765c 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.cpp +++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp @@ -10,7 +10,7 @@ CORBA::Object_ptr TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr, int, ACE_TCHAR * [] - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::POA_Current* adapter = 0; diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h index 6ef224d32fd..678ce9f043c 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.h +++ b/TAO/tao/PortableServer/POA_Current_Factory.h @@ -35,7 +35,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp index a2943714015..533e41bf9b5 100644 --- a/TAO/tao/PortableServer/POA_Guard.cpp +++ b/TAO/tao/PortableServer/POA_Guard.cpp @@ -16,12 +16,12 @@ namespace TAO namespace Portable_Server { POA_Guard::POA_Guard (::TAO_Root_POA &poa - ACE_ENV_ARG_DECL, + , int check_for_destruction) : guard_ (poa.lock ()) { if (!this->guard_.locked ()) - ACE_THROW ( + throw ( CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_GUARD_FAILURE, @@ -31,12 +31,11 @@ namespace TAO // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of // course, the thread making the non-servant upcall is this thread. - poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (); if (check_for_destruction && poa.cleanup_in_progress ()) - ACE_THROW ( + throw ( CORBA::BAD_INV_ORDER ( CORBA::SystemException::_tao_minor_code ( TAO_POA_BEING_DESTROYED, diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h index da0f74dedae..ae77c6de2be 100644 --- a/TAO/tao/PortableServer/POA_Guard.h +++ b/TAO/tao/PortableServer/POA_Guard.h @@ -42,7 +42,7 @@ namespace TAO { public: POA_Guard (::TAO_Root_POA &poa - ACE_ENV_ARG_DECL, + , int check_for_destruction = 1); private: diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index af860e75a75..6587bf06665 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -34,7 +34,7 @@ TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void) void TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies - ACE_ENV_ARG_DECL) + ) { CORBA::ULong cep_index = client_exposed_policies->length (); @@ -49,8 +49,7 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client { client_exposed_policies->length (cep_index + 1); (*client_exposed_policies)[cep_index] = - policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy->copy (); cep_index++; } @@ -60,16 +59,14 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client void TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator, TAO_ORB_Core &orb_core - ACE_ENV_ARG_DECL) + ) { // Just give a last chance for all the unloaded validators in other // libraries to be registered - orb_core.load_policy_validators (validator ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + orb_core.load_policy_validators (validator); // Validate that all of the specified policies make sense. - validator.validate (this->impl_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + validator.validate (this->impl_ ); // Verify that all policies are legal for the currently loaded // POA extensions. @@ -79,15 +76,14 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator, { CORBA::Policy_var policy = this->impl_.get_policy_by_index (i); - CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::PolicyType type = policy->policy_type (); if (validator.legal_policy (type) == 0) { #if ! defined (CORBA_E_MICRO) // An invalid policy was specified. Let the user know about // it. - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); #else ACE_ERROR ((LM_ERROR, "Invalid policy\n")); #endif diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index 3958133d756..36090a1db9d 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -47,27 +47,27 @@ public: /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + ); void merge_policies (const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL); + ); void merge_policy (const CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL); + ); void validate_policies (TAO_Policy_Validator &validator, TAO_ORB_Core &orb_core - ACE_ENV_ARG_DECL); + ); /// Add all of the client exposed policies to the specified list. void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies - ACE_ENV_ARG_DECL); + ); TAO_Policy_Set &policies (void); /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - ACE_ENV_ARG_DECL); + ); protected: TAO_Policy_Set impl_; diff --git a/TAO/tao/PortableServer/POA_Policy_Set.inl b/TAO/tao/PortableServer/POA_Policy_Set.inl index 4181baecf48..e91e7111d94 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.inl +++ b/TAO/tao/PortableServer/POA_Policy_Set.inl @@ -18,36 +18,34 @@ TAO_POA_Policy_Set::get_policy_by_index (CORBA::ULong index) ACE_INLINE CORBA::Policy_ptr TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL) + ) { return this->impl_.get_cached_policy (type - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE void TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) + ) { // Add the policies if they don't exist, override them if they do. this->impl_.set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } ACE_INLINE void TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL) + ) { - this->impl_.set_policy (policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->impl_.set_policy (policy); } ACE_INLINE CORBA::Policy_ptr TAO_POA_Policy_Set::get_policy (CORBA::PolicyType policy - ACE_ENV_ARG_DECL) + ) { - return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER); + return this->impl_.get_policy (policy); } ACE_INLINE TAO_Policy_Set & diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 9eae2512e9b..87b89d5ab0e 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -260,13 +260,12 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::~_TAO_Policy_Strategized_Proxy_ TAO::Collocation_Strategy POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::get_strategy ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Collocation_Strategy strategy = - TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY); + TAO_ORB_Core::collocation_strategy (obj); return strategy; } @@ -280,7 +279,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch ( const char * op, size_t op_len, TAO::Collocation_Strategy strategy - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::Exception)) { @@ -293,7 +292,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch ( op, op_len, strategy - ACE_ENV_ARG_PARAMETER); + ); } // @@ -345,7 +344,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -355,9 +354,8 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type ( dynamic_cast<POA_CORBA::Policy_ptr> (servant) ->policy_type ( - ACE_ENV_SINGLE_ARG_PARAMETER + ); - ACE_CHECK; } // TAO_IDL - Generated from // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42 @@ -367,7 +365,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -377,9 +375,8 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy ( dynamic_cast<POA_CORBA::Policy_ptr> (servant) ->copy ( - ACE_ENV_SINGLE_ARG_PARAMETER + ); - ACE_CHECK; } // TAO_IDL - Generated from // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42 @@ -389,7 +386,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy ( TAO_Abstract_ServantBase *servant, TAO::Argument **, int - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -398,9 +395,8 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy ( dynamic_cast<POA_CORBA::Policy_ptr> (servant) ->destroy ( - ACE_ENV_SINGLE_ARG_PARAMETER + ); - ACE_CHECK; } @@ -447,7 +443,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::PolicyType> ( @@ -457,7 +453,7 @@ namespace POA_CORBA retval = this->servant_->policy_type ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); } @@ -477,7 +473,7 @@ void POA_CORBA::Policy::_get_policy_type_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -514,8 +510,7 @@ void POA_CORBA::Policy::_get_policy_type_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } namespace POA_CORBA @@ -539,7 +534,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< CORBA::Policy> ( @@ -549,7 +544,7 @@ namespace POA_CORBA retval = this->servant_->copy ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); } @@ -569,7 +564,7 @@ void POA_CORBA::Policy::copy_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -606,8 +601,7 @@ void POA_CORBA::Policy::copy_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } namespace POA_CORBA @@ -627,10 +621,10 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { this->servant_->destroy ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); } @@ -648,7 +642,7 @@ void POA_CORBA::Policy::destroy_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -683,8 +677,7 @@ void POA_CORBA::Policy::destroy_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -712,7 +705,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -729,7 +722,7 @@ namespace POA_CORBA retval = this->servant_-> _is_a ( arg_1 - ACE_ENV_ARG_PARAMETER); + ); } @@ -744,7 +737,7 @@ void POA_CORBA::Policy::_is_a_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -783,8 +776,7 @@ void POA_CORBA::Policy::_is_a_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -809,7 +801,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -819,7 +811,7 @@ namespace POA_CORBA retval = this->servant_-> _non_existent ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); } @@ -834,7 +826,7 @@ void POA_CORBA::Policy::_non_existent_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -871,8 +863,7 @@ void POA_CORBA::Policy::_non_existent_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -887,7 +878,7 @@ void POA_CORBA::Policy::_interface_skel ( TAO_ServerRequest & server_request, void * /* servant_upcall */, void * servant - ACE_ENV_ARG_DECL + ) { TAO_IFR_Client_Adapter *_tao_adapter = @@ -897,15 +888,14 @@ void POA_CORBA::Policy::_interface_skel ( if (_tao_adapter == 0) { - ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, + throw ( ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); } POA_CORBA::Policy * const impl = static_cast<POA_CORBA::Policy *> (servant); CORBA::InterfaceDef_ptr _tao_retval = - impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + impl->_get_interface (); server_request.init_reply (); TAO_OutputCDR &_tao_out = *server_request.outgoing (); @@ -920,7 +910,7 @@ void POA_CORBA::Policy::_interface_skel ( if (_tao_result == 0) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } @@ -945,7 +935,7 @@ namespace POA_CORBA { } - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) + virtual void execute (void) { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( @@ -955,7 +945,7 @@ namespace POA_CORBA retval = this->servant_-> _get_component ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ); } @@ -970,7 +960,7 @@ void POA_CORBA::Policy::_component_skel ( TAO_ServerRequest & server_request, void * TAO_INTERCEPTOR (servant_upcall), void * servant - ACE_ENV_ARG_DECL + ) { @@ -1007,14 +997,13 @@ void POA_CORBA::Policy::_component_skel ( , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } CORBA::Boolean POA_CORBA::Policy::_is_a ( const char* value - ACE_ENV_ARG_DECL_NOT_USED + ) { return @@ -1041,23 +1030,22 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const void POA_CORBA::Policy::_dispatch ( TAO_ServerRequest & req, void * servant_upcall - ACE_ENV_ARG_DECL + ) { this->synchronous_upcall_dispatch (req, servant_upcall, this - ACE_ENV_ARG_PARAMETER); + ); } // TAO_IDL - Generated from // be\be_visitor_interface/interface_ss.cpp:891 CORBA::Policy * -POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::Policy::_this (void) { - TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO_Stub *stub = this->_create_stub (); TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index 91d1c44b232..4f6a78dc428 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -97,45 +97,45 @@ namespace POA_CORBA virtual CORBA::Boolean _is_a ( const char* logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static void _is_a_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); static void _non_existent_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); static void _interface_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); static void _component_skel ( TAO_ServerRequest & req, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); virtual void _dispatch ( TAO_ServerRequest & req, void * servant_upcall - ACE_ENV_ARG_DECL + ); ::CORBA::Policy *_this ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); virtual const char* _interface_repository_id (void) const; @@ -144,7 +144,7 @@ namespace POA_CORBA // be\be_visitor_operation/operation_sh.cpp:45 virtual CORBA::PolicyType policy_type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -154,14 +154,14 @@ namespace POA_CORBA TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 virtual ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -171,14 +171,14 @@ namespace POA_CORBA TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -188,7 +188,7 @@ namespace POA_CORBA TAO_ServerRequest & server_request, void * servant_upcall, void * servant - ACE_ENV_ARG_DECL + ); }; @@ -210,7 +210,7 @@ namespace POA_CORBA TAO::Collocation_Strategy get_strategy ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -223,7 +223,7 @@ namespace POA_CORBA const char * op, size_t op_len, TAO::Collocation_Strategy strategy - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::Exception)); @@ -259,7 +259,7 @@ namespace POA_CORBA TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -273,7 +273,7 @@ namespace POA_CORBA TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -287,7 +287,7 @@ namespace POA_CORBA TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index 6bf094e5c33..6424524af08 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -84,14 +84,14 @@ namespace POA_CORBA // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 CORBA::PolicyType policy_type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -101,7 +101,7 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -111,7 +111,7 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl index 4bccdaee36d..c896883e321 100644 --- a/TAO/tao/PortableServer/PolicyS_T.inl +++ b/TAO/tao/PortableServer/PolicyS_T.inl @@ -81,7 +81,7 @@ POA_CORBA::Policy_tie<T>::_tied_object (T &obj) { delete this->ptr_; } - + this->ptr_ = &obj; this->rel_ = 0; } @@ -93,7 +93,7 @@ POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release) { delete this->ptr_; } - + this->ptr_ = obj; this->rel_ = release; } @@ -111,61 +111,61 @@ POA_CORBA::Policy_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::Policy_tie<T>::_default_POA (void) { if (!CORBA::is_nil (this->poa_.in ())) { return PortableServer::POA::_duplicate (this->poa_.in ()); } - - return this->Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); + + return this->Policy::_default_POA (); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_operation/tie_si.cpp:68 template <class T> ACE_INLINE CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->policy_type ( - ACE_ENV_SINGLE_ARG_PARAMETER + ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_operation/tie_si.cpp:68 template <class T> ACE_INLINE ::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->copy ( - ACE_ENV_SINGLE_ARG_PARAMETER + ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_operation/tie_si.cpp:68 template <class T> ACE_INLINE void POA_CORBA::Policy_tie<T>::destroy ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - ACE_ENV_SINGLE_ARG_PARAMETER + ); } diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h index d0854a95849..90ab76fe374 100644 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ b/TAO/tao/PortableServer/Policy_Strategy.h @@ -35,9 +35,9 @@ namespace TAO : public ACE_Service_Object { public: - virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL) = 0; + virtual void strategy_init(TAO_Root_POA *poa ) = 0; - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void strategy_cleanup(void) = 0; virtual ~Policy_Strategy (void) {}; }; diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index 08f4965c8e7..07a1f569f4b 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -19,7 +19,7 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + ) : TAO_Root_POA (name, poa_manager, policies, @@ -28,7 +28,7 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, thread_lock, orb_core, object_adapter - ACE_ENV_ARG_PARAMETER), + ), parent_ (parent) { } @@ -38,7 +38,7 @@ TAO_Regular_POA::~TAO_Regular_POA (void) } void -TAO_Regular_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Regular_POA::remove_from_parent_i (void) { // Remove POA from the parent if (this->parent_ != 0) @@ -46,7 +46,7 @@ TAO_Regular_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL) int result = this->parent_->delete_child (this->name_); if (result != 0) { - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } } } diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h index eddd7bf3205..0aa05f9f33d 100644 --- a/TAO/tao/PortableServer/Regular_POA.h +++ b/TAO/tao/PortableServer/Regular_POA.h @@ -46,15 +46,15 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); + ); virtual ~TAO_Regular_POA (void); - PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POA_ptr the_parent (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: - virtual void remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void remove_from_parent_i (void); virtual CORBA::Boolean root (void) const; diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl index 04b4b4b091b..bbfe8339c0e 100644 --- a/TAO/tao/PortableServer/Regular_POA.inl +++ b/TAO/tao/PortableServer/Regular_POA.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableServer::POA_ptr -TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Regular_POA::the_parent (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->parent_); diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp index b24192c3439..99e04676cbb 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp @@ -22,33 +22,32 @@ namespace TAO } CORBA::Policy_ptr - RequestProcessingPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) + RequestProcessingPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { RequestProcessingPolicy *copy = 0; ACE_NEW_THROW_EX (copy, RequestProcessingPolicy (this->value_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void - RequestProcessingPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + RequestProcessingPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::RequestProcessingPolicyValue - RequestProcessingPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + RequestProcessingPolicy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType - RequestProcessingPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + RequestProcessingPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::REQUEST_PROCESSING_POLICY_ID; diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h index 34f850757f1..f9783203f29 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h @@ -45,16 +45,16 @@ namespace TAO public: RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - ::PortableServer::RequestProcessingPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ::PortableServer::RequestProcessingPolicyValue value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp index 535faabda48..9a5f04eb0a3 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp @@ -30,7 +30,7 @@ namespace TAO RequestProcessingStrategy::strategy_init( TAO_Root_POA *poa, ::PortableServer::ServantRetentionPolicyValue sr_value - ACE_ENV_ARG_DECL_NOT_USED) + ) { poa_ = poa; sr_value_ = sr_value; @@ -39,13 +39,13 @@ namespace TAO void RequestProcessingStrategy::strategy_init( TAO_Root_POA *poa - ACE_ENV_ARG_DECL_NOT_USED) + ) { poa_ = poa; } void - RequestProcessingStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + RequestProcessingStrategy::strategy_cleanup(void) { poa_ = 0; } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 19ae155a117..fa8fdc6f861 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -54,42 +54,42 @@ namespace TAO virtual void strategy_init( TAO_Root_POA *poa - ACE_ENV_ARG_DECL); + ); virtual void strategy_init( TAO_Root_POA *poa, ::PortableServer::ServantRetentionPolicyValue - ACE_ENV_ARG_DECL); + ); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); #if (TAO_HAS_MINIMUM_POA == 0) virtual PortableServer::ServantManager_ptr get_servant_manager ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) = 0; virtual void set_servant_manager ( PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) = 0; - virtual void set_servant (PortableServer::Servant servant ACE_ENV_ARG_DECL) + virtual void set_servant (PortableServer::Servant servant ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ - virtual PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL) + virtual PortableServer::Servant get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) = 0; virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual PortableServer::Servant locate_servant ( const char *operation, @@ -97,20 +97,20 @@ namespace TAO TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual PortableServer::Servant system_id_to_servant ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) = 0; @@ -119,7 +119,7 @@ namespace TAO virtual PortableServer::ObjectId *servant_to_id ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) = 0; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 718132bda26..9cac90d9060 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -24,7 +24,7 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ServantManager_ptr - RequestProcessingStrategyAOMOnly::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) + RequestProcessingStrategyAOMOnly::get_servant_manager (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -35,27 +35,27 @@ namespace TAO void RequestProcessingStrategyAOMOnly::set_servant_manager ( PortableServer::ServantManager_ptr /*imgr*/ - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { - ACE_THROW (PortableServer::POA::WrongPolicy ()); + throw (PortableServer::POA::WrongPolicy ()); } void RequestProcessingStrategyAOMOnly::set_servant ( PortableServer::Servant /*servant*/ - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { - ACE_THROW (PortableServer::POA::WrongPolicy ()); + throw (PortableServer::POA::WrongPolicy ()); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::Servant - RequestProcessingStrategyAOMOnly::get_servant (ACE_ENV_SINGLE_ARG_DECL) + RequestProcessingStrategyAOMOnly::get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -67,11 +67,11 @@ namespace TAO RequestProcessingStrategyAOMOnly::locate_servant ( const PortableServer::ObjectId & system_id, PortableServer::Servant & servant - ACE_ENV_ARG_DECL) + ) { return this->poa_->servant_present (system_id, servant - ACE_ENV_ARG_PARAMETER); + ); } PortableServer::Servant @@ -81,15 +81,14 @@ namespace TAO TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool & /*wait_occurred_restart_call*/ - ACE_ENV_ARG_DECL) + ) { PortableServer::Servant servant = 0; servant = this->poa_->find_servant (system_id, servant_upcall, poa_current_impl - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (servant == 0) { @@ -104,29 +103,29 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyAOMOnly::system_id_to_servant ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + ) { return this->poa_->find_servant (system_id - ACE_ENV_ARG_PARAMETER); + ); } PortableServer::Servant RequestProcessingStrategyAOMOnly::id_to_servant ( const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { return this->poa_->user_id_to_servant_i (id - ACE_ENV_ARG_PARAMETER); + ); } void RequestProcessingStrategyAOMOnly::cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL) + ) { if (servant) { @@ -134,8 +133,7 @@ namespace TAO Non_Servant_Upcall non_servant_upcall (*this->poa_); ACE_UNUSED_ARG (non_servant_upcall); - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_remove_ref (); } // This operation causes the association of the Object Id specified @@ -145,7 +143,7 @@ namespace TAO if (result != 0) { - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } } @@ -158,12 +156,12 @@ namespace TAO PortableServer::ObjectId * RequestProcessingStrategyAOMOnly::servant_to_id ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { - return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER); + return this->poa_->servant_to_user_id (servant); } void diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index 6e16c94e876..69555e2a84d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -43,26 +43,26 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ServantManager_ptr - get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) + get_servant_manager (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager (PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::Servant - get_servant (ACE_ENV_SINGLE_ARG_DECL) + get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); @@ -70,7 +70,7 @@ namespace TAO TAO_SERVANT_LOCATION locate_servant (const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + ); virtual PortableServer::Servant @@ -79,15 +79,15 @@ namespace TAO TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL); + ); virtual PortableServer::Servant system_id_to_servant ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL); + ); virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); @@ -95,13 +95,13 @@ namespace TAO virtual void cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL); + ); virtual void etherealize_objects (CORBA::Boolean etherealize_objects); virtual PortableServer::ObjectId *servant_to_id ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index 820605a1d42..1b4356873ea 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -43,10 +43,9 @@ namespace TAO void RequestProcessingStrategyAOMOnlyFactoryImpl::destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h index 44a9df665af..4c872b79d0c 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h @@ -40,7 +40,7 @@ namespace TAO virtual void destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 208b7770b31..659bd6847a8 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -30,14 +30,14 @@ namespace TAO void RequestProcessingStrategyDefaultServant::strategy_cleanup( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) { this->default_servant_ = 0; } PortableServer::ServantManager_ptr RequestProcessingStrategyDefaultServant::get_servant_manager ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -48,16 +48,16 @@ namespace TAO void RequestProcessingStrategyDefaultServant::set_servant_manager ( PortableServer::ServantManager_ptr /*imgr*/ - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { - ACE_THROW (PortableServer::POA::WrongPolicy ()); + throw (PortableServer::POA::WrongPolicy ()); } PortableServer::Servant RequestProcessingStrategyDefaultServant::get_servant ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -69,7 +69,7 @@ namespace TAO void RequestProcessingStrategyDefaultServant::set_servant ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -95,8 +95,7 @@ namespace TAO Non_Servant_Upcall non_servant_upcall (*this->poa_); ACE_UNUSED_ARG (non_servant_upcall); - servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_add_ref (); } } @@ -104,14 +103,13 @@ namespace TAO RequestProcessingStrategyDefaultServant::locate_servant ( const PortableServer::ObjectId & system_id, PortableServer::Servant & servant - ACE_ENV_ARG_DECL) + ) { TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND; location = this->poa_->servant_present (system_id, servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND); + ); if (location == TAO_SERVANT_NOT_FOUND) { @@ -131,15 +129,14 @@ namespace TAO TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool & /*wait_occurred_restart_call*/ - ACE_ENV_ARG_DECL) + ) { PortableServer::Servant servant = 0; servant = this->poa_->find_servant (system_id, servant_upcall, poa_current_impl - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (servant == 0) { @@ -168,15 +165,14 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyDefaultServant::system_id_to_servant ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + ) { PortableServer::Servant servant = this->default_servant_.in (); if (servant == 0) { servant = this->poa_->find_servant (system_id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } return servant; @@ -185,7 +181,7 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyDefaultServant::id_to_servant ( const PortableServer::ObjectId & /*id*/ - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -210,7 +206,7 @@ namespace TAO RequestProcessingStrategyDefaultServant::cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL) + ) { if (servant) { @@ -218,8 +214,7 @@ namespace TAO Non_Servant_Upcall non_servant_upcall (*this->poa_); ACE_UNUSED_ARG (non_servant_upcall); - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_remove_ref (); } // This operation causes the association of the Object Id specified @@ -229,7 +224,7 @@ namespace TAO if (result != 0) { - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } } @@ -242,7 +237,7 @@ namespace TAO PortableServer::ObjectId * RequestProcessingStrategyDefaultServant::servant_to_id ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -266,7 +261,7 @@ namespace TAO } } - return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER); + return this->poa_->servant_to_user_id (servant); } void diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index dea5baa5697..53b8fea0084 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -41,33 +41,33 @@ namespace TAO public: RequestProcessingStrategyDefaultServant (void); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); PortableServer::ServantManager_ptr - get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) + get_servant_manager (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager ( PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL) + PortableServer::Servant get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + ); virtual PortableServer::Servant locate_servant ( const char *operation, @@ -75,15 +75,15 @@ namespace TAO TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL); + ); virtual PortableServer::Servant system_id_to_servant ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL); + ); virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); @@ -91,13 +91,13 @@ namespace TAO virtual void cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL); + ); virtual void etherealize_objects (CORBA::Boolean etherealize_objects); virtual PortableServer::ObjectId *servant_to_id ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index 027240a7c2a..949eaa6a2b1 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -47,10 +47,9 @@ namespace TAO void RequestProcessingStrategyDefaultServantFactoryImpl::destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h index 220c4ffdfc1..6d97191bd48 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h @@ -42,7 +42,7 @@ namespace TAO virtual void destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h index 9ee872f1a90..bc7fbd65f87 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h @@ -43,7 +43,7 @@ namespace TAO virtual void destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index 138fee4eb92..f31beb3ca33 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -81,7 +81,7 @@ namespace TAO void RequestProcessingStrategyFactoryImpl::destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL) + ) { RequestProcessingStrategyFactory *strategy_factory = 0; @@ -127,8 +127,7 @@ namespace TAO if (strategy_factory != 0) { - strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + strategy_factory->destroy (strategy); } } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h index fa07f1c30a3..46139e3049a 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h @@ -39,7 +39,7 @@ namespace TAO virtual void destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index ab9874f5e5d..68b0fd5b809 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -29,7 +29,7 @@ namespace TAO void RequestProcessingStrategyServantActivator::strategy_cleanup ( - ACE_ENV_SINGLE_ARG_DECL) + void) { { Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -39,13 +39,12 @@ namespace TAO PortableServer::ServantActivator::_nil (); } - RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + RequestProcessingStrategy::strategy_cleanup (); } PortableServer::ServantManager_ptr RequestProcessingStrategyServantActivator::get_servant_manager ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -55,7 +54,7 @@ namespace TAO void RequestProcessingStrategyServantActivator::set_servant_manager ( PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -66,32 +65,29 @@ namespace TAO // standard minor code 6 being raised (see 11.3.9.12 of the corba spec) if (!CORBA::is_nil (this->servant_activator_.in ())) { - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6, CORBA::COMPLETED_NO)); } this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); this->validate_servant_manager (this->servant_activator_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } TAO_SERVANT_LOCATION RequestProcessingStrategyServantActivator::locate_servant ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL) + ) { TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND; location = this->poa_->servant_present (system_id, servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND); + ); if (location == TAO_SERVANT_NOT_FOUND) { @@ -111,15 +107,14 @@ namespace TAO TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + ) { PortableServer::Servant servant = 0; servant = this->poa_->find_servant (system_id, servant_upcall, poa_current_impl - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (servant != 0) { @@ -146,13 +141,11 @@ namespace TAO // this->validate_servant_manager (this->servant_activator_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); servant = this->incarnate_servant (poa_current_impl.object_id () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // If the incarnate operation returns a servant that is // already active for a different Object Id and if the POA @@ -203,8 +196,7 @@ namespace TAO this->etherealize_servant (poa_current_impl.object_id (), servant, cleanup_in_progress - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // We ended up waiting on a condition variable, the // POA state may have changed while we are waiting. @@ -221,7 +213,7 @@ namespace TAO const PortableServer::ObjectId& object_id, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean remaining_activations = this->poa_->servant_has_remaining_activations (servant); @@ -238,14 +230,13 @@ namespace TAO servant, cleanup_in_progress, remaining_activations - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } PortableServer::Servant RequestProcessingStrategyServantActivator::incarnate_servant ( const PortableServer::ObjectId& object_id - ACE_ENV_ARG_DECL) + ) { PortableServer::Servant servant = 0; @@ -259,8 +250,7 @@ namespace TAO // Invocations of incarnate and etherealize on the servant manager are mutually exclusive. servant = this->servant_activator_->incarnate (object_id, this->poa_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (servant == 0) { @@ -278,7 +268,7 @@ namespace TAO RequestProcessingStrategyServantActivator::cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL) + ) { // If a servant manager is associated with the POA, // ServantLocator::etherealize will be invoked with the oid and the @@ -313,8 +303,7 @@ namespace TAO this->etherealize_servant (user_id, servant, this->poa_->cleanup_in_progress () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { @@ -322,8 +311,7 @@ namespace TAO Non_Servant_Upcall non_servant_upcall (*this->poa_); ACE_UNUSED_ARG (non_servant_upcall); - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_remove_ref (); } } @@ -333,7 +321,7 @@ namespace TAO int result = this->poa_->unbind_using_user_id (user_id); if (result != 0) - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } void diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 559cc8ce071..0bff114eb4c 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -38,21 +38,21 @@ namespace TAO public: RequestProcessingStrategyServantActivator (void); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); - PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) + PortableServer::ServantManager_ptr get_servant_manager (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager (PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + ); virtual PortableServer::Servant locate_servant ( const char *operation, @@ -60,12 +60,12 @@ namespace TAO TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL); + ); virtual void cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL); + ); virtual void etherealize_objects (CORBA::Boolean etherealize_objects); @@ -76,12 +76,12 @@ namespace TAO private: PortableServer::Servant incarnate_servant ( const PortableServer::ObjectId& object_id - ACE_ENV_ARG_DECL); + ); void etherealize_servant (const PortableServer::ObjectId& object_id, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress - ACE_ENV_ARG_DECL); + ); private: PortableServer::ServantActivator_var servant_activator_; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index 7f57f08204f..00f26e37559 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -59,10 +59,9 @@ namespace TAO void RequestProcessingStrategyServantActivatorFactoryImpl::destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h index b9aae2ca3d6..6e3cef0f752 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h @@ -42,7 +42,7 @@ namespace TAO virtual void destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index aebefaa0118..1751bfab044 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -27,7 +27,7 @@ namespace TAO void RequestProcessingStrategyServantLocator::strategy_cleanup( - ACE_ENV_SINGLE_ARG_DECL) + void) { { Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -36,13 +36,12 @@ namespace TAO this->servant_locator_ = PortableServer::ServantLocator::_nil (); } - RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + RequestProcessingStrategy::strategy_cleanup (); } PortableServer::ServantManager_ptr RequestProcessingStrategyServantLocator::get_servant_manager ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -52,7 +51,7 @@ namespace TAO void RequestProcessingStrategyServantLocator::set_servant_manager ( PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -63,30 +62,27 @@ namespace TAO // standard minor code 6 being raised (see 11.3.9.12 of the corba spec) if (!CORBA::is_nil (this->servant_locator_.in ())) { - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6, CORBA::COMPLETED_NO)); } this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); - this->validate_servant_manager (this->servant_locator_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->validate_servant_manager (this->servant_locator_.in ()); } TAO_SERVANT_LOCATION RequestProcessingStrategyServantLocator::locate_servant ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL) + ) { TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND; location = this->poa_->servant_present (system_id, servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND); + ); if (location == TAO_SERVANT_NOT_FOUND) { @@ -106,15 +102,14 @@ namespace TAO TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool &/*wait_occurred_restart_call*/ - ACE_ENV_ARG_DECL) + ) { PortableServer::Servant servant = 0; servant = this->poa_->find_servant (system_id, servant_upcall, poa_current_impl - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (servant != 0) { @@ -140,8 +135,7 @@ namespace TAO // reference. // - this->validate_servant_manager (this->servant_locator_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->validate_servant_manager (this->servant_locator_.in ()); // No serialization of invocations of preinvoke or // postinvoke may be assumed; there may be multiple @@ -169,8 +163,7 @@ namespace TAO this->poa_, operation, cookie - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (servant == 0) { @@ -193,7 +186,7 @@ namespace TAO RequestProcessingStrategyServantLocator::cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL) + ) { if (servant) { @@ -201,8 +194,7 @@ namespace TAO Non_Servant_Upcall non_servant_upcall (*this->poa_); ACE_UNUSED_ARG (non_servant_upcall); - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_remove_ref (); } // This operation causes the association of the Object Id specified @@ -212,7 +204,7 @@ namespace TAO if (result != 0) { - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } } @@ -234,22 +226,19 @@ namespace TAO if (!CORBA::is_nil (this->servant_locator_.in ())) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { servant_locator_->postinvoke (system_id, this->poa_, servant_upcall.operation (), servant_upcall.locator_cookie (), servant_upcall.servant () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Ignore errors from servant locator .... } - ACE_ENDTRY; } } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index 255c5448cfd..d8421919159 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -38,23 +38,23 @@ namespace TAO public: RequestProcessingStrategyServantLocator (void); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); PortableServer::ServantManager_ptr get_servant_manager ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager ( PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + ); virtual void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, @@ -66,12 +66,12 @@ namespace TAO TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL); + ); virtual void cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL); + ); virtual void etherealize_objects (CORBA::Boolean etherealize_objects); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index 9e5c094dd4f..8ba3bc27b77 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -59,10 +59,9 @@ namespace TAO void RequestProcessingStrategyServantLocatorFactoryImpl::destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h index adce55b71f2..eb36b20eba1 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h @@ -42,7 +42,7 @@ namespace TAO virtual void destroy ( RequestProcessingStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 580cbb8fdc1..3295d72c44a 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -25,7 +25,7 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyServantManager::get_servant ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -36,25 +36,25 @@ namespace TAO void RequestProcessingStrategyServantManager::set_servant ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { ACE_UNUSED_ARG (servant); - ACE_THROW (PortableServer::POA::WrongPolicy ()); + throw (PortableServer::POA::WrongPolicy ()); } void RequestProcessingStrategyServantManager::validate_servant_manager ( PortableServer::ServantManager_ptr servant_manager - ACE_ENV_ARG_DECL) + ) { // When no servant manager is set, give an exception with minor code 4, // see 11.3.8.6 of the corba spec if (CORBA::is_nil (servant_manager)) { - ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 4, + throw ( ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO)); } } @@ -62,32 +62,32 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyServantManager::system_id_to_servant ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + ) { return this->poa_->find_servant (system_id - ACE_ENV_ARG_PARAMETER); + ); } PortableServer::ObjectId * RequestProcessingStrategyServantManager::servant_to_id ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { - return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER); + return this->poa_->servant_to_user_id (servant); } PortableServer::Servant RequestProcessingStrategyServantManager::id_to_servant ( const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { - return this->poa_->user_id_to_servant_i (id ACE_ENV_ARG_PARAMETER); + return this->poa_->user_id_to_servant_i (id); } ::PortableServer::RequestProcessingPolicyValue diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index ee152e2585e..be63e7652ae 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -37,32 +37,32 @@ namespace TAO public: RequestProcessingStrategyServantManager (void); - PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL) + PortableServer::Servant get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - void set_servant (PortableServer::Servant servant ACE_ENV_ARG_DECL) + void set_servant (PortableServer::Servant servant ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void validate_servant_manager ( PortableServer::ServantManager_ptr servant_manager - ACE_ENV_ARG_DECL); + ); virtual PortableServer::Servant system_id_to_servant ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL); + ); virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); virtual PortableServer::ObjectId *servant_to_id ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 2eebbc9fa21..b5b8dec77d9 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -80,15 +80,13 @@ TAO_Root_POA::objectkey_prefix [TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE] = { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ThreadPolicy_ptr -TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value - ACE_ENV_ARG_DECL) +TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::ThreadPolicy *policy = 0; ACE_NEW_THROW_EX (policy, TAO::Portable_Server::ThreadPolicy (value), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ()); return policy; } @@ -98,15 +96,13 @@ TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value #if !defined (CORBA_E_MICRO) PortableServer::LifespanPolicy_ptr -TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value - ACE_ENV_ARG_DECL) +TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::LifespanPolicy *policy = 0; ACE_NEW_THROW_EX (policy, TAO::Portable_Server::LifespanPolicy (value), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ()); return policy; } @@ -115,15 +111,13 @@ TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value #if !defined (CORBA_E_MICRO) PortableServer::IdUniquenessPolicy_ptr -TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value - ACE_ENV_ARG_DECL) +TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::IdUniquenessPolicy *policy = 0; ACE_NEW_THROW_EX (policy, TAO::Portable_Server::IdUniquenessPolicy (value), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ()); return policy; } @@ -131,15 +125,13 @@ TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyVal #if !defined (CORBA_E_MICRO) PortableServer::IdAssignmentPolicy_ptr -TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value - ACE_ENV_ARG_DECL) +TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::IdAssignmentPolicy *policy = 0; ACE_NEW_THROW_EX (policy, TAO::Portable_Server::IdAssignmentPolicy (value), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ()); return policy; } @@ -148,43 +140,37 @@ TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyVal #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ImplicitActivationPolicy_ptr -TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value - ACE_ENV_ARG_DECL) +TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::ImplicitActivationPolicy *policy = 0; ACE_NEW_THROW_EX (policy, TAO::Portable_Server::ImplicitActivationPolicy (value), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ()); return policy; } PortableServer::ServantRetentionPolicy_ptr -TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value - ACE_ENV_ARG_DECL) +TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::ServantRetentionPolicy *policy = 0; ACE_NEW_THROW_EX (policy, TAO::Portable_Server::ServantRetentionPolicy (value), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ()); return policy; } PortableServer::RequestProcessingPolicy_ptr -TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value - ACE_ENV_ARG_DECL) +TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::RequestProcessingPolicy *policy = 0; ACE_NEW_THROW_EX (policy, TAO::Portable_Server::RequestProcessingPolicy (value), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ()); return policy; } @@ -193,18 +179,14 @@ TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessin void TAO_Root_POA::set_obj_ref_factory ( - PortableInterceptor::ObjectReferenceFactory *current_factory - ACE_ENV_ARG_DECL) + PortableInterceptor::ObjectReferenceFactory *current_factory) { - TAO::ORT_Adapter *adapter = this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + TAO::ORT_Adapter *adapter = this->ORT_adapter (); if (adapter) { // Activate a different factory - this->ort_adapter_->set_obj_ref_factory (current_factory - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->ort_adapter_->set_obj_ref_factory (current_factory); } } @@ -215,8 +197,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + TAO_Object_Adapter *object_adapter) : name_ (name), poa_manager_ (* (dynamic_cast <TAO_POA_Manager*> (poa_manager))), @@ -261,9 +242,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, // Parse the policies that are used in the critical path in // a cache. - this->cached_policies_.update (this->policies_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->cached_policies_.update (this->policies_); #if (TAO_HAS_MINIMUM_POA == 1) // If this is the RootPOA, set the value of the ImplicitActivationPolicy @@ -284,9 +263,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, // Set the active strategies to be used by this POA this->active_policy_strategies_.update (this->cached_policies_, - this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this); // Set the folded name of this POA. this->set_folded_name (parent); @@ -295,7 +272,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, int result = this->poa_manager_.register_poa (this); if (result != 0) { - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } // Add self to Object Adapter class. @@ -309,28 +286,25 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, // further errors... this->poa_manager_.remove_poa (this); - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } // Set the id for this POA. this->set_id (parent); // Notify the Lifespan strategy of our startup - ACE_TRY + try { - this->active_policy_strategies_.lifespan_strategy()->notify_startup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->active_policy_strategies_.lifespan_strategy()->notify_startup (); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { this->poa_manager_.remove_poa (this); this->object_adapter ().unbind_poa (this, this->folded_name_, this->system_name_.in ()); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } TAO_Root_POA::~TAO_Root_POA (void) @@ -339,7 +313,7 @@ TAO_Root_POA::~TAO_Root_POA (void) } void -TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::complete_destruction_i (void) { // No longer awaiting destruction. this->waiting_destruction_ = 0; @@ -348,18 +322,17 @@ TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL) int result = this->poa_manager_.remove_poa (this); if (result != 0) - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); // Remove POA from the Object Adapter. result = this->object_adapter ().unbind_poa (this, this->folded_name_, this->system_name_.in ()); if (result != 0) - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); // Cleanup all strategies - this->active_policy_strategies_.cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->active_policy_strategies_.cleanup (); // Forced cleanup. The new memory management scheme is evil and can // lead to reference deadlock, i.e., POA holds object A, but POA @@ -390,8 +363,7 @@ TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL) PortableServer::POA_ptr TAO_Root_POA::create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, - const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) + const CORBA::PolicyList &policies) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -401,14 +373,10 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, TAO_POA_Policy_Set tao_policies (this->object_adapter ().default_poa_policies ()); // Merge policies from the ORB level. - this->object_adapter ().validator ().merge_policies (tao_policies.policies () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + this->object_adapter ().validator ().merge_policies (tao_policies.policies ()); // Merge in any policies that the user may have specified. - tao_policies.merge_policies (policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + tao_policies.merge_policies (policies); // If any of the policy objects specified are not valid for the ORB // implementation, if conflicting policy objects are specified, or @@ -417,9 +385,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, // InvalidPolicy exception is raised containing the index in the // policies parameter value of the first offending policy object. tao_policies.validate_policies (this->object_adapter ().validator (), - this->orb_core_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + this->orb_core_); // If the poa_manager parameter is null, a new POAManager object is // created and associated with the new POA. Otherwise, the specified @@ -440,8 +406,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, while (!CORBA::is_nil (poa.in ())) { root_poa = poa; - poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + poa = poa->the_parent (); } // Get the POAManagerFactory instance owned by RootPOA. @@ -454,8 +419,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, // is created. the_poa_manager = tao_poa_manager_factory->create_POAManager (0, - empty_policies - ACE_ENV_ARG_PARAMETER); + empty_policies); #else PortableServer::POAManager_ptr the_poa_manager_ptr; @@ -465,7 +429,6 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, the_poa_manager = the_poa_manager_ptr; #endif /* TAO_HAS_MINIMUM_POA == 0 && ! CORBA_E_COMPACT) */ - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); } else { @@ -474,9 +437,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, PortableServer::POA_var poa = this->create_POA_i (adapter_name, the_poa_manager.in (), - tao_policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + tao_policies); return poa._retn (); } @@ -490,8 +451,7 @@ TAO_Root_POA::new_POA (const String &name, ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + TAO_Object_Adapter *object_adapter) { TAO_Regular_POA *poa = 0; @@ -503,10 +463,8 @@ TAO_Root_POA::new_POA (const String &name, lock, thread_lock, orb_core, - object_adapter - ACE_ENV_ARG_PARAMETER), + object_adapter), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return poa; } @@ -515,8 +473,7 @@ TAO_Root_POA::new_POA (const String &name, PortableServer::POA_ptr TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name, PortableServer::POAManager_ptr poa_manager, - const TAO_POA_Policy_Set &policies - ACE_ENV_ARG_DECL) + const TAO_POA_Policy_Set &policies) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -551,8 +508,7 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name, this->object_adapter ().lock (), this->object_adapter ().thread_lock (), this->orb_core_, - this->object_adapter_ - ACE_ENV_ARG_PARAMETER); + this->object_adapter_); // Give ownership of the new map to the POA_var. Note, that it // is important for the POA_var to take ownership before @@ -560,7 +516,6 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name, PortableServer::POA_var new_poa = poa; // Check for exception in construction of the POA. - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Add to children map result = this->children_.bind (adapter_name, @@ -580,8 +535,7 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name, // Iterate over the registered IOR interceptors so that they may be // given the opportunity to add tagged components to the profiles // for this servant. - poa->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + poa->establish_components (); // Note: Creating a POA using a POA manager that is in the active // state can lead to race conditions if the POA supports preexisting @@ -603,18 +557,14 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name, #if ! defined (CORBA_E_MICRO) PortableServer::POA_ptr TAO_Root_POA::find_POA (const char *adapter_name, - CORBA::Boolean activate_it - ACE_ENV_ARG_DECL) + CORBA::Boolean activate_it) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - TAO_Root_POA *poa = this->find_POA_i (adapter_name, - activate_it - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + TAO_Root_POA *poa = this->find_POA_i (adapter_name, activate_it); return PortableServer::POA::_duplicate (poa); } @@ -623,8 +573,7 @@ TAO_Root_POA::find_POA (const char *adapter_name, #if ! defined (CORBA_E_MICRO) TAO_Root_POA * TAO_Root_POA::find_POA_i (const ACE_CString &child_name, - CORBA::Boolean activate_it - ACE_ENV_ARG_DECL) + CORBA::Boolean activate_it) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)) { @@ -641,11 +590,10 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name, if (!CORBA::is_nil (this->adapter_activator_.in ())) { // Check our state - this->check_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_state (); CORBA::Boolean success = false; - ACE_TRY_EX (UnknownAdapter) + try { // ATTENTION: Trick locking here, see class header for details TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall ( @@ -658,18 +606,13 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name, success = this->adapter_activator_->unknown_adapter ( this, - child_name.c_str () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (UnknownAdapter); + child_name.c_str ()); } - ACE_CATCH (CORBA::SystemException, ex) + catch ( ::CORBA::SystemException&) { - ACE_TRY_THROW_EX (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 1, - CORBA::COMPLETED_NO), - UnknownAdapter); + throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 1, + CORBA::COMPLETED_NO); } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); if (success) { @@ -718,8 +661,7 @@ TAO_Root_POA::tao_poa_manager () PortableServer::POA_ptr TAO_Root_POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, - const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) + const CORBA::PolicyList &policies) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -729,14 +671,12 @@ TAO_Root_POA::create_POA (const char *adapter_name, return this->create_POA_i (adapter_name, poa_manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); } #endif PortableServer::ObjectId * -TAO_Root_POA::servant_to_id (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +TAO_Root_POA::servant_to_id (PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -746,24 +686,21 @@ TAO_Root_POA::servant_to_id (PortableServer::Servant servant // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->servant_to_id_i (servant - ACE_ENV_ARG_PARAMETER); + return this->servant_to_id_i (servant); } PortableServer::ObjectId * -TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.servant_retention_strategy()-> - servant_to_user_id (servant ACE_ENV_ARG_PARAMETER); + servant_to_user_id (servant); } PortableServer::Servant -TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference - ACE_ENV_ARG_DECL) +TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, @@ -772,37 +709,33 @@ TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->reference_to_servant_i (reference - ACE_ENV_ARG_PARAMETER); + return this->reference_to_servant_i (reference); } CORBA::Object_ptr -TAO_Root_POA::servant_to_reference (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +TAO_Root_POA::servant_to_reference (PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { TAO_POA_GUARD_RETURN (CORBA::Object::_nil ()); - return this->servant_to_reference_i (servant - ACE_ENV_ARG_PARAMETER); + return this->servant_to_reference_i (servant); } PortableServer::POAList * -TAO_Root_POA::the_children (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::the_children (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->the_children_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->the_children_i (); } PortableServer::Servant -TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) +TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -810,13 +743,11 @@ TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->id_to_servant_i (oid - ACE_ENV_ARG_PARAMETER); + return this->id_to_servant_i (oid); } CORBA::Object_ptr -TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) +TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -824,14 +755,13 @@ TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->id_to_reference_i (oid, true ACE_ENV_ARG_PARAMETER); + return this->id_to_reference_i (oid, true); } CORBA::Object_ptr TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id, - const char *intf - ACE_ENV_ARG_DECL) + const char *intf) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. @@ -839,38 +769,32 @@ TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id, return this->create_reference_with_id_i (id, intf, - this->server_priority () - ACE_ENV_ARG_PARAMETER); + this->server_priority ()); } void TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + CORBA::Boolean wait_for_completion) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. - TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER, 0); - ACE_CHECK; + TAO::Portable_Server::POA_Guard poa_guard (*this , 0); ACE_UNUSED_ARG (poa_guard); this->destroy_i (etherealize_objects, - wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + wait_for_completion); } void -TAO_Root_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Root_POA::remove_from_parent_i (void) { // The root poa has no parent, so this is a noop } void TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + CORBA::Boolean wait_for_completion) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->cleanup_in_progress_) @@ -878,9 +802,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects, // Is the <wait_for_completion> semantics for this thread correct? TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (), - wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + wait_for_completion); this->cleanup_in_progress_ = 1; @@ -895,8 +817,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects, // re-creation of its associated POA in the same process.) // Remove POA from the parent - this->remove_from_parent_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->remove_from_parent_i (); TAO::ORT_Array array_obj_ref_template (1); @@ -931,9 +852,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects, // Notify the state changes to the IORInterceptors this->adapter_state_changed (array_obj_ref_template, - PortableInterceptor::INACTIVE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + PortableInterceptor::INACTIVE); if (adapter != 0) adapter->release (array_obj_ref_template[0]); @@ -949,15 +868,11 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects, TAO_Root_POA *destroy_child_poa = (*destroy_iterator).int_id_; destroy_child_poa->destroy_i (etherealize_objects, - wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + wait_for_completion); } // Notify the lifespan strategy of our shutdown - this->active_policy_strategies_.lifespan_strategy()->notify_shutdown ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->active_policy_strategies_.lifespan_strategy()->notify_shutdown (); // @todo, is the exception handling above correct, should we just fail when // the notify above fails @@ -974,9 +889,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects, // destroying the POAs. this->deactivate_all_objects_i (etherealize_objects, - wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + wait_for_completion); // If there are no outstanding requests and that we are not in a // non-servant upcall or if we are in a non-servant upcall, make @@ -1014,15 +927,12 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects, // it. (a hack). PortableServer::POA_var poa = PortableServer::POA::_duplicate (this); - this->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->complete_destruction_i (); this->adapter_state_ = PortableInterceptor::NON_EXISTENT; this->adapter_state_changed (my_array_obj_ref_template, - this->adapter_state_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->adapter_state_); if (ort_adapter != 0) { @@ -1061,7 +971,7 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child) } PortableServer::POAList * -TAO_Root_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::the_children_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAList_var children; @@ -1070,7 +980,6 @@ TAO_Root_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (children, PortableServer::POAList (child_current), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); children->length (child_current); @@ -1087,7 +996,7 @@ TAO_Root_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL) } PortableInterceptor::AdapterName * -TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::adapter_name_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // The adapter name is the sequence of names starting from the @@ -1103,8 +1012,7 @@ TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) // parent. while (!CORBA::is_nil (poa.in ())) { - poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + poa = poa->the_parent (); ++len; } @@ -1118,7 +1026,6 @@ TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); PortableInterceptor::AdapterName_var safe_names (names); @@ -1133,11 +1040,9 @@ TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) CORBA::ULong ilen = len; for (CORBA::ULong i = 1; i < len; ++i) { - (*names)[--ilen] = poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + (*names)[--ilen] = poa->the_name (); - poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + poa = poa->the_parent (); // If this condition asserts, the POA hierarchy was modified // (i.e. reduced in size) by another thread! @@ -1149,8 +1054,7 @@ TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) void TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile, - const IOP::TaggedComponent &component - ACE_ENV_ARG_DECL) + const IOP::TaggedComponent &component) ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles. @@ -1160,9 +1064,7 @@ TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile, { TAO_Profile *profile = mprofile.get_profile (i); - profile->add_tagged_component (component - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + profile->add_tagged_component (component); } } @@ -1170,8 +1072,7 @@ void TAO_Root_POA::add_ior_component_to_profile ( TAO_MProfile & mprofile, const IOP::TaggedComponent &component, - IOP::ProfileId profile_id - ACE_ENV_ARG_DECL) + IOP::ProfileId profile_id) ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles matching the given @@ -1186,9 +1087,7 @@ TAO_Root_POA::add_ior_component_to_profile ( if (profile->tag () == profile_id) { - profile->add_tagged_component (component - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + profile->add_tagged_component (component); found_profile = true; } @@ -1198,15 +1097,14 @@ TAO_Root_POA::add_ior_component_to_profile ( // supposed to throw a CORBA::BAD_PARAM exception if no profile // matched the given ProfileId. if (found_profile == false) - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 29, + throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 29, CORBA::COMPLETED_NO)); } void TAO_Root_POA::adapter_state_changed ( const TAO::ORT_Array &array_obj_ref_template, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + PortableInterceptor::AdapterState state) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IORInterceptor_Adapter *ior_adapter = @@ -1214,18 +1112,14 @@ TAO_Root_POA::adapter_state_changed ( if (ior_adapter) { - ior_adapter->adapter_state_changed (array_obj_ref_template, - state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ior_adapter->adapter_state_changed (array_obj_ref_template, state); } } PortableServer::ObjectId * TAO_Root_POA::activate_object_i (PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + bool &wait_occurred_restart_call) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) @@ -1233,13 +1127,11 @@ TAO_Root_POA::activate_object_i (PortableServer::Servant servant, return this->active_policy_strategies_.servant_retention_strategy()-> activate_object (servant, priority, - wait_occurred_restart_call - ACE_ENV_ARG_PARAMETER); + wait_occurred_restart_call); } PortableServer::ObjectId * -TAO_Root_POA::activate_object (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +TAO_Root_POA::activate_object (PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) @@ -1254,9 +1146,7 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant PortableServer::ObjectId *result = this->activate_object_i (servant, this->server_priority (), - wait_occurred_restart_call - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + wait_occurred_restart_call); // If we ended up waiting on a condition variable, the POA state // may have changed while we are waiting. Therefore, we need to @@ -1271,8 +1161,7 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant #if !defined (CORBA_E_MICRO) void TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id, - PortableServer::Servant servant - ACE_ENV_ARG_DECL) + PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -1288,9 +1177,7 @@ TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id, this->activate_object_with_id_i (id, servant, this->server_priority (), - wait_occurred_restart_call - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + wait_occurred_restart_call); // If we ended up waiting on a condition variable, the POA state // may have changed while we are waiting. Therefore, we need to @@ -1308,8 +1195,7 @@ void TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + bool &wait_occurred_restart_call) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -1319,31 +1205,23 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, activate_object_with_id (id, servant, priority, - wait_occurred_restart_call - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + wait_occurred_restart_call); } #endif void TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + CORBA::Boolean wait_for_completion) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { - this->deactivate_all_objects_i (etherealize_objects - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->deactivate_all_objects_i (etherealize_objects); - this->wait_for_completions (wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->wait_for_completions (wait_for_completion); } void -TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) +TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion) { while (this->object_adapter ().enable_locking_ && wait_for_completion && @@ -1354,7 +1232,7 @@ TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion int result = this->outstanding_requests_condition_.wait (); if (result == -1) { - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } } } @@ -1362,8 +1240,7 @@ TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion /* static */ void TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core, - CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + CORBA::Boolean wait_for_completion) { if (wait_for_completion) { @@ -1384,7 +1261,7 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core { // CORBA 2.3 specifies which minor code corresponds // to this particular problem. - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 3, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 3, CORBA::COMPLETED_NO)); } } @@ -1398,8 +1275,7 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core } void -TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects - ACE_ENV_ARG_DECL) +TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1407,12 +1283,11 @@ TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects etherealize_objects (etherealize_objects); this->active_policy_strategies_.servant_retention_strategy ()-> - deactivate_all_objects (ACE_ENV_SINGLE_ARG_PARAMETER); + deactivate_all_objects (); } void -TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) +TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -1420,23 +1295,18 @@ TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid // Lock access for the duration of this transaction. TAO_POA_GUARD; - this->deactivate_object_i (oid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->deactivate_object_i (oid); } void -TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) +TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { this->active_policy_strategies_.servant_retention_strategy()-> - deactivate_object (id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + deactivate_object (id); } CORBA::Boolean @@ -1446,8 +1316,7 @@ TAO_Root_POA::is_persistent (void) const } CORBA::Object_ptr -TAO_Root_POA::create_reference (const char *intf - ACE_ENV_ARG_DECL) +TAO_Root_POA::create_reference (const char *intf) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1455,14 +1324,12 @@ TAO_Root_POA::create_reference (const char *intf TAO_POA_GUARD_RETURN (CORBA::Object::_nil ()); return this->create_reference_i (intf, - this->server_priority () - ACE_ENV_ARG_PARAMETER); + this->server_priority ()); } CORBA::Object_ptr TAO_Root_POA::create_reference_i (const char *intf, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1473,13 +1340,12 @@ TAO_Root_POA::create_reference_i (const char *intf, } return this->active_policy_strategies_.servant_retention_strategy()-> - create_reference (intf, priority ACE_ENV_ARG_PARAMETER); + create_reference (intf, priority); } CORBA::Object_ptr TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id, - const PortableServer::ObjectId & id - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId & id) ACE_THROW_SPEC ((CORBA::SystemException)) { const PortableInterceptor::ObjectId &user_oid = @@ -1490,20 +1356,18 @@ TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id, { // Ask the ORT to create the object. return this->ort_adapter_->make_object (repository_id, - user_oid - ACE_ENV_ARG_PARAMETER); + user_oid); } else { - return this->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->invoke_key_to_object (); } } CORBA::Object_ptr TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, const char *intf, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException)) { // If the POA has the SYSTEM_ID policy and it detects that the @@ -1524,34 +1388,31 @@ TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_i } return this->active_policy_strategies_.servant_retention_strategy()-> - create_reference_with_id (user_id, intf, priority ACE_ENV_ARG_PARAMETER); + create_reference_with_id (user_id, intf, priority); } PortableServer::ObjectId * -TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.request_processing_strategy()-> - servant_to_id (servant ACE_ENV_ARG_PARAMETER); + servant_to_id (servant); } CORBA::Object_ptr -TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.servant_retention_strategy()-> - servant_to_reference (servant ACE_ENV_ARG_PARAMETER); + servant_to_reference (servant); } PortableServer::Servant -TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference - ACE_ENV_ARG_DECL) +TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, @@ -1566,8 +1427,7 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference PortableServer::ObjectId system_id; bool const is_generated = - this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->is_poa_generated (reference, system_id); if (!is_generated) { @@ -1579,8 +1439,7 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference PortableServer::Servant servant = this->active_policy_strategies_.request_processing_strategy()-> - system_id_to_servant (system_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + system_id_to_servant (system_id); if (servant != 0) { @@ -1595,8 +1454,7 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference // conforming caller need not invoke _remove_ref on the returned // Servant if the type of the Servant uses the default reference // counting inherited from ServantBase. - servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + servant->_add_ref (); } return servant; @@ -1604,11 +1462,9 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference bool TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference, - PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + PortableServer::ObjectId &system_id) { - TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + TAO::ObjectKey_var key = reference->_key (); TAO_Object_Adapter::poa_name poa_system_name; CORBA::Boolean is_root = false; @@ -1642,7 +1498,7 @@ TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference, PortableServer::ObjectId * TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)) @@ -1663,8 +1519,7 @@ TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference PortableServer::ObjectId system_id; bool const is_generated = this->is_poa_generated (reference, system_id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!is_generated) { @@ -1676,15 +1531,15 @@ TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference TAO_POA_GUARD_RETURN (0); return this->active_policy_strategies_.servant_retention_strategy()-> - system_id_to_object_id (system_id ACE_ENV_ARG_PARAMETER); + system_id_to_object_id (system_id); } PortableServer::Servant TAO_Root_POA::find_servant (const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + ) { return this->active_policy_strategies_.servant_retention_strategy()-> - find_servant (system_id ACE_ENV_ARG_PARAMETER); + find_servant (system_id); } int @@ -1698,15 +1553,15 @@ void TAO_Root_POA::cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL) + ) { this->active_policy_strategies_.request_processing_strategy()-> - cleanup_servant (servant, user_id ACE_ENV_ARG_PARAMETER); + cleanup_servant (servant, user_id); } PortableServer::Servant TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -1714,8 +1569,7 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id PortableServer::Servant servant = this->active_policy_strategies_.request_processing_strategy()-> - id_to_servant (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + id_to_servant (id); if (servant != 0) { @@ -1730,8 +1584,7 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id // conforming caller need not invoke _remove_ref on the returned // Servant if the type of the Servant uses the default reference // counting inherited from ServantBase. - servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + servant->_add_ref (); } return servant; @@ -1739,36 +1592,35 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id PortableServer::Servant TAO_Root_POA::user_id_to_servant_i (const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.servant_retention_strategy()-> - user_id_to_servant (id ACE_ENV_ARG_PARAMETER); + user_id_to_servant (id); } CORBA::Object_ptr TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id, bool indirect - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.servant_retention_strategy()-> - id_to_reference (id, indirect ACE_ENV_ARG_PARAMETER); + id_to_reference (id, indirect); } CORBA::OctetSeq * -TAO_Root_POA::id (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::OctetSeq *id = 0; ACE_NEW_THROW_EX (id, CORBA::OctetSeq (this->id_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return id; } @@ -1779,7 +1631,7 @@ TAO_Root_POA::locate_servant_i (const char *operation, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + ) { return this->active_policy_strategies_.request_processing_strategy()-> locate_servant (operation, @@ -1787,7 +1639,7 @@ TAO_Root_POA::locate_servant_i (const char *operation, servant_upcall, poa_current_impl, wait_occurred_restart_call - ACE_ENV_ARG_PARAMETER); + ); } /* static */ @@ -2137,7 +1989,7 @@ TAO_Root_POA::object_adapter (void) } CORBA::Object_ptr -TAO_Root_POA::invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::invoke_key_to_object (void) { PortableServer::ObjectId_var &system_id = *this->key_to_object_params_.system_id_; @@ -2152,7 +2004,7 @@ TAO_Root_POA::invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL) this->key_to_object_params_.collocated_, this->key_to_object_params_.priority_, this->key_to_object_params_.indirect_ - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Object_ptr @@ -2162,13 +2014,12 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key, CORBA::Boolean collocated, CORBA::Short priority, bool indirect - ACE_ENV_ARG_DECL) + ) { // Check if the ORB is still running, otherwise throw an exception. // @@ What if the ORB was destroyed? In that case we shouldn't even // get here! - this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->orb_core_.check_shutdown (); // // ImplRepo related. @@ -2197,8 +2048,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key, } CORBA::String_var imr_str = - imr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (obj); + imr->_stubobj ()->profile_in_use ()->to_string (); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -2240,8 +2090,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key, obj = this->orb_core_.orb ()->string_to_object (ior.c_str () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (obj); + ); return obj; } @@ -2253,8 +2102,7 @@ orbkey: #endif /* TAO_HAS_MINIMUM_CORBA */ TAO_Stub *data = - this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->key_to_stub_i (key, type_id, priority); TAO_Stub_Auto_Ptr safe_data (data); @@ -2267,7 +2115,6 @@ orbkey: servant), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); } else { @@ -2275,7 +2122,6 @@ orbkey: CORBA::Object (data, collocated), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); } data->servant_orb (this->orb_core_.orb ()); @@ -2290,27 +2136,25 @@ TAO_Stub * TAO_Root_POA::key_to_stub (const TAO::ObjectKey &key, const char *type_id, CORBA::Short priority - ACE_ENV_ARG_DECL) + ) { // Check if the ORB is still running, otherwise throw an exception. // @@ What if the ORB was destroyed? In that case we shouldn't even // get here! - this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->orb_core_.check_shutdown (); - return this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER); + return this->key_to_stub_i (key, type_id, priority); } TAO_Stub * TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key, const char *type_id, CORBA::Short priority - ACE_ENV_ARG_DECL) + ) { CORBA::PolicyList_var client_exposed_policies = this->client_exposed_policies (priority - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); TAO_Acceptor_Filter* filter = 0; @@ -2337,42 +2181,39 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key, client_exposed_policies._retn (), filter, this->orb_core_.lane_resources ().acceptor_registry () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); return data; } void -TAO_Root_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::establish_components (void) { TAO_IORInterceptor_Adapter *ior_adapter = this->orb_core_.ior_interceptor_adapter (); if (ior_adapter) { - ior_adapter->establish_components (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ior_adapter->establish_components (this); } } void TAO_Root_POA::components_established (PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + ) { TAO_IORInterceptor_Adapter *ior_adapter = this->orb_core_.ior_interceptor_adapter (); if (ior_adapter) { - ior_adapter->components_established (info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ior_adapter->components_established (info); } } void TAO_Root_POA::save_ior_component (const IOP::TaggedComponent &component - ACE_ENV_ARG_DECL_NOT_USED) + ) { const CORBA::ULong old_len = this->tagged_component_.length (); @@ -2383,8 +2224,7 @@ TAO_Root_POA::save_ior_component (const IOP::TaggedComponent &component void TAO_Root_POA:: save_ior_component_and_profile_id (const IOP::TaggedComponent &component, - IOP::ProfileId profile_id - ACE_ENV_ARG_DECL_NOT_USED) + IOP::ProfileId profile_id) { // The length of this->tagged_component_id_ is the same as the // length of the profile_id_array_ since we are trying to make a @@ -2408,8 +2248,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key, const char *type_id, CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, - TAO_Acceptor_Registry &acceptor_registry - ACE_ENV_ARG_DECL) + TAO_Acceptor_Registry &acceptor_registry) { int error = 0; @@ -2468,8 +2307,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key, this->orb_core_.create_stub_object (mprofile, type_id, policy_list - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // Add the saved tagged components methods to the profiles. CORBA::ULong len = this->tagged_component_.length (); @@ -2477,8 +2315,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key, { this->add_ior_component (mprofile, this->tagged_component_[i] - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } len = this->tagged_component_id_.length (); @@ -2488,8 +2325,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key, this->add_ior_component_to_profile (mprofile, this->tagged_component_id_[k], this->profile_id_array_[k] - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } return stub; @@ -2497,21 +2333,19 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key, CORBA::PolicyList * TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */ - ACE_ENV_ARG_DECL) + ) { CORBA::PolicyList *client_exposed_policies = 0; ACE_NEW_THROW_EX (client_exposed_policies, CORBA::PolicyList (), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); CORBA::PolicyList_var policies = client_exposed_policies; // Add in all of the client exposed policies. this->policies_.add_client_exposed_fixed_policies (client_exposed_policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); return policies._retn (); } @@ -2519,19 +2353,19 @@ TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */ TAO_SERVANT_LOCATION TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL) + ) { return this->active_policy_strategies_.request_processing_strategy()-> - locate_servant (system_id, servant ACE_ENV_ARG_PARAMETER); + locate_servant (system_id, servant); } TAO_SERVANT_LOCATION TAO_Root_POA::servant_present (const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL) + ) { return this->active_policy_strategies_.servant_retention_strategy()-> - servant_present (system_id, servant ACE_ENV_ARG_PARAMETER); + servant_present (system_id, servant); } PortableServer::Servant @@ -2539,25 +2373,25 @@ TAO_Root_POA::find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl - ACE_ENV_ARG_DECL) + ) { return this->active_policy_strategies_.servant_retention_strategy()-> find_servant (system_id, servant_upcall, poa_current_impl - ACE_ENV_ARG_PARAMETER); + ); } int TAO_Root_POA::find_servant_priority ( const PortableServer::ObjectId &system_id, CORBA::Short &priority - ACE_ENV_ARG_DECL) + ) { return this->active_policy_strategies_.servant_retention_strategy()-> find_servant_priority (system_id, priority - ACE_ENV_ARG_PARAMETER); + ); } TAO::ORT_Adapter_Factory * @@ -2574,8 +2408,7 @@ TAO_Root_POA::ORT_adapter_i (void) if (this->ort_adapter_ != 0) return this->ort_adapter_; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO::ORT_Adapter_Factory * ort_ap_factory = this->ORT_adapter_factory (); @@ -2587,8 +2420,7 @@ TAO_Root_POA::ORT_adapter_i (void) // create the adapter so that in case this fails, we just // return 0 and not a not activated adapter PortableInterceptor::AdapterName *adapter_name = - this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->adapter_name_i (); this->ort_adapter_ = ort_ap_factory->create (); @@ -2604,17 +2436,14 @@ TAO_Root_POA::ORT_adapter_i (void) this->orb_core_.orbid (), adapter_name, this - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) Cannot initialize the " "object_reference_template_adapter\n"); } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); return this->ort_adapter_; } @@ -2622,7 +2451,7 @@ TAO_Root_POA::ORT_adapter_i (void) #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_ptr -TAO_Root_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::the_activator (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. @@ -2633,7 +2462,7 @@ TAO_Root_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL) void TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. @@ -2647,7 +2476,7 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr -TAO_Root_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::get_servant_manager (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -2655,12 +2484,12 @@ TAO_Root_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ()); return this->active_policy_strategies_.request_processing_strategy()-> - get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER); + get_servant_manager (); } void TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -2668,21 +2497,20 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr TAO_POA_GUARD; this->active_policy_strategies_.request_processing_strategy()-> - set_servant_manager (imgr ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + set_servant_manager (imgr); } PortableServer::Servant -TAO_Root_POA::get_servant_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::get_servant_i (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.request_processing_strategy()-> - get_servant (ACE_ENV_SINGLE_ARG_PARAMETER); + get_servant (); } PortableServer::Servant -TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)) @@ -2691,8 +2519,7 @@ TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL) TAO_POA_GUARD_RETURN (0); PortableServer::Servant servant = - this->get_servant_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->get_servant_i (); if (servant != 0) { @@ -2707,8 +2534,7 @@ TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL) // conforming caller need not invoke _remove_ref on the returned // Servant if the type of the Servant uses the default reference // counting inherited from ServantBase. - servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + servant->_add_ref (); return servant; } @@ -2723,7 +2549,7 @@ TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL) void TAO_Root_POA::set_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -2731,8 +2557,7 @@ TAO_Root_POA::set_servant (PortableServer::Servant servant TAO_POA_GUARD; this->active_policy_strategies_.request_processing_strategy()-> - set_servant (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + set_servant (servant); } #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ @@ -2849,7 +2674,7 @@ TAO_Root_POA::root (void) const } TAO::ORT_Adapter * -TAO_Root_POA::ORT_adapter (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::ORT_adapter (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->ort_adapter_ != 0) @@ -2902,17 +2727,16 @@ TAO_Root_POA::ort_adapter_factory_name (const char *name) } CORBA::Policy_ptr -TAO_Root_POA::get_policy (CORBA::PolicyType policy - ACE_ENV_ARG_DECL) +TAO_Root_POA::get_policy (CORBA::PolicyType policy) { - return this->policies_.get_policy (policy ACE_ENV_ARG_PARAMETER); + return this->policies_.get_policy (policy); } void -TAO_Root_POA::check_state (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::check_state (void) { this->active_policy_strategies_.lifespan_strategy ()-> - check_state (ACE_ENV_SINGLE_ARG_PARAMETER); + check_state (); } const char * @@ -2934,7 +2758,7 @@ TAO_Root_POA::imr_client_adapter_name (void) } PortableServer::POAManager_ptr -TAO_Root_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Root_POA::the_POAManager (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POAManager::_duplicate (&this->poa_manager_); @@ -2942,7 +2766,7 @@ TAO_Root_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAManagerFactory_ptr -TAO_Root_POA::the_POAManagerFactory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Root_POA::the_POAManagerFactory (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_); @@ -2950,7 +2774,7 @@ TAO_Root_POA::the_POAManagerFactory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) #endif CORBA::ORB_ptr -TAO_Root_POA::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Root_POA::_get_orb (void) { return CORBA::ORB::_duplicate (this->orb_core_.orb ()); } @@ -3002,15 +2826,13 @@ TAO_Root_POA::poa_deactivated_hook () void TAO_Root_POA::servant_activated_hook (PortableServer::Servant, - const PortableServer::ObjectId& - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId&) { } void TAO_Root_POA::servant_deactivated_hook (PortableServer::Servant, - const PortableServer::ObjectId& - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId&) { } diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 34128790c9b..d7d69bfb6e3 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -130,7 +130,7 @@ public: const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, @@ -138,20 +138,20 @@ public: PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); #endif void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ThreadPolicy_ptr create_thread_policy ( PortableServer::ThreadPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -159,7 +159,7 @@ public: #if !defined (CORBA_E_MICRO) PortableServer::LifespanPolicy_ptr create_lifespan_policy ( PortableServer::LifespanPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); #endif @@ -167,7 +167,7 @@ public: #if !defined (CORBA_E_MICRO) PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( PortableServer::IdUniquenessPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); #endif @@ -175,7 +175,7 @@ public: #if !defined (CORBA_E_MICRO) PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( PortableServer::IdAssignmentPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); #endif @@ -184,97 +184,97 @@ public: PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( PortableServer::ImplicitActivationPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( PortableServer::ServantRetentionPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( PortableServer::RequestProcessingPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + char * the_name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POA_ptr the_parent (void) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POAList *the_children ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POAManager_ptr the_POAManager ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAManagerFactory_ptr the_POAManagerFactory ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name (ACE_ENV_SINGLE_ARG_DECL) + PortableInterceptor::AdapterName *adapter_name (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Store the given TaggedComponent for eventual insertion into all /// object reference profiles. void save_ior_component (const IOP::TaggedComponent &component - ACE_ENV_ARG_DECL); + ); /// Store the given TaggedComponent for eventual insertion into all /// object reference profiles with the given ProfileId. void save_ior_component_and_profile_id ( const IOP::TaggedComponent &component, IOP::ProfileId profile_id - ACE_ENV_ARG_DECL); + ); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_ptr the_activator ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException)); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::ServantManager_ptr get_servant_manager ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager (PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::Servant get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); void set_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); @@ -282,7 +282,7 @@ public: #if !defined (CORBA_E_MICRO) void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -290,44 +290,44 @@ public: #endif void deactivate_object (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference (const char *intf - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::Servant reference_to_servant ( CORBA::Object_ptr reference - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, @@ -335,37 +335,37 @@ public: PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::OctetSeq *id (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Accessor for POA policies. TAO_POA_Policy_Set &policies (void); /// Get the set policy of the given type. - CORBA::Policy_ptr get_policy (CORBA::PolicyType policy ACE_ENV_ARG_DECL); + CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); /// This method gives the policies that are exposed to the client. /// These policies are shipped within the IOR. virtual CORBA::PolicyList *client_exposed_policies ( CORBA::Short object_priority - ACE_ENV_ARG_DECL + ); TAO_Root_POA (const String &name, @@ -376,7 +376,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); + ); virtual ~TAO_Root_POA (void); @@ -398,7 +398,7 @@ public: static void check_for_valid_wait_for_completions ( const TAO_ORB_Core &orb_core, CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL + ); /// ORB Core for POA. @@ -421,7 +421,7 @@ public: TAO_Stub* key_to_stub (const TAO::ObjectKey &key, const char *type_id, CORBA::Short priority - ACE_ENV_ARG_DECL); + ); /// Accessor methods to POA state. /** @@ -429,7 +429,7 @@ public: * and NON_EXISTENT states. */ PortableInterceptor::AdapterState get_adapter_state ( - ACE_ENV_SINGLE_ARG_DECL); + void); virtual void *thread_pool (void) const; @@ -451,7 +451,7 @@ public: /// Gets the value of TAO_POA_Static_Resources::imr_client_adapter_name_. static const char *imr_client_adapter_name (void); - CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr invoke_key_to_object (void); CORBA::Boolean system_id (void); @@ -462,7 +462,7 @@ public: bool is_poa_generated (CORBA::Object_ptr reference, PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL); + ); /* * Validate if the servant may be activated @@ -491,7 +491,7 @@ public: bool &wait_occurred_restart_call); void deactivate_object_i (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); @@ -503,18 +503,18 @@ public: bool has_system_id (void) const; PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL); + ); TAO_SERVANT_LOCATION servant_present ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + ); PortableServer::Servant find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl - ACE_ENV_ARG_DECL); + ); /** * Find the the servant with ObjectId <system_id>, and retrieve @@ -527,14 +527,14 @@ public: int find_servant_priority ( const PortableServer::ObjectId &system_id, CORBA::Short &priority - ACE_ENV_ARG_DECL); + ); int unbind_using_user_id (const PortableServer::ObjectId &user_id); void cleanup_servant ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id - ACE_ENV_ARG_DECL); + ); void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, @@ -548,7 +548,7 @@ public: PortableServer::Servant p_servant, CORBA::Short priority, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -556,13 +556,13 @@ public: CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid, bool indirect - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); @@ -572,18 +572,18 @@ public: int is_poa_generated_id (const PortableServer::ObjectId &id); /// Check the state of this POA - void check_state (ACE_ENV_SINGLE_ARG_DECL); + void check_state (void); int delete_child (const String &child); PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); virtual CORBA::ORB_ptr _get_orb ( - ACE_ENV_SINGLE_ARG_DECL + ); /// These hooks are needed by the CSD strategy to override @@ -598,12 +598,12 @@ public: /// Hook - A servant has been activated. virtual void servant_activated_hook (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); /// Hook - A servant has been deactivated. virtual void servant_deactivated_hook (PortableServer::Servant servant, const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); + ); protected: @@ -622,14 +622,14 @@ protected: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); + ); #if ! defined (CORBA_E_MICRO) PortableServer::POA_ptr create_POA_i ( const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, @@ -638,32 +638,32 @@ protected: PortableServer::POA_ptr create_POA_i (const String &adapter_name, PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); TAO_Root_POA *find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); #endif void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - void complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL); + void complete_destruction_i (void); - PortableServer::POAList *the_children_i (ACE_ENV_SINGLE_ARG_DECL) + PortableServer::POAList *the_children_i (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) + PortableInterceptor::AdapterName *adapter_name_i (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Method to notify the IOR Interceptors when there is a state @@ -671,13 +671,13 @@ protected: void adapter_state_changed ( const TAO::ORT_Array &array_obj_ref_template, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles. void add_ior_component (TAO_MProfile & mprofile, const IOP::TaggedComponent & component - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles matching the given @@ -685,7 +685,7 @@ protected: void add_ior_component_to_profile (TAO_MProfile & mprofile, const IOP::TaggedComponent & component, IOP::ProfileId profile_id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Wrapper for the ORB's key_to_object that will alter the object pointer @@ -696,22 +696,22 @@ protected: CORBA::Boolean collocated, CORBA::Short priority, bool indirect - ACE_ENV_ARG_DECL); + ); /// Like key_to_stub() but assume that the ORB is not shutting down. virtual TAO_Stub* key_to_stub_i (const TAO::ObjectKey &key, const char *type_id, CORBA::Short priority - ACE_ENV_ARG_DECL); + ); TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key, const char *type_id, CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, TAO_Acceptor_Registry &acceptor_registry - ACE_ENV_ARG_DECL); + ); - PortableServer::Servant get_servant_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::Servant get_servant_i (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); @@ -721,32 +721,32 @@ protected: PortableServer::Servant p_servant, CORBA::Short priority, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); #endif - virtual void remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void remove_from_parent_i (void); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void wait_for_completions (CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL); + ); CORBA::Object_ptr create_reference_i (const char *intf, CORBA::Short priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); @@ -754,13 +754,13 @@ protected: const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::Servant reference_to_servant_i ( CORBA::Object_ptr reference - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, @@ -768,13 +768,13 @@ protected: PortableServer::POA::WrongPolicy)); CORBA::Object_ptr servant_to_reference_i (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); @@ -787,12 +787,12 @@ protected: * IORInterceptor::components_established() once the former is * completed. */ - void establish_components (ACE_ENV_SINGLE_ARG_DECL); + void establish_components (void); /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. void components_established (PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL); + ); void set_folded_name (TAO_Root_POA *parent); @@ -811,7 +811,7 @@ protected: protected: /// Accessor methods to ObjectReferenceTemplate PortableInterceptor::ObjectReferenceTemplate * - get_adapter_template (ACE_ENV_SINGLE_ARG_DECL) + get_adapter_template (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Accessor methods to ObjectReferenceTemplate, non locked version @@ -819,18 +819,18 @@ protected: /// Accessor methods to PortableInterceptor::ObjectReferenceFactory PortableInterceptor::ObjectReferenceFactory * - get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL) + get_obj_ref_factory (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the object reference factory void set_obj_ref_factory ( PortableInterceptor::ObjectReferenceFactory *current_factory - ACE_ENV_ARG_DECL); + ); TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + ); PortableServer::Servant locate_servant_i ( const char *operation, @@ -838,7 +838,7 @@ protected: TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL + ); public: @@ -846,13 +846,13 @@ public: CORBA::Object_ptr invoke_key_to_object_helper_i (const char * repository_id, const PortableServer::ObjectId & id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); protected: /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one and hold the POA lock - TAO::ORT_Adapter *ORT_adapter (ACE_ENV_SINGLE_ARG_DECL) + TAO::ORT_Adapter *ORT_adapter (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Get the ORT adapter, in case there is no adapter yet, this method will diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index 116d1d99c4f..57851ab838f 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -26,25 +26,24 @@ TAO_Root_POA::policies (void) } ACE_INLINE PortableServer::POA_ptr -TAO_Root_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Root_POA::the_parent (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_nil (); } ACE_INLINE PortableInterceptor::AdapterName * -TAO_Root_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::adapter_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->adapter_name_i (); } ACE_INLINE PortableInterceptor::ObjectReferenceTemplate * -TAO_Root_POA::get_adapter_template (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::get_adapter_template (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO::ORT_Adapter *adapter = this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO::ORT_Adapter *adapter = this->ORT_adapter (); if (adapter) { @@ -66,11 +65,10 @@ TAO_Root_POA::get_adapter_template_i () } ACE_INLINE PortableInterceptor::ObjectReferenceFactory * -TAO_Root_POA::get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL) +TAO_Root_POA::get_obj_ref_factory (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO::ORT_Adapter *adapter = this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + TAO::ORT_Adapter *adapter = this->ORT_adapter (); if (adapter) { @@ -99,7 +97,7 @@ TAO_Root_POA::name (void) const } ACE_INLINE char * -TAO_Root_POA::the_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Root_POA::the_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.c_str ()); @@ -226,7 +224,7 @@ TAO_Root_POA::orb_core (void) const } ACE_INLINE PortableInterceptor::AdapterState -TAO_Root_POA::get_adapter_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Root_POA::get_adapter_state (void) { return this->adapter_state_; } diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index 106e91dcd65..b2598398103 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -23,33 +23,32 @@ namespace TAO } CORBA::Policy_ptr - ServantRetentionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) + ServantRetentionPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ServantRetentionPolicy *copy = 0; ACE_NEW_THROW_EX (copy, ServantRetentionPolicy (this->value_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void - ServantRetentionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ServantRetentionPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::ServantRetentionPolicyValue - ServantRetentionPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ServantRetentionPolicy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::PolicyType - ServantRetentionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ServantRetentionPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::SERVANT_RETENTION_POLICY_ID; diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h index 948d7ee33dc..354ade7d9fc 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h @@ -45,16 +45,16 @@ namespace TAO public: ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - ::PortableServer::ServantRetentionPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ::PortableServer::ServantRetentionPolicyValue value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 77377a53539..41ffc3ef013 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -47,24 +47,24 @@ namespace TAO virtual TAO_SERVANT_LOCATION servant_present ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual PortableServer::Servant find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual int find_servant_priority ( const PortableServer::ObjectId &system_id, CORBA::Short &priority - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual PortableServer::ObjectId *activate_object ( PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) = 0; @@ -75,7 +75,7 @@ namespace TAO PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -83,22 +83,22 @@ namespace TAO #endif virtual void deactivate_object (const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual PortableServer::Servant find_servant ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual PortableServer::ObjectId *system_id_to_object_id ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)) = 0; virtual PortableServer::Servant user_id_to_servant ( const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) = 0; @@ -106,25 +106,25 @@ namespace TAO virtual CORBA::Object_ptr id_to_reference ( const PortableServer::ObjectId &id, bool indirect - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) = 0; - virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL) + virtual void deactivate_all_objects (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) = 0; virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) = 0; virtual CORBA::Object_ptr servant_to_reference ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) = 0; @@ -132,7 +132,7 @@ namespace TAO virtual CORBA::Object_ptr create_reference ( const char *intf, CORBA::Short priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) = 0; @@ -140,7 +140,7 @@ namespace TAO const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual int rebind_using_user_id_and_system_id ( diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h index 84d581d0c18..76cc8bfe9cf 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h @@ -41,7 +41,7 @@ namespace TAO virtual void destroy ( ServantRetentionStrategy *strategy - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index c1a5c11f000..f6d22016419 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -50,7 +50,7 @@ namespace TAO void ServantRetentionStrategyFactoryImpl::destroy ( ServantRetentionStrategy *strategy - ACE_ENV_ARG_DECL) + ) { const char *strategy_factory_name = 0; @@ -73,8 +73,7 @@ namespace TAO if (servantretention_strategy_factory != 0) { - servantretention_strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + servantretention_strategy_factory->destroy (strategy); } } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h index b6864c9984e..a3d45b9f353 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h @@ -39,7 +39,7 @@ namespace TAO virtual void destroy ( ServantRetentionStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 3b48b5ab1bf..25adb27e1d9 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -35,32 +35,30 @@ namespace TAO void ServantRetentionStrategyNonRetain::strategy_init ( TAO_Root_POA *poa - ACE_ENV_ARG_DECL_NOT_USED) + ) { poa_ = poa; } void ServantRetentionStrategyNonRetain::strategy_cleanup ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) { poa_ = 0; } void ServantRetentionStrategyNonRetain::deactivate_object ( - const PortableServer::ObjectId &/*id*/ - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &/*id*/) { // When using Non_Retain we don't have an active object map and we just // can't deactivate any object - ACE_THROW (PortableServer::POA::WrongPolicy ()); + throw (PortableServer::POA::WrongPolicy ()); } PortableServer::Servant ServantRetentionStrategyNonRetain::find_servant ( - const PortableServer::ObjectId &/*system_id*/ - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &/*system_id*/) { ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (), 0); @@ -69,7 +67,7 @@ namespace TAO PortableServer::ObjectId * ServantRetentionStrategyNonRetain::system_id_to_object_id ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)) @@ -80,15 +78,13 @@ namespace TAO ACE_NEW_THROW_EX (id, PortableServer::ObjectId (system_id), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return id; } PortableServer::Servant ServantRetentionStrategyNonRetain::user_id_to_servant ( - const PortableServer::ObjectId &/*id*/ - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &/*id*/) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -100,8 +96,7 @@ namespace TAO CORBA::Object_ptr ServantRetentionStrategyNonRetain::id_to_reference ( const PortableServer::ObjectId &/*id*/, - bool /*indirect*/ - ACE_ENV_ARG_DECL) + bool /*indirect*/) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -113,8 +108,7 @@ namespace TAO TAO_SERVANT_LOCATION ServantRetentionStrategyNonRetain::servant_present ( const PortableServer::ObjectId &/*system_id*/, - PortableServer::Servant &/*servant*/ - ACE_ENV_ARG_DECL_NOT_USED) + PortableServer::Servant &/*servant*/) { return TAO_SERVANT_NOT_FOUND; } @@ -123,8 +117,7 @@ namespace TAO ServantRetentionStrategyNonRetain::find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, - TAO::Portable_Server::POA_Current_Impl &poa_current_impl - ACE_ENV_ARG_DECL_NOT_USED) + TAO::Portable_Server::POA_Current_Impl &poa_current_impl) { // We have the NON_RETAIN policy, user id is the system id. @@ -140,8 +133,7 @@ namespace TAO int ServantRetentionStrategyNonRetain::find_servant_priority ( const PortableServer::ObjectId &/*system_id*/, - CORBA::Short &/*priority*/ - ACE_ENV_ARG_DECL) + CORBA::Short &/*priority*/) { return -1; } @@ -161,8 +153,7 @@ namespace TAO } void - ServantRetentionStrategyNonRetain::deactivate_all_objects ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ServantRetentionStrategyNonRetain::deactivate_all_objects (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -170,8 +161,7 @@ namespace TAO PortableServer::ObjectId * ServantRetentionStrategyNonRetain::servant_to_user_id ( - PortableServer::Servant /*servant*/ - ACE_ENV_ARG_DECL) + PortableServer::Servant /*servant*/) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -182,8 +172,7 @@ namespace TAO CORBA::Object_ptr ServantRetentionStrategyNonRetain::servant_to_reference ( - PortableServer::Servant /*servant*/ - ACE_ENV_ARG_DECL) + PortableServer::Servant /*servant*/) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -196,8 +185,7 @@ namespace TAO ServantRetentionStrategyNonRetain::activate_object ( PortableServer::Servant /*servant*/, CORBA::Short /*priority*/, - bool &/*wait_occurred_restart_call*/ - ACE_ENV_ARG_DECL) + bool &/*wait_occurred_restart_call*/) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) @@ -212,22 +200,20 @@ namespace TAO const PortableServer::ObjectId &/*id*/, PortableServer::Servant /*servant*/, CORBA::Short /*priority*/, - bool &/*wait_occurred_restart_call*/ - ACE_ENV_ARG_DECL) + bool &/*wait_occurred_restart_call*/) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)) { - ACE_THROW (PortableServer::POA::WrongPolicy ()); + throw (PortableServer::POA::WrongPolicy ()); } #endif CORBA::Object_ptr ServantRetentionStrategyNonRetain::create_reference ( const char *intf, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -249,7 +235,6 @@ namespace TAO ACE_NEW_THROW_EX (sys_id, PortableServer::ObjectId, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); system_id = sys_id; @@ -266,15 +251,14 @@ namespace TAO return this->poa_->invoke_key_to_object_helper_i (intf, user_id - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Object_ptr ServantRetentionStrategyNonRetain::create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException)) { // This operation creates an object reference that encapsulates the @@ -294,7 +278,6 @@ namespace TAO ACE_NEW_THROW_EX (sys_id, PortableServer::ObjectId (oid), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); system_id = sys_id; @@ -308,7 +291,7 @@ namespace TAO return this->poa_->invoke_key_to_object_helper_i (intf, oid - ACE_ENV_ARG_PARAMETER); + ); } int diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 2b8780343dc..6950af6e4c0 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -36,9 +36,9 @@ namespace TAO public: ServantRetentionStrategyNonRetain (void); - virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL); + virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); CORBA::ULong waiting_servant_deactivation (void) const; @@ -46,8 +46,7 @@ namespace TAO PortableServer::ObjectId * activate_object (PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + bool &wait_occurred_restart_call) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); @@ -58,93 +57,81 @@ namespace TAO activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + bool &wait_occurred_restart_call) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); #endif - virtual void deactivate_object (const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL); + virtual void deactivate_object (const PortableServer::ObjectId &id); virtual PortableServer::Servant find_servant ( - const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL); + const PortableServer::ObjectId &system_id); virtual int is_servant_in_map (PortableServer::Servant servant, bool &wait_occurred_restart_call); virtual PortableServer::ObjectId *system_id_to_object_id ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); virtual PortableServer::Servant - user_id_to_servant (const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + user_id_to_servant (const PortableServer::ObjectId &id) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, - bool indirect - ACE_ENV_ARG_DECL) + bool indirect) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); virtual TAO_SERVANT_LOCATION servant_present ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + PortableServer::Servant &servant); virtual PortableServer::Servant find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, - TAO::Portable_Server::POA_Current_Impl &poa_current_impl - ACE_ENV_ARG_DECL); + TAO::Portable_Server::POA_Current_Impl &poa_current_impl); virtual int find_servant_priority ( const PortableServer::ObjectId &system_id, - CORBA::Short &priority - ACE_ENV_ARG_DECL); + CORBA::Short &priority); - virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL) + virtual void deactivate_all_objects (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); virtual PortableServer::ObjectId *servant_to_user_id ( - PortableServer::Servant servant - ACE_ENV_ARG_DECL) + PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); virtual CORBA::Object_ptr servant_to_reference ( - PortableServer::Servant servant - ACE_ENV_ARG_DECL) + PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); virtual CORBA::Object_ptr create_reference ( const char *intf, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int rebind_using_user_id_and_system_id ( diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index 8da6d151764..80f95a4b549 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -46,10 +46,9 @@ namespace TAO void ServantRetentionStrategyNonRetainFactoryImpl::destroy ( ServantRetentionStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h index 407d148d4b0..e7351acdbbf 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h @@ -41,7 +41,7 @@ namespace TAO virtual void destroy ( ServantRetentionStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index b12a5e5b324..d77d2312d37 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -38,9 +38,7 @@ namespace TAO } void - ServantRetentionStrategyRetain::strategy_init ( - TAO_Root_POA *poa - ACE_ENV_ARG_DECL) + ServantRetentionStrategyRetain::strategy_init (TAO_Root_POA *poa) { poa_ = poa; @@ -51,8 +49,7 @@ namespace TAO !poa->allow_multiple_activations (), poa->is_persistent (), poa->orb_core().server_factory ()->active_object_map_creation_parameters () - ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); - ACE_CHECK; + ), CORBA::NO_MEMORY ()); // Give ownership of the new map to the auto pointer. Note, that it // is important for the auto pointer to take ownership before @@ -60,7 +57,6 @@ namespace TAO auto_ptr<TAO_Active_Object_Map> new_active_object_map (active_object_map); // Check for exception in construction of the active object map. - ACE_CHECK; // Finally everything is fine. Make sure to take ownership away // from the auto pointer. @@ -68,8 +64,7 @@ namespace TAO } void - ServantRetentionStrategyRetain::strategy_cleanup( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ServantRetentionStrategyRetain::strategy_cleanup(void) { // Delete the active object map. delete this->active_object_map_; @@ -78,8 +73,7 @@ namespace TAO void ServantRetentionStrategyRetain::deactivate_object ( - const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &id) { TAO_Active_Object_Map_Entry *active_object_map_entry = 0; @@ -91,18 +85,16 @@ namespace TAO // Id, the operation raises an ObjectNotActive exception. if (result != 0) { - ACE_THROW (PortableServer::POA::ObjectNotActive ()); + throw (PortableServer::POA::ObjectNotActive ()); } this->deactivate_map_entry (active_object_map_entry - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void ServantRetentionStrategyRetain::deactivate_map_entry ( - TAO_Active_Object_Map_Entry *active_object_map_entry - ACE_ENV_ARG_DECL) + TAO_Active_Object_Map_Entry *active_object_map_entry) { // Decrement the reference count. CORBA::UShort const new_count = --active_object_map_entry->reference_count_; @@ -115,16 +107,14 @@ namespace TAO this->poa_->servant_deactivated_hook ( active_object_map_entry->servant_, active_object_map_entry->user_id_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } if (new_count == 0) { this->poa_->cleanup_servant (active_object_map_entry->servant_, active_object_map_entry->user_id_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { @@ -153,8 +143,7 @@ namespace TAO PortableServer::Servant ServantRetentionStrategyRetain::find_servant ( - const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &system_id) { // Find user id from system id. PortableServer::ObjectId_var user_id; @@ -191,8 +180,7 @@ namespace TAO PortableServer::ObjectId * ServantRetentionStrategyRetain::system_id_to_object_id ( - const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &system_id) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)) @@ -213,8 +201,7 @@ namespace TAO PortableServer::Servant ServantRetentionStrategyRetain::user_id_to_servant ( - const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &id) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -240,8 +227,7 @@ namespace TAO CORBA::Object_ptr ServantRetentionStrategyRetain::id_to_reference ( const PortableServer::ObjectId &id, - bool indirect - ACE_ENV_ARG_DECL) + bool indirect) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -269,7 +255,7 @@ namespace TAO return this->poa_->invoke_key_to_object_helper_i (servant->_interface_repository_id (), id - ACE_ENV_ARG_PARAMETER); + ); } else { @@ -283,8 +269,7 @@ namespace TAO TAO_SERVANT_LOCATION ServantRetentionStrategyRetain::servant_present ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant - ACE_ENV_ARG_DECL) + PortableServer::Servant &servant) { // Find user id from system id. PortableServer::ObjectId_var user_id; @@ -317,8 +302,7 @@ namespace TAO ServantRetentionStrategyRetain::find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, - TAO::Portable_Server::POA_Current_Impl &poa_current_impl - ACE_ENV_ARG_DECL) + TAO::Portable_Server::POA_Current_Impl &poa_current_impl) { PortableServer::ObjectId user_id; // If we have the RETAIN policy, convert/transform from system id to @@ -361,8 +345,7 @@ namespace TAO int ServantRetentionStrategyRetain::find_servant_priority ( const PortableServer::ObjectId &system_id, - CORBA::Short &priority - ACE_ENV_ARG_DECL) + CORBA::Short &priority) { PortableServer::ObjectId user_id; // If we have the RETAIN policy, convert/transform from system id to @@ -495,8 +478,7 @@ namespace TAO } void - ServantRetentionStrategyRetain::deactivate_all_objects ( - ACE_ENV_SINGLE_ARG_DECL) + ServantRetentionStrategyRetain::deactivate_all_objects (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -538,15 +520,13 @@ namespace TAO ++i) { this->deactivate_map_entry (map_entries[i] - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } PortableServer::ObjectId * ServantRetentionStrategyRetain::servant_to_user_id ( - PortableServer::Servant servant - ACE_ENV_ARG_DECL) + PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -613,8 +593,7 @@ namespace TAO // sevant is activated. this->poa_->servant_activated_hook (servant, user_id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // ATTENTION: Trick locking here, see class header for details Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -624,8 +603,7 @@ namespace TAO // is invoked at least once on the Servant argument before // returning. Otherwise, the POA does not increment or decrement // the reference count of the Servant passed to this function. - servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + servant->_add_ref (); return user_id._retn (); } @@ -640,8 +618,7 @@ namespace TAO PortableServer::ObjectId * ServantRetentionStrategyRetain::servant_to_system_id_i ( PortableServer::Servant servant, - CORBA::Short &priority - ACE_ENV_ARG_DECL) + CORBA::Short &priority) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -708,8 +685,7 @@ namespace TAO // sevant is activated. this->poa_->servant_activated_hook (servant, system_id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // ATTENTION: Trick locking here, see class header for details Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -719,8 +695,7 @@ namespace TAO // is invoked at least once on the Servant argument before // returning. Otherwise, the POA does not increment or decrement // the reference count of the Servant passed to this function. - servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + servant->_add_ref (); return system_id._retn (); } @@ -732,8 +707,7 @@ namespace TAO CORBA::Object_ptr ServantRetentionStrategyRetain::servant_to_reference ( - PortableServer::Servant servant - ACE_ENV_ARG_DECL) + PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -750,8 +724,7 @@ namespace TAO PortableServer::ObjectId_var system_id = this->servant_to_system_id_i (servant, priority - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ); PortableServer::ObjectId user_id; @@ -782,15 +755,14 @@ namespace TAO return this->poa_->invoke_key_to_object_helper_i ( servant->_interface_repository_id (), user_id - ACE_ENV_ARG_PARAMETER); + ); } PortableServer::ObjectId * ServantRetentionStrategyRetain::activate_object ( PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + bool &wait_occurred_restart_call) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) @@ -838,8 +810,7 @@ namespace TAO // sevant is activated. this->poa_->servant_activated_hook (servant, user_id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // ATTENTION: Trick locking here, see class header for details Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -849,8 +820,7 @@ namespace TAO // least once on the Servant argument before returning. When the POA // no longer needs the Servant, it will invoke _remove_ref on it the // same number of times. - servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + servant->_add_ref (); return user_id._retn (); } @@ -861,8 +831,7 @@ namespace TAO const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + bool &wait_occurred_restart_call) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -880,7 +849,7 @@ namespace TAO if (this->poa_->has_system_id () && !this->poa_->is_poa_generated_id (id)) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); } // If the CORBA object denoted by the Object Id value is already @@ -898,7 +867,7 @@ namespace TAO // in the Active Object Map, the ServantAlreadyActive exception is raised. if (result) { - ACE_THROW (PortableServer::POA::ObjectAlreadyActive ()); + throw (PortableServer::POA::ObjectAlreadyActive ()); } else if (wait_occurred_restart_call) { @@ -916,7 +885,7 @@ namespace TAO // same then the ORB shall return SUCCESS. if (!priorities_match) { - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); } @@ -931,7 +900,7 @@ namespace TAO } else { - ACE_THROW (PortableServer::POA::ServantAlreadyActive ()); + throw (PortableServer::POA::ServantAlreadyActive ()); } } @@ -942,7 +911,7 @@ namespace TAO id, priority) != 0) { - ACE_THROW (CORBA::OBJ_ADAPTER ()); + throw ( ::CORBA::OBJ_ADAPTER ()); } // @@ -953,8 +922,7 @@ namespace TAO // sevant is activated. this->poa_->servant_activated_hook (servant, id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // ATTENTION: Trick locking here, see class header for details Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -964,16 +932,14 @@ namespace TAO // _add_ref at least once on the Servant argument before // returning. When the POA no longer needs the Servant, it will // invoke _remove_ref on it the same number of times. - servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_add_ref (); } #endif CORBA::Object_ptr ServantRetentionStrategyRetain::create_reference ( const char *intf, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1017,7 +983,7 @@ namespace TAO return this->poa_->invoke_key_to_object_helper_i (intf, user_id - ACE_ENV_ARG_PARAMETER); + ); } @@ -1025,8 +991,7 @@ namespace TAO ServantRetentionStrategyRetain::create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException)) { // This operation creates an object reference that encapsulates the @@ -1065,7 +1030,7 @@ namespace TAO return this->poa_->invoke_key_to_object_helper_i (intf, oid - ACE_ENV_ARG_PARAMETER); + ); } int @@ -1095,7 +1060,7 @@ namespace TAO ::PortableServer::ServantRetentionPolicyValue - ServantRetentionStrategyRetain::type() const + ServantRetentionStrategyRetain::type(void) const { return ::PortableServer::RETAIN; } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index a34d82c52b0..4ea03f1fa3f 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -36,9 +36,9 @@ namespace TAO CORBA::ULong waiting_servant_deactivation (void) const; - virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL); + virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); virtual int is_servant_in_map (PortableServer::Servant servant, bool &wait_occurred_restart_call); @@ -48,7 +48,7 @@ namespace TAO activate_object (PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); @@ -59,38 +59,34 @@ namespace TAO activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + bool &wait_occurred_restart_call) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); #endif - void deactivate_object (const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL); + void deactivate_object (const PortableServer::ObjectId &id); virtual PortableServer::Servant find_servant ( const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL); + ); virtual PortableServer::ObjectId * system_id_to_object_id ( - const PortableServer::ObjectId &system_id - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &system_id) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); virtual PortableServer::Servant - user_id_to_servant (const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + user_id_to_servant (const PortableServer::ObjectId &id) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, - bool indirect ACE_ENV_ARG_DECL) + bool indirect) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); @@ -98,27 +94,25 @@ namespace TAO virtual TAO_SERVANT_LOCATION servant_present (const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant - ACE_ENV_ARG_DECL); + PortableServer::Servant &servant); virtual PortableServer::Servant find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, - TAO::Portable_Server::POA_Current_Impl &poa_current_impl - ACE_ENV_ARG_DECL); + TAO::Portable_Server::POA_Current_Impl &poa_current_impl); virtual int find_servant_priority ( const PortableServer::ObjectId &system_id, CORBA::Short &priority - ACE_ENV_ARG_DECL); + ); - virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL) + virtual void deactivate_all_objects (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); @@ -126,7 +120,7 @@ namespace TAO virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); @@ -135,7 +129,7 @@ namespace TAO CORBA::Object_ptr create_reference ( const char *intf, CORBA::Short priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); @@ -144,7 +138,7 @@ namespace TAO const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::PortableServer::ServantRetentionPolicyValue type() const; @@ -158,12 +152,12 @@ namespace TAO void deactivate_map_entry (TAO_Active_Object_Map_Entry *active_object_map_entry - ACE_ENV_ARG_DECL); + ); PortableServer::ObjectId *servant_to_system_id_i ( PortableServer::Servant p_servant, CORBA::Short &priority - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index f801a3b5e25..a07f01c7a96 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -42,10 +42,9 @@ namespace TAO void ServantRetentionStrategyRetainFactoryImpl::destroy ( ServantRetentionStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h index 1dbddfbb378..87e553d33d7 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h @@ -39,7 +39,7 @@ namespace TAO virtual void destroy ( ServantRetentionStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index abdd228aafa..9a7cca01954 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -74,32 +74,31 @@ TAO_ServantBase::~TAO_ServantBase (void) } PortableServer::POA_ptr -TAO_ServantBase::_default_POA (ACE_ENV_SINGLE_ARG_DECL) +TAO_ServantBase::_default_POA (void) { CORBA::Object_var object = - TAO_ORB_Core_instance ()->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + TAO_ORB_Core_instance ()->root_poa (); return PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean TAO_ServantBase::_is_a (const char *logical_type_id - ACE_ENV_ARG_DECL_NOT_USED) + ) { static char const id[] = "IDL:omg.org/CORBA/Object:1.0"; return ACE_OS::strcmp (logical_type_id, id) == 0; } CORBA::Boolean -TAO_ServantBase::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServantBase::_non_existent (void) { return false; } CORBA::InterfaceDef_ptr -TAO_ServantBase::_get_interface (ACE_ENV_SINGLE_ARG_DECL) +TAO_ServantBase::_get_interface (void) { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -116,17 +115,17 @@ TAO_ServantBase::_get_interface (ACE_ENV_SINGLE_ARG_DECL) // used only to resolve the IFR, so we should be ok. return adapter->get_interface (TAO_ORB_Core_instance ()->orb (), this->_interface_repository_id () - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Object_ptr -TAO_ServantBase::_get_component (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServantBase::_get_component (void) { return CORBA::Object::_nil (); } char * -TAO_ServantBase::_repository_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServantBase::_repository_id (void) { return CORBA::string_dup (this->_interface_repository_id ()); } @@ -151,7 +150,7 @@ TAO_ServantBase::_find (const char *opname, } TAO_Stub * -TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL) +TAO_ServantBase::_create_stub (void) { TAO_Stub *stub = 0; @@ -171,19 +170,16 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL) poa_current_impl->object_key (), this->_interface_repository_id (), poa_current_impl->priority () - ACE_ENV_ARG_PARAMETER + ); - ACE_CHECK_RETURN (0); } else { PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->_default_POA (); CORBA::Object_var object = - poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + poa->servant_to_reference (this); // Get the stub object stub = object->_stubobj (); @@ -202,7 +198,7 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL) void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req, void * servant_upcall, void * derived_this - ACE_ENV_ARG_DECL) + ) { TAO_Skeleton skel; char const * const opname = req.operation (); @@ -222,7 +218,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req, skel, static_cast <unsigned int> (req.operation_length())) == -1) { - ACE_THROW (CORBA::BAD_OPERATION ()); + throw ( ::CORBA::BAD_OPERATION ()); } CORBA::Boolean const send_reply = @@ -230,7 +226,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req, && req.response_expected () && !req.deferred_reply (); - ACE_TRY + try { // Invoke the skeleton, it will demarshal the arguments, invoke // the right operation on the skeleton class, and marshal any @@ -239,8 +235,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req, skel (req, servant_upcall, derived_this - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); /* * Dispatch resolution specialization add hook. @@ -258,7 +253,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req, req.tao_send_reply (); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // If an exception was raised we should marshal it and send // the appropriate reply to the client @@ -267,14 +262,12 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req, if (req.collocated ()) { // Report the exception to the collocated client. - ACE_RE_THROW; + throw; } else req.tao_send_reply_exception (ACE_ANY_EXCEPTION); } } - ACE_ENDTRY; - ACE_CHECK; return; } @@ -282,7 +275,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req, void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req, void * servant_upcall, void * derived_this - ACE_ENV_ARG_DECL) + ) { TAO_Skeleton skel; const char *opname = req.operation (); @@ -302,10 +295,10 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req, skel, static_cast <unsigned int> (req.operation_length())) == -1) { - ACE_THROW (CORBA::BAD_OPERATION ()); + throw ( ::CORBA::BAD_OPERATION ()); } - ACE_TRY + try { // Invoke the skeleton, it will demarshal the arguments, invoke // the right operation on the skeleton class, and marshal any @@ -314,8 +307,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req, skel (req, servant_upcall, derived_this - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // It is our job to send the already marshaled reply, but only // send if it is expected and it has not already been sent @@ -325,26 +317,24 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req, // exception. } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // If an exception was raised we should marshal it and send // the appropriate reply to the client req.tao_send_reply_exception (ACE_ANY_EXCEPTION); } - ACE_ENDTRY; - ACE_CHECK; return; } void -TAO_ServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServantBase::_add_ref (void) { ++this->ref_count_; } void -TAO_ServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServantBase::_remove_ref (void) { long const new_count = --this->ref_count_; @@ -353,7 +343,7 @@ TAO_ServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::ULong -TAO_ServantBase::_refcount_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const +TAO_ServantBase::_refcount_value (void) const { return static_cast<CORBA::ULong> (this->ref_count_.value ()); } diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 9dedba87c90..217a3ea006b 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -68,35 +68,35 @@ public: /// Returns the default POA for this servant. virtual PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char *logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Default _non_existent: always returns false. virtual CORBA::Boolean _non_existent ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); /// Query the Interface Repository for the interface definition. virtual CORBA::InterfaceDef_ptr _get_interface ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); /// Default _get_component: always returns CORBA::Object::_nil(). virtual CORBA::Object_ptr _get_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); /// Get the repository id. virtual char * _repository_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ); /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Stub *_create_stub (void); /** * Dispatches a request to the object: find the operation, cast the @@ -107,7 +107,7 @@ public: */ virtual void _dispatch (TAO_ServerRequest &request, void *servant_upcall - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Please see documentation in tao/Abstract_Servant_Base.h for /// details. @@ -128,19 +128,19 @@ public: * @name Reference Counting Operations */ /// Increase reference count by one. - virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (void); /** * Decreases reference count by one; if the resulting reference * count equals zero, _remove_ref invokes delete on its this pointer * in order to destroy the servant. */ - virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (void); /** * Returns the current reference count value. */ - virtual CORBA::ULong _refcount_value (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::ULong _refcount_value (void) const; //@} protected: @@ -157,12 +157,12 @@ protected: virtual void synchronous_upcall_dispatch (TAO_ServerRequest & req, void * servant_upcall, void * derived_this - ACE_ENV_ARG_DECL); + ); virtual void asynchronous_upcall_dispatch (TAO_ServerRequest & req, void * servant_upcall, void * derived_this - ACE_ENV_ARG_DECL); + ); protected: /// Reference counter. diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index 10c062e52d1..82737fc268c 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -58,7 +58,7 @@ public: CORBA::Short servant_priority, TAO_ServerRequest &req, TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL + ) = 0; /// Pre_invoke collocated request. @@ -66,7 +66,7 @@ public: TAO_Root_POA &poa, CORBA::Short servant_priority, TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Post_invoke request. virtual void post_invoke ( @@ -82,7 +82,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 8cf4469939e..e63f969a83f 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -53,7 +53,7 @@ namespace TAO const TAO::ObjectKey &key, const char *operation, CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) + ) { while (1) { @@ -64,8 +64,7 @@ namespace TAO operation, forward_to, wait_occurred_restart_call - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); + ); if (result == TAO_Adapter::DS_FAILED && wait_occurred_restart_call) @@ -91,7 +90,7 @@ namespace TAO const char *operation, CORBA::Object_out forward_to, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL) + ) { // Acquire the object adapter lock first. int result = this->object_adapter_->lock ().acquire (); @@ -108,19 +107,16 @@ namespace TAO // upcall is in progress, wait for it to complete. Unless of // course, the thread making the non-servant upcall is this thread. this->object_adapter_->wait_for_non_servant_upcalls_to_complete ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); + ); // Locate the POA. this->object_adapter_->locate_poa (key, this->system_id_, this->poa_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); + ); // Check the state of the POA. - this->poa_->check_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); + this->poa_->check_state (); // Setup current for this request. this->current_context_.setup (this->poa_, @@ -133,7 +129,7 @@ namespace TAO // We have setup the POA Current. Record this for later use. this->state_ = POA_CURRENT_SETUP; - ACE_TRY + try { // Lookup the servant. this->servant_ = @@ -142,27 +138,25 @@ namespace TAO *this, this->current_context_, wait_occurred_restart_call - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (wait_occurred_restart_call) return TAO_Adapter::DS_FAILED; } #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - ACE_CATCH (PortableServer::ForwardRequest, forward_request) + catch ( ::PortableServer::ForwardRequest& forward_request) { forward_to = CORBA::Object::_duplicate (forward_request.forward_reference.in ()); return TAO_Adapter::DS_FORWARD; } #else - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_UNUSED_ARG (forward_to); - ACE_RE_THROW; + throw; } #endif /* TAO_HAS_MINIMUM_CORBA */ - ACE_ENDTRY; // Now that we know the servant. this->current_context_.servant (this->servant_); @@ -183,8 +177,7 @@ namespace TAO } // Serialize servants (if appropriate). - this->single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); + this->single_threaded_poa_setup (); // We have acquired the servant lock. Record this for later use. this->state_ = SERVANT_LOCK_ACQUIRED; @@ -196,27 +189,25 @@ namespace TAO void Servant_Upcall::pre_invoke_remote_request ( TAO_ServerRequest &req - ACE_ENV_ARG_DECL) + ) { this->object_adapter_->servant_dispatcher_->pre_invoke_remote_request ( this->poa (), this->priority (), req, this->pre_invoke_state_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void Servant_Upcall::pre_invoke_collocated_request ( - ACE_ENV_SINGLE_ARG_DECL) + void) { this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request ( this->poa (), this->priority (), this->pre_invoke_state_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void @@ -236,7 +227,7 @@ namespace TAO ::TAO_Root_POA * Servant_Upcall::lookup_POA (const TAO::ObjectKey &key - ACE_ENV_ARG_DECL) + ) { // Acquire the object adapter lock first. int result = this->object_adapter_->lock ().acquire (); @@ -253,15 +244,13 @@ namespace TAO // upcall is in progress, wait for it to complete. Unless of // course, the thread making the non-servant upcall is this thread. this->object_adapter_->wait_for_non_servant_upcalls_to_complete ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // Locate the POA. this->object_adapter_->locate_poa (key, this->system_id_, this->poa_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); return this->poa_; } @@ -340,7 +329,7 @@ namespace TAO } void - Servant_Upcall::single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL) + Servant_Upcall::single_threaded_poa_setup (void) { #if (TAO_HAS_MINIMUM_POA == 0) // Serialize servants (if necessary). @@ -355,9 +344,7 @@ namespace TAO if (result == -1) // Locking error. - ACE_THROW (CORBA::OBJ_ADAPTER ()); -#else - ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + throw ( ::CORBA::OBJ_ADAPTER ()); #endif /* !TAO_HAS_MINIMUM_POA == 0 */ } @@ -394,21 +381,18 @@ namespace TAO if (new_count == 0) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->poa_->cleanup_servant ( this->active_object_map_entry_->servant_, this->active_object_map_entry_->user_id_ - ACE_ENV_ARG_PARAMETER); + ); - ACE_TRY_CHECK; } - ACE_CATCHALL + catch (...) { // Ignore errors from servant cleanup .... } - ACE_ENDTRY; if (this->poa_->waiting_servant_deactivation() > 0 && this->object_adapter_->enable_locking_) @@ -447,21 +431,17 @@ namespace TAO // non-servant upcalls to be in progress at this point. if (this->poa_->waiting_destruction_) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - this->poa_->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->poa_->complete_destruction_i (); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // Ignore exceptions ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_POA::~complete_destruction_i"); } - ACE_ENDTRY; - ACE_CHECK; this->poa_ = 0; } diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index 94b91f4368f..13a4cb096d1 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -101,28 +101,28 @@ namespace TAO int prepare_for_upcall (const TAO::ObjectKey &key, const char *operation, CORBA::Object_out forward_to - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Helper. int prepare_for_upcall_i (const TAO::ObjectKey &key, const char *operation, CORBA::Object_out forward_to, bool &wait_occurred_restart_call - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Run pre_invoke for a remote request. void pre_invoke_remote_request (TAO_ServerRequest &req - ACE_ENV_ARG_DECL); + ); /// Run pre_invoke for a collocated request. - void pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_DECL); + void pre_invoke_collocated_request (void); /// Run post_invoke for a request. void post_invoke (void); /// Locate POA. ::TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key - ACE_ENV_ARG_DECL); + ); /// POA accessor. ::TAO_Root_POA &poa (void) const; @@ -187,7 +187,7 @@ namespace TAO protected: void post_invoke_servant_cleanup (void); - void single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL); + void single_threaded_poa_setup (void); void single_threaded_poa_cleanup (void); void servant_cleanup (void); void poa_cleanup (void); diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp index e5fca921aaa..5c5b012e62a 100644 --- a/TAO/tao/PortableServer/Servant_var.cpp +++ b/TAO/tao/PortableServer/Servant_var.cpp @@ -19,21 +19,17 @@ template <class T> T * PortableServer::Servant_var<T>::_duplicate (T * p) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (p != 0) { - p->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + p->_add_ref (); } } - ACE_CATCHALL + catch (...) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); return p; } @@ -45,19 +41,17 @@ PortableServer::Servant_var<T>::~Servant_var (void) /* throw () */ // can't assume that it will not throw. If it does, then we are in // trouble. In any event, we can't let the exception escape our // destructor. - ACE_TRY_NEW_ENV + try { if (this->ptr_ != 0) { - this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->ptr_->_remove_ref (); } } - ACE_CATCHALL + catch (...) { // Forget the exception.. } - ACE_ENDTRY; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index ce53b971ea4..40d3c9cfcc8 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -21,33 +21,32 @@ namespace TAO } CORBA::Policy_ptr - ThreadPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) + ThreadPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ThreadPolicy *copy = 0; ACE_NEW_THROW_EX (copy, ThreadPolicy (this->value_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void - ThreadPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ThreadPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::ThreadPolicyValue - ThreadPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ThreadPolicy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType - ThreadPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ThreadPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::THREAD_POLICY_ID; diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h index 5159fc646be..cd160aa8452 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.h +++ b/TAO/tao/PortableServer/ThreadPolicy.h @@ -45,16 +45,16 @@ namespace TAO public: ThreadPolicy (::PortableServer::ThreadPolicyValue value); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - ::PortableServer::ThreadPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ::PortableServer::ThreadPolicyValue value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp index c3d6a446a4a..900d238a905 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.cpp +++ b/TAO/tao/PortableServer/ThreadStrategy.cpp @@ -13,13 +13,12 @@ namespace TAO namespace Portable_Server { void - ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/ - ACE_ENV_ARG_DECL_NOT_USED) + ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/) { } void - ThreadStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ThreadStrategy::strategy_cleanup (void) { } } diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index 622ad7d3748..e8926702829 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -37,9 +37,9 @@ namespace TAO virtual int exit () = 0; - virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL); + virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); + virtual void strategy_cleanup(void); virtual ::PortableServer::ThreadPolicyValue type() const = 0; }; diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h index a22078ed773..374832e8973 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactory.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h @@ -42,7 +42,7 @@ namespace TAO /// Cleanup the given strategy instance virtual void destroy ( ThreadStrategy *strategy - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; } } diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index b21116e42b1..403750f6777 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -59,7 +59,7 @@ namespace TAO void ThreadStrategyFactoryImpl::destroy ( ThreadStrategy *strategy - ACE_ENV_ARG_DECL) + ) { switch (strategy->type ()) { @@ -70,8 +70,7 @@ namespace TAO if (strategy_factory != 0) { - strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + strategy_factory->destroy (strategy); } break; } diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h index cfe8b44147c..324e4802743 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h @@ -39,7 +39,7 @@ namespace TAO virtual void destroy ( ThreadStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp index 44edaa4b6a9..9aba0bb6f8b 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp @@ -26,7 +26,7 @@ namespace TAO } ::PortableServer::ThreadPolicyValue - ThreadStrategyORBControl::type() const + ThreadStrategyORBControl::type () const { return ::PortableServer::ORB_CTRL_MODEL; } diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index e5561d2bed8..d37db6f0745 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -46,10 +46,9 @@ namespace TAO void ThreadStrategySingleFactoryImpl::destroy ( ThreadStrategy *strategy - ACE_ENV_ARG_DECL) + ) { - strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + strategy->strategy_cleanup (); delete strategy; } diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h index 3dbcce78a99..cd9fde3aae2 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h @@ -41,7 +41,7 @@ namespace TAO virtual void destroy ( ThreadStrategy *strategy - ACE_ENV_ARG_DECL); + ); }; } } diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp index dd6b7d8e85f..f45184d950e 100644 --- a/TAO/tao/PortableServer/Upcall_Command.cpp +++ b/TAO/tao/PortableServer/Upcall_Command.cpp @@ -2,7 +2,6 @@ #include "tao/PortableServer/Upcall_Command.h" - ACE_RCSID (PortableServer, Upcall_Command, "$Id$") diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h index 40c216457f7..5f56e59e95d 100644 --- a/TAO/tao/PortableServer/Upcall_Command.h +++ b/TAO/tao/PortableServer/Upcall_Command.h @@ -26,14 +26,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace CORBA -{ - class Environment; -} - namespace TAO { - /** * @class Upcall_Command * @@ -54,7 +48,7 @@ namespace TAO virtual ~Upcall_Command (void); /// Execute the upcall. - virtual void execute (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void execute (void) = 0; }; diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp index e3fa5544e75..48f41e8afe8 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp @@ -29,32 +29,28 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, TAO::Argument * const args[], size_t nargs, TAO::Upcall_Command & command - #if TAO_HAS_INTERCEPTORS == 1 , void * servant_upcall , CORBA::TypeCode_ptr const * exceptions , CORBA::ULong nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - - ACE_ENV_ARG_DECL ) { if (server_request.collocated () && server_request.operation_details ()->is_dii_request ()) { - TAO_DII_Arguments_Converter* dii_arguments_converter + TAO_DII_Arguments_Converter* dii_arguments_converter = ACE_Dynamic_Service<TAO_DII_Arguments_Converter>::instance ("DII_Arguments_Converter"); - + if (dii_arguments_converter != 0) - { + { dii_arguments_converter->convert (server_request, args, - nargs - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + nargs + ); } else - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } if (server_request.incoming ()) @@ -62,8 +58,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, this->pre_upcall (*server_request.incoming (), args, nargs - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } #if TAO_HAS_INTERCEPTORS == 1 @@ -97,7 +92,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, TAO::ServerRequestInterceptor_Adapter *interceptor_adapter = server_request.orb_core ()->serverrequestinterceptor_adapter (); - ACE_TRY + try { { if (interceptor_adapter != 0) @@ -109,8 +104,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } // Don't bother performing the upcall if an interceptor caused a @@ -122,14 +116,13 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, { interceptor_adapter->execute_command (server_request, command - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else #endif /* TAO_HAS_INTERCEPTORS */ { // The actual upcall. - command.execute (ACE_ENV_SINGLE_ARG_PARAMETER); + command.execute (); TAO_INTERCEPTOR_CHECK; } @@ -164,12 +157,11 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // Just assume the current exception is a system exception, the // status can only change when the interceptor changes this @@ -188,8 +180,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, servant_upcall, exceptions, nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); status = server_request.reply_status (); @@ -198,45 +189,9 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, if (status == PortableInterceptor::SYSTEM_EXCEPTION || status == PortableInterceptor::USER_EXCEPTION) { - ACE_RE_THROW; - } - } -# if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL - { - // Just assume the current exception is a system exception, the - // status can only change when the interceptor changes this - // and this is only done when the sri_adapter is available. If we - // don't have an sri_adapter we just rethrow the exception - PortableInterceptor::ReplyStatus status = - PortableInterceptor::SYSTEM_EXCEPTION; - - CORBA::UNKNOWN ex; - - server_request.caught_exception (&ex); - - if (interceptor_adapter != 0) - { - interceptor_adapter->send_exception (server_request, - the_args, - the_nargs, - servant_upcall, - exceptions, - nexceptions - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - status = - server_request.reply_status (); + throw; } - - if (status == PortableInterceptor::SYSTEM_EXCEPTION) - ACE_TRY_THROW (ex); } -# endif /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */ - ACE_ENDTRY; - ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ if (server_request.response_expected () @@ -257,8 +212,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, this->post_upcall (*server_request.outgoing (), args, nargs - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } } @@ -267,7 +221,7 @@ void TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr, TAO::Argument * const * args, size_t nargs - ACE_ENV_ARG_DECL) + ) { // Demarshal the operation "in" and "inout" arguments, if any. @@ -285,8 +239,7 @@ TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr, if (!(*i)->demarshal (cdr)) { TAO_InputCDR::throw_skel_exception (errno - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } } @@ -295,7 +248,7 @@ void TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr, TAO::Argument * const * args, size_t nargs - ACE_ENV_ARG_DECL) + ) { // Marshal the operation "inout" and "out" arguments and return // value, if any. @@ -308,8 +261,7 @@ TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr, if (!(*i)->marshal (cdr)) { TAO_OutputCDR::throw_skel_exception (errno - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h index f0ba3f1c7e0..585fad89eb4 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Upcall_Wrapper.h @@ -40,11 +40,6 @@ namespace PortableServer typedef ::TAO_ServantBase ServantBase; } -namespace CORBA -{ - class Environment; -} - namespace TAO { class Argument; @@ -88,14 +83,12 @@ namespace TAO TAO::Argument * const args[], size_t nargs, TAO::Upcall_Command & command - #if TAO_HAS_INTERCEPTORS == 1 , void * servant_upcall , CORBA::TypeCode_ptr const * exceptions , CORBA::ULong nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - - ACE_ENV_ARG_DECL); + ); private: @@ -107,8 +100,7 @@ namespace TAO */ void pre_upcall (TAO_InputCDR & cdr, TAO::Argument * const * args, - size_t nargs - ACE_ENV_ARG_DECL); + size_t nargs); /// Perform post-upcall operations. /** @@ -117,8 +109,7 @@ namespace TAO */ void post_upcall (TAO_OutputCDR & cdr, TAO::Argument * const * args, - size_t nargs - ACE_ENV_ARG_DECL); + size_t nargs); }; diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h index 4ef9552bfd4..4344caa12c1 100644 --- a/TAO/tao/PortableServer/poa_macros.h +++ b/TAO/tao/PortableServer/poa_macros.h @@ -29,12 +29,12 @@ ACE_CHECK_RETURN (RETURN) #define TAO_POA_GUARD \ - TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \ + TAO::Portable_Server::POA_Guard poa_guard (*this); \ ACE_UNUSED_ARG (poa_guard); \ ACE_CHECK #define TAO_POA_GUARD_RETURN(RETURN) \ - TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \ + TAO::Portable_Server::POA_Guard poa_guard (*this); \ ACE_UNUSED_ARG (poa_guard); \ ACE_CHECK_RETURN (RETURN) diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 2be968a0821..fb71f87cffa 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -97,14 +97,12 @@ TAO_Profile::_decr_refcnt (void) void TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component - ACE_ENV_ARG_DECL) + ) { // Sanity checks. - this->verify_orb_configuration (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->verify_orb_configuration (); - this->verify_profile_version (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->verify_profile_version (); // ---------------------------------------------------------------- @@ -330,7 +328,7 @@ TAO_Profile::set_tagged_components (TAO_OutputCDR &out_cdr) void TAO_Profile::policies (CORBA::PolicyList *policy_list - ACE_ENV_ARG_DECL) + ) { #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -362,8 +360,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list { TAO_OutputCDR out_CDR; policy_value_seq[i].ptype = - (*policy_list)[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + (*policy_list)[i]->policy_type (); out_CDR << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER); (*policy_list)[i]->_tao_encode (out_CDR); @@ -417,7 +414,6 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list #else /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_UNUSED_ARG (policy_list); - ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ } @@ -426,7 +422,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list void TAO_Profile::get_policies (CORBA::PolicyList& pl - ACE_ENV_ARG_DECL) + ) { #if (TAO_HAS_CORBA_MESSAGING == 1) && !defined (CORBA_E_MICRO) @@ -462,7 +458,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl if (!(in_cdr >> policy_value_seq)) { - ACE_THROW (CORBA::INV_OBJREF ()); + throw ( ::CORBA::INV_OBJREF ()); } // Here we extract the Messaging::PolicyValue out of the sequence @@ -476,13 +472,12 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl for (CORBA::ULong i = 0; i < length; ++i) { - ACE_TRY_NEW_ENV + try { policy = this->orb_core_->orb ()->_create_policy ( policy_value_seq[i].ptype - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (!CORBA::is_nil (policy.in ())) { @@ -493,7 +488,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl policy_value_seq[i].pvalue.length ()); if (!(in_cdr >> ACE_InputCDR::to_boolean (byte_order))) - ACE_TRY_THROW (CORBA::INV_OBJREF ()); + throw ( ::CORBA::INV_OBJREF ()); in_cdr.reset_byte_order (static_cast <int> (byte_order)); @@ -514,7 +509,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl ACE_TEXT ("policies.\n"))); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // This case should occur when in the IOR are // embedded policies that TAO doesn't support, so as @@ -522,25 +517,23 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl // just ignore these un-understood policies. if (TAO_debug_level >= 5) - ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION(ex, ACE_TEXT ("IOR contains ") ACE_TEXT ("unsupported policies.")); } - ACE_ENDTRY; } } } #else ACE_UNUSED_ARG (pl); - ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* (TAO_HAS_CORBA_MESSAGING == 1) */ } void -TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL) +TAO_Profile::verify_orb_configuration (void) { // If the ORB isn't configured to support tagged components, then // throw an exception. @@ -564,7 +557,7 @@ TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL) // possible to add components to the profile. // @todo: We need the proper minor code as soon as the spec is // updated. - ACE_THROW (CORBA::BAD_PARAM ( + throw ( ::CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -573,7 +566,7 @@ TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL) +TAO_Profile::verify_profile_version (void) { // GIOP 1.0 does not support tagged components. Throw an exception // if the profile is a GIOP 1.0 profile. @@ -595,7 +588,7 @@ TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL) // possible to add components to the profile. // @todo: We need the proper minor code as soon as the spec is // updated. - ACE_THROW (CORBA::BAD_PARAM ( + throw ( ::CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -618,7 +611,7 @@ TAO_Profile::supports_non_blocking_oneways (void) const void TAO_Profile::addressing_mode (CORBA::Short addr - ACE_ENV_ARG_DECL) + ) { // ** See race condition note about addressing mode in Profile.h ** switch (addr) @@ -630,7 +623,7 @@ TAO_Profile::addressing_mode (CORBA::Short addr break; default: - ACE_THROW (CORBA::BAD_PARAM ( + throw ( ::CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -640,11 +633,11 @@ TAO_Profile::addressing_mode (CORBA::Short addr void TAO_Profile::parse_string (const char *ior - ACE_ENV_ARG_DECL) + ) { if (!ior || !*ior) { - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -676,7 +669,7 @@ TAO_Profile::parse_string (const char *ior if (this->version_.major != TAO_DEF_GIOP_MAJOR || this->version_.minor > TAO_DEF_GIOP_MINOR) { - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -684,7 +677,7 @@ TAO_Profile::parse_string (const char *ior } this->parse_string_i (ior - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean @@ -811,14 +804,14 @@ TAO_Unknown_Profile::endpoint_count (void) const void TAO_Unknown_Profile::parse_string (const char * - ACE_ENV_ARG_DECL_NOT_USED) + ) { // @@ THROW something???? } void TAO_Unknown_Profile::parse_string_i (const char * - ACE_ENV_ARG_DECL_NOT_USED) + ) { // @@ THROW something???? } @@ -830,7 +823,7 @@ TAO_Unknown_Profile::object_key_delimiter (void) const } char * -TAO_Unknown_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Unknown_Profile::to_string (void) { // @@ THROW something? return 0; @@ -906,7 +899,7 @@ TAO_Unknown_Profile::is_equivalent_hook (const TAO_Profile * /* other */) CORBA::ULong TAO_Unknown_Profile::hash (CORBA::ULong max - ACE_ENV_ARG_DECL_NOT_USED) + ) { return (ACE::hash_pjw (reinterpret_cast <const char*> (this->body_.get_buffer ()), diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index faaa73af08a..fd248cb2fbb 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -94,7 +94,7 @@ public: /// Add the given tagged component to the profile. void add_tagged_component (const IOP::TaggedComponent &component - ACE_ENV_ARG_DECL); + ); /** * Return the current addressing mode for this profile. @@ -135,11 +135,11 @@ public: /// This method sets the client exposed policies, i.e., the ones /// propagated in the IOR, for this profile. virtual void policies (CORBA::PolicyList *policy_list - ACE_ENV_ARG_DECL); + ); /// Accessor for the client exposed policies of this profile. virtual void get_policies (CORBA::PolicyList &policy_list - ACE_ENV_ARG_DECL); + ); /// Returns true if this profile can specify multicast endpoints. virtual int supports_multicast (void) const; @@ -175,7 +175,7 @@ public: * the critical path, this decision seems like a good thing. */ virtual void addressing_mode (CORBA::Short addr_mode - ACE_ENV_ARG_DECL); + ); /// The object key delimiter. virtual char object_key_delimiter (void) const = 0; @@ -183,12 +183,12 @@ public: /// Initialize this object using the given input string. /// Supports URL style of object references virtual void parse_string (const char *string - ACE_ENV_ARG_DECL); + ); /// Return a string representation for this profile. Client must /// deallocate memory. Only one endpoint is included into the /// string. - virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual char* to_string (void) = 0; /** * Encodes this profile's endpoints into a tagged component. @@ -262,7 +262,7 @@ public: /// Return a hash value for this object. virtual CORBA::ULong hash (CORBA::ULong max - ACE_ENV_ARG_DECL) = 0; + ) = 0; //@} //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_ADD_HOOK @@ -292,7 +292,7 @@ protected: /// Protocol specific implementation of parse_string () virtual void parse_string_i (const char *string - ACE_ENV_ARG_DECL) = 0; + ) = 0; //@} /// To be used by inherited classes @@ -330,11 +330,11 @@ private: /// Verify that the current ORB's configuration supports tagged /// components in IORs. - void verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL); + void verify_orb_configuration (void); /// Verify that the given profile supports tagged components, /// i.e. is not a GIOP 1.0 profile. - void verify_profile_version (ACE_ENV_SINGLE_ARG_DECL); + void verify_profile_version (void); // Profiles should not be copied or assigned! TAO_Profile (const TAO_Profile&); @@ -417,9 +417,9 @@ public: // = The TAO_Profile methods look above virtual void parse_string (const char *string - ACE_ENV_ARG_DECL); + ); virtual char object_key_delimiter (void) const; - virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL); + virtual char* to_string (void); virtual int decode (TAO_InputCDR& cdr); virtual int encode (TAO_OutputCDR &stream) const; virtual int encode_endpoints (void); @@ -428,7 +428,7 @@ public: virtual TAO_Endpoint *endpoint (void); virtual CORBA::ULong endpoint_count (void) const; virtual CORBA::ULong hash (CORBA::ULong max - ACE_ENV_ARG_DECL); + ); virtual int decode_profile (TAO_InputCDR &cdr); virtual int decode_endpoints (void); @@ -443,7 +443,7 @@ private: virtual void create_profile_body (TAO_OutputCDR &encap) const; virtual void parse_string_i (const char *string - ACE_ENV_ARG_DECL); + ); private: TAO_opaque body_; }; diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 0a6026f543c..7047469d4f0 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -77,25 +77,23 @@ namespace TAO void Profile_Transport_Resolver::resolve (ACE_Time_Value *max_time_val - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Countdown_Time countdown (max_time_val); TAO_Invocation_Endpoint_Selector *es = this->stub_->orb_core ()->endpoint_selector_factory ()->get_selector ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ); // Select the endpoint es->select_endpoint (this, max_time_val - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (this->transport_.get () == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } const TAO_GIOP_Message_Version& version = @@ -104,7 +102,7 @@ namespace TAO // Initialize the messaging object if (this->transport_->messaging_init (version.major, version.minor) == -1) { - ACE_THROW (CORBA::INTERNAL ( + throw ( ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -124,20 +122,20 @@ namespace TAO Profile_Transport_Resolver::try_connect ( TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *timeout - ACE_ENV_ARG_DECL + ) { - return this->try_connect_i (desc, timeout, 0 ACE_ENV_ARG_PARAMETER); + return this->try_connect_i (desc, timeout, 0); } bool Profile_Transport_Resolver::try_parallel_connect ( TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *timeout - ACE_ENV_ARG_DECL + ) { - return this->try_connect_i (desc, timeout, 1 ACE_ENV_ARG_PARAMETER); + return this->try_connect_i (desc, timeout, 1); } @@ -146,13 +144,12 @@ namespace TAO TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *timeout, bool parallel - ACE_ENV_ARG_DECL + ) { TAO_Connector_Registry *conn_reg = this->stub_->orb_core ()->connector_registry ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (conn_reg == 0) { @@ -188,14 +185,13 @@ namespace TAO if (parallel) { this->transport_.set (con->parallel_connect (this, desc, timeout - ACE_ENV_ARG_PARAMETER)); + )); } else { this->transport_.set (con->connect (this, desc, timeout - ACE_ENV_ARG_PARAMETER)); + )); } - ACE_CHECK_RETURN (false); // A timeout error occurred. // If the user has set a roundtrip timeout policy, throw a timeout // exception. Otherwise, just fall through and return false to @@ -250,7 +246,7 @@ namespace TAO void Profile_Transport_Resolver::init_inconsistent_policies ( - ACE_ENV_SINGLE_ARG_DECL) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (this->inconsistent_policies_, diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 2816f63dc2c..031e75e3885 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -40,7 +40,6 @@ class TAO_Transport_Descriptor_Interface; namespace CORBA { - class Environment; class Object; class PolicyList; @@ -90,7 +89,7 @@ namespace TAO * the profile. */ void resolve (ACE_Time_Value *val - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ @@ -141,11 +140,11 @@ namespace TAO /// method will return false. bool try_connect (TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *val - ACE_ENV_ARG_DECL); + ); bool try_parallel_connect (TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *val - ACE_ENV_ARG_DECL); + ); /// This method wraps a call to the orb core to see if parallel /// connection attempts are even desired. This is controlled by @@ -154,7 +153,7 @@ namespace TAO /// Initialize the inconsistent policy list that this object has /// cached. - void init_inconsistent_policies (ACE_ENV_SINGLE_ARG_DECL) + void init_inconsistent_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::PolicyList *inconsistent_policies (void) const; @@ -170,7 +169,7 @@ namespace TAO bool try_connect_i (TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *val, bool parallel - ACE_ENV_ARG_DECL); + ); /// Target object mutable CORBA::Object *obj_; diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index 06ba73100fb..eaa36a7df39 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { class Policy; - class Environment; } class TAO_ORB_Core; @@ -112,58 +111,58 @@ public: /// Initialize the protocols hooks instance. virtual void init_hooks (TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag, TAO_Stub *stub - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag, CORBA::Policy *policy - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual CORBA::Long get_dscp_codepoint (void) = 0; virtual void rt_service_context (TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean restart - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void add_rt_service_context_hook ( TAO_Service_Context &service_context, CORBA::Policy *model_policy, CORBA::Short &client_priority - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean @@ -174,7 +173,7 @@ public: CORBA::Short priority, CORBA::Short &min_priority, CORBA::Short &max_priority, - int &in_range) = 0; + bool &in_range) = 0; /** * @name Accessor and modifier to the current thread priority, used to @@ -184,21 +183,21 @@ public: */ //@{ virtual int get_thread_CORBA_priority (CORBA::Short & - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual int get_thread_native_priority (CORBA::Short & - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual int get_thread_CORBA_and_native_priority ( CORBA::Short &, CORBA::Short & - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual int set_thread_CORBA_priority (CORBA::Short - ACE_ENV_ARG_DECL) = 0; + ) = 0; virtual int set_thread_native_priority (CORBA::Short - ACE_ENV_ARG_DECL) = 0; + ) = 0; //@} }; diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp index db440ed994f..6cd7c6d75af 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp @@ -8,7 +8,7 @@ #include "tao/RTCORBA/Network_Priority_Mapping_Manager.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (RTCORBA, +ACE_RCSID (RTCORBA, Network_Priority_Mapping_Manager, "$Id$") @@ -23,14 +23,14 @@ TAO_Network_Priority_Mapping_Manager::~TAO_Network_Priority_Mapping_Manager ( TAO_Network_Priority_Mapping_Manager_ptr TAO_Network_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED) + ) { if (CORBA::is_nil (obj)) { return TAO_Network_Priority_Mapping_Manager::_nil (); } - return + return TAO_Network_Priority_Mapping_Manager::_duplicate ( dynamic_cast<TAO_Network_Priority_Mapping_Manager_ptr> (obj) ); diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index ce9955490ac..9513e2aaff9 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -68,7 +68,7 @@ public: ); static TAO_Network_Priority_Mapping_Manager_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); static TAO_Network_Priority_Mapping_Manager_ptr _nil (void) { @@ -120,7 +120,7 @@ public: static TAO_Network_Priority_Mapping_Manager_ptr duplicate (TAO_Network_Priority_Mapping_Manager_ptr); static void release (TAO_Network_Priority_Mapping_Manager_ptr); static TAO_Network_Priority_Mapping_Manager_ptr nil (void); - static TAO_Network_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static TAO_Network_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ); static CORBA::Object * upcast (void *); private: diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl index 919fecdfcab..f50348fbe8d 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl @@ -123,10 +123,10 @@ TAO_Network_Priority_Mapping_Manager_var::nil (void) ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr TAO_Network_Priority_Mapping_Manager_var::narrow ( CORBA::Object *p - ACE_ENV_ARG_DECL + ) { - return ::TAO_Network_Priority_Mapping_Manager::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::TAO_Network_Priority_Mapping_Manager::_narrow (p); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index bf04acf99bd..6db9ff93415 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -8,8 +8,8 @@ #include "tao/RTCORBA/Priority_Mapping_Manager.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (RTCORBA, - Priority_Mapping_Manager, +ACE_RCSID (RTCORBA, + Priority_Mapping_Manager, "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -21,14 +21,14 @@ TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void) TAO_Priority_Mapping_Manager_ptr TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED) + ) { if (CORBA::is_nil (obj)) { return TAO_Priority_Mapping_Manager::_nil (); } - return + return TAO_Priority_Mapping_Manager::_duplicate ( dynamic_cast<TAO_Priority_Mapping_Manager_ptr> (obj) ); diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 8b4c428998a..78a1cc4beff 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -63,7 +63,7 @@ public: static TAO_Priority_Mapping_Manager_ptr _duplicate (TAO_Priority_Mapping_Manager_ptr obj); static TAO_Priority_Mapping_Manager_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); static TAO_Priority_Mapping_Manager_ptr _nil (void) { @@ -115,7 +115,7 @@ public: static TAO_Priority_Mapping_Manager_ptr duplicate (TAO_Priority_Mapping_Manager_ptr); static void release (TAO_Priority_Mapping_Manager_ptr); static TAO_Priority_Mapping_Manager_ptr nil (void); - static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ); static CORBA::Object * upcast (void *); private: diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl index 4d8fa4007ab..fc6957e33b8 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl @@ -123,10 +123,10 @@ TAO_Priority_Mapping_Manager_var::nil (void) ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr TAO_Priority_Mapping_Manager_var::narrow ( CORBA::Object *p - ACE_ENV_ARG_DECL + ) { - return ::TAO_Priority_Mapping_Manager::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::TAO_Priority_Mapping_Manager::_narrow (p); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index da80af57638..c03ea57414b 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -186,7 +186,7 @@ RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PriorityModelPolicy::_duplicate ( @@ -197,7 +197,7 @@ RTCORBA::PriorityModelPolicy::_narrow ( RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PriorityModelPolicy::_duplicate ( @@ -225,7 +225,7 @@ RTCORBA::PriorityModelPolicy::_tao_release (PriorityModelPolicy_ptr obj) CORBA::Boolean RTCORBA::PriorityModelPolicy::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -319,7 +319,7 @@ RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ThreadpoolPolicy::_duplicate ( @@ -330,7 +330,7 @@ RTCORBA::ThreadpoolPolicy::_narrow ( RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ThreadpoolPolicy::_duplicate ( @@ -358,7 +358,7 @@ RTCORBA::ThreadpoolPolicy::_tao_release (ThreadpoolPolicy_ptr obj) CORBA::Boolean RTCORBA::ThreadpoolPolicy::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -452,7 +452,7 @@ RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ProtocolProperties::_duplicate ( @@ -463,7 +463,7 @@ RTCORBA::ProtocolProperties::_narrow ( RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ProtocolProperties::_duplicate ( @@ -491,7 +491,7 @@ RTCORBA::ProtocolProperties::_tao_release (ProtocolProperties_ptr obj) CORBA::Boolean RTCORBA::ProtocolProperties::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -647,7 +647,7 @@ RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ServerProtocolPolicy::_duplicate ( @@ -658,7 +658,7 @@ RTCORBA::ServerProtocolPolicy::_narrow ( RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ServerProtocolPolicy::_duplicate ( @@ -686,7 +686,7 @@ RTCORBA::ServerProtocolPolicy::_tao_release (ServerProtocolPolicy_ptr obj) CORBA::Boolean RTCORBA::ServerProtocolPolicy::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -780,7 +780,7 @@ RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ClientProtocolPolicy::_duplicate ( @@ -791,7 +791,7 @@ RTCORBA::ClientProtocolPolicy::_narrow ( RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return ClientProtocolPolicy::_duplicate ( @@ -819,7 +819,7 @@ RTCORBA::ClientProtocolPolicy::_tao_release (ClientProtocolPolicy_ptr obj) CORBA::Boolean RTCORBA::ClientProtocolPolicy::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -913,7 +913,7 @@ RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PrivateConnectionPolicy::_duplicate ( @@ -924,7 +924,7 @@ RTCORBA::PrivateConnectionPolicy::_narrow ( RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PrivateConnectionPolicy::_duplicate ( @@ -952,7 +952,7 @@ RTCORBA::PrivateConnectionPolicy::_tao_release (PrivateConnectionPolicy_ptr obj) CORBA::Boolean RTCORBA::PrivateConnectionPolicy::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -1046,7 +1046,7 @@ RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return TCPProtocolProperties::_duplicate ( @@ -1057,7 +1057,7 @@ RTCORBA::TCPProtocolProperties::_narrow ( RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return TCPProtocolProperties::_duplicate ( @@ -1085,7 +1085,7 @@ RTCORBA::TCPProtocolProperties::_tao_release (TCPProtocolProperties_ptr obj) CORBA::Boolean RTCORBA::TCPProtocolProperties::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -1179,7 +1179,7 @@ RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return GIOPProtocolProperties::_duplicate ( @@ -1190,7 +1190,7 @@ RTCORBA::GIOPProtocolProperties::_narrow ( RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return GIOPProtocolProperties::_duplicate ( @@ -1218,7 +1218,7 @@ RTCORBA::GIOPProtocolProperties::_tao_release (GIOPProtocolProperties_ptr obj) CORBA::Boolean RTCORBA::GIOPProtocolProperties::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -1312,7 +1312,7 @@ RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_poin RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return UnixDomainProtocolProperties::_duplicate ( @@ -1323,7 +1323,7 @@ RTCORBA::UnixDomainProtocolProperties::_narrow ( RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return UnixDomainProtocolProperties::_duplicate ( @@ -1351,7 +1351,7 @@ RTCORBA::UnixDomainProtocolProperties::_tao_release (UnixDomainProtocolPropertie CORBA::Boolean RTCORBA::UnixDomainProtocolProperties::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -1445,7 +1445,7 @@ RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_po RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return SharedMemoryProtocolProperties::_duplicate ( @@ -1456,7 +1456,7 @@ RTCORBA::SharedMemoryProtocolProperties::_narrow ( RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return SharedMemoryProtocolProperties::_duplicate ( @@ -1484,7 +1484,7 @@ RTCORBA::SharedMemoryProtocolProperties::_tao_release (SharedMemoryProtocolPrope CORBA::Boolean RTCORBA::SharedMemoryProtocolProperties::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -1578,7 +1578,7 @@ RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor (void *_tao_void_po RTCORBA::UserDatagramProtocolProperties_ptr RTCORBA::UserDatagramProtocolProperties::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return UserDatagramProtocolProperties::_duplicate ( @@ -1589,7 +1589,7 @@ RTCORBA::UserDatagramProtocolProperties::_narrow ( RTCORBA::UserDatagramProtocolProperties_ptr RTCORBA::UserDatagramProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return UserDatagramProtocolProperties::_duplicate ( @@ -1617,7 +1617,7 @@ RTCORBA::UserDatagramProtocolProperties::_tao_release (UserDatagramProtocolPrope CORBA::Boolean RTCORBA::UserDatagramProtocolProperties::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -1711,7 +1711,7 @@ RTCORBA::StreamControlProtocolProperties::_tao_any_destructor (void *_tao_void_p RTCORBA::StreamControlProtocolProperties_ptr RTCORBA::StreamControlProtocolProperties::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return StreamControlProtocolProperties::_duplicate ( @@ -1722,7 +1722,7 @@ RTCORBA::StreamControlProtocolProperties::_narrow ( RTCORBA::StreamControlProtocolProperties_ptr RTCORBA::StreamControlProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return StreamControlProtocolProperties::_duplicate ( @@ -1750,7 +1750,7 @@ RTCORBA::StreamControlProtocolProperties::_tao_release (StreamControlProtocolPro CORBA::Boolean RTCORBA::StreamControlProtocolProperties::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -1910,7 +1910,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_po RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PriorityBandedConnectionPolicy::_duplicate ( @@ -1921,7 +1921,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_narrow ( RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return PriorityBandedConnectionPolicy::_duplicate ( @@ -1949,7 +1949,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_tao_release (PriorityBandedConnectionP CORBA::Boolean RTCORBA::PriorityBandedConnectionPolicy::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -2043,7 +2043,7 @@ RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::Current_ptr RTCORBA::Current::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return Current::_duplicate ( @@ -2054,7 +2054,7 @@ RTCORBA::Current::_narrow ( RTCORBA::Current_ptr RTCORBA::Current::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return Current::_duplicate ( @@ -2082,7 +2082,7 @@ RTCORBA::Current::_tao_release (Current_ptr obj) CORBA::Boolean RTCORBA::Current::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -2176,7 +2176,7 @@ RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::Mutex_ptr RTCORBA::Mutex::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return Mutex::_duplicate ( @@ -2187,7 +2187,7 @@ RTCORBA::Mutex::_narrow ( RTCORBA::Mutex_ptr RTCORBA::Mutex::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return Mutex::_duplicate ( @@ -2215,7 +2215,7 @@ RTCORBA::Mutex::_tao_release (Mutex_ptr obj) CORBA::Boolean RTCORBA::Mutex::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( @@ -2363,18 +2363,18 @@ void RTCORBA::RTORB::MutexNotFound::_raise (void) const void RTCORBA::RTORB::MutexNotFound::_tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL + ) const { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void RTCORBA::RTORB::MutexNotFound::_tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL + ) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } // TAO extension - the virtual _type method. @@ -2458,18 +2458,18 @@ void RTCORBA::RTORB::InvalidThreadpool::_raise (void) const void RTCORBA::RTORB::InvalidThreadpool::_tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL + ) const { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void RTCORBA::RTORB::InvalidThreadpool::_tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL + ) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } // TAO extension - the virtual _type method. @@ -2495,7 +2495,7 @@ RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer) RTCORBA::RTORB_ptr RTCORBA::RTORB::_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return RTORB::_duplicate ( @@ -2506,7 +2506,7 @@ RTCORBA::RTORB::_narrow ( RTCORBA::RTORB_ptr RTCORBA::RTORB::_unchecked_narrow ( CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED + ) { return RTORB::_duplicate ( @@ -2534,7 +2534,7 @@ RTCORBA::RTORB::_tao_release (RTORB_ptr obj) CORBA::Boolean RTCORBA::RTORB::_is_a ( const char *value - ACE_ENV_ARG_DECL_NOT_USED + ) { if ( diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 51d166c6bcf..7a3f336dd87 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -284,12 +284,12 @@ namespace RTCORBA static PriorityModelPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PriorityModelPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PriorityModelPolicy_ptr _nil (void) @@ -303,7 +303,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PriorityModel priority_model ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -313,7 +313,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::Priority server_priority ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -323,7 +323,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -333,7 +333,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -344,7 +344,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -418,12 +418,12 @@ namespace RTCORBA static ThreadpoolPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ThreadpoolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ThreadpoolPolicy_ptr _nil (void) @@ -437,7 +437,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::ThreadpoolId threadpool ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -447,7 +447,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -457,7 +457,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -468,7 +468,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -537,12 +537,12 @@ namespace RTCORBA static ProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ProtocolProperties_ptr _nil (void) @@ -557,7 +557,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -719,12 +719,12 @@ namespace RTCORBA static ServerProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerProtocolPolicy_ptr _nil (void) @@ -738,7 +738,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ProtocolList * protocols ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -748,7 +748,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -758,7 +758,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -769,7 +769,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -843,12 +843,12 @@ namespace RTCORBA static ClientProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ClientProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ClientProtocolPolicy_ptr _nil (void) @@ -862,7 +862,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ProtocolList * protocols ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -872,7 +872,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -882,7 +882,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -893,7 +893,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -967,12 +967,12 @@ namespace RTCORBA static PrivateConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PrivateConnectionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PrivateConnectionPolicy_ptr _nil (void) @@ -986,7 +986,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -996,7 +996,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1007,7 +1007,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -1076,12 +1076,12 @@ namespace RTCORBA static TCPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static TCPProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static TCPProtocolProperties_ptr _nil (void) @@ -1095,7 +1095,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long send_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1106,7 +1106,7 @@ namespace RTCORBA virtual void send_buffer_size ( ::CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1116,7 +1116,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long recv_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1127,7 +1127,7 @@ namespace RTCORBA virtual void recv_buffer_size ( ::CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1137,7 +1137,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean keep_alive ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1148,7 +1148,7 @@ namespace RTCORBA virtual void keep_alive ( ::CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1158,7 +1158,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean dont_route ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1169,7 +1169,7 @@ namespace RTCORBA virtual void dont_route ( ::CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1179,7 +1179,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean no_delay ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1190,7 +1190,7 @@ namespace RTCORBA virtual void no_delay ( ::CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1200,7 +1200,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean enable_network_priority ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1211,7 +1211,7 @@ namespace RTCORBA virtual void enable_network_priority ( ::CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1222,7 +1222,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -1291,12 +1291,12 @@ namespace RTCORBA static GIOPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static GIOPProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static GIOPProtocolProperties_ptr _nil (void) @@ -1311,7 +1311,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -1380,12 +1380,12 @@ namespace RTCORBA static UnixDomainProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static UnixDomainProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static UnixDomainProtocolProperties_ptr _nil (void) @@ -1399,7 +1399,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long send_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1410,7 +1410,7 @@ namespace RTCORBA virtual void send_buffer_size ( ::CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1420,7 +1420,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long recv_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1431,7 +1431,7 @@ namespace RTCORBA virtual void recv_buffer_size ( ::CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1442,7 +1442,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -1511,12 +1511,12 @@ namespace RTCORBA static SharedMemoryProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static SharedMemoryProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static SharedMemoryProtocolProperties_ptr _nil (void) @@ -1530,7 +1530,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long send_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1541,7 +1541,7 @@ namespace RTCORBA virtual void send_buffer_size ( ::CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1551,7 +1551,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long recv_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1562,7 +1562,7 @@ namespace RTCORBA virtual void recv_buffer_size ( ::CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1572,7 +1572,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean keep_alive ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1583,7 +1583,7 @@ namespace RTCORBA virtual void keep_alive ( ::CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1593,7 +1593,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean dont_route ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1604,7 +1604,7 @@ namespace RTCORBA virtual void dont_route ( ::CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1614,7 +1614,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean no_delay ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1625,7 +1625,7 @@ namespace RTCORBA virtual void no_delay ( ::CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1635,7 +1635,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long preallocate_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1646,7 +1646,7 @@ namespace RTCORBA virtual void preallocate_buffer_size ( ::CORBA::Long preallocate_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1656,7 +1656,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual char * mmap_filename ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1667,7 +1667,7 @@ namespace RTCORBA virtual void mmap_filename ( const char * mmap_filename - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1677,7 +1677,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual char * mmap_lockname ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1688,7 +1688,7 @@ namespace RTCORBA virtual void mmap_lockname ( const char * mmap_lockname - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1699,7 +1699,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -1768,12 +1768,12 @@ namespace RTCORBA static UserDatagramProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static UserDatagramProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static UserDatagramProtocolProperties_ptr _nil (void) @@ -1787,7 +1787,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean enable_network_priority ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1798,7 +1798,7 @@ namespace RTCORBA virtual void enable_network_priority ( ::CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1809,7 +1809,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -1878,12 +1878,12 @@ namespace RTCORBA static StreamControlProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static StreamControlProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static StreamControlProtocolProperties_ptr _nil (void) @@ -1897,7 +1897,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long send_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1908,7 +1908,7 @@ namespace RTCORBA virtual void send_buffer_size ( ::CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1918,7 +1918,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long recv_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1929,7 +1929,7 @@ namespace RTCORBA virtual void recv_buffer_size ( ::CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1939,7 +1939,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean keep_alive ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1950,7 +1950,7 @@ namespace RTCORBA virtual void keep_alive ( ::CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1960,7 +1960,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean dont_route ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1971,7 +1971,7 @@ namespace RTCORBA virtual void dont_route ( ::CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1981,7 +1981,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean no_delay ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1992,7 +1992,7 @@ namespace RTCORBA virtual void no_delay ( ::CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2002,7 +2002,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean enable_network_priority ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2013,7 +2013,7 @@ namespace RTCORBA virtual void enable_network_priority ( ::CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2024,7 +2024,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -2180,12 +2180,12 @@ namespace RTCORBA static PriorityBandedConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PriorityBandedConnectionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PriorityBandedConnectionPolicy_ptr _nil (void) @@ -2199,7 +2199,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PriorityBands * priority_bands ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2209,7 +2209,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2219,7 +2219,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2230,7 +2230,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -2299,12 +2299,12 @@ namespace RTCORBA static Current_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Current_ptr _nil (void) @@ -2318,7 +2318,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::Priority the_priority ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2329,7 +2329,7 @@ namespace RTCORBA virtual void the_priority ( ::RTCORBA::Priority the_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2340,7 +2340,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -2409,12 +2409,12 @@ namespace RTCORBA static Mutex_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Mutex_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Mutex_ptr _nil (void) @@ -2428,7 +2428,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void lock ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2438,7 +2438,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void unlock ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2449,7 +2449,7 @@ namespace RTCORBA virtual CORBA::Boolean try_lock ( ::TimeBase::TimeT max_wait - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2460,7 +2460,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; @@ -2529,12 +2529,12 @@ namespace RTCORBA static RTORB_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static RTORB_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static RTORB_ptr _nil (void) @@ -2548,7 +2548,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::Mutex_ptr create_mutex ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2559,7 +2559,7 @@ namespace RTCORBA virtual void destroy_mutex ( ::RTCORBA::Mutex_ptr the_mutex - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2594,12 +2594,12 @@ namespace RTCORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL + ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL + ); // TAO_IDL - Generated from @@ -2621,7 +2621,7 @@ namespace RTCORBA virtual ::RTCORBA::Mutex_ptr create_named_mutex ( const char * name, ::CORBA::Boolean_out created_flag - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2632,7 +2632,7 @@ namespace RTCORBA virtual ::RTCORBA::Mutex_ptr open_named_mutex ( const char * name - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2649,7 +2649,7 @@ namespace RTCORBA ::CORBA::Boolean dont_route, ::CORBA::Boolean no_delay, ::CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2661,7 +2661,7 @@ namespace RTCORBA virtual ::RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties ( ::CORBA::Long send_buffer_size, ::CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2679,7 +2679,7 @@ namespace RTCORBA ::CORBA::Long preallocate_buffer_size, const char * mmap_filename, const char * mmap_lockname - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2690,7 +2690,7 @@ namespace RTCORBA virtual ::RTCORBA::UserDatagramProtocolProperties_ptr create_user_datagram_protocol_properties ( ::CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2706,7 +2706,7 @@ namespace RTCORBA ::CORBA::Boolean dont_route, ::CORBA::Boolean no_delay, ::CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2741,12 +2741,12 @@ namespace RTCORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL + ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL + ); // TAO_IDL - Generated from @@ -2773,7 +2773,7 @@ namespace RTCORBA ::CORBA::Boolean allow_request_buffering, ::CORBA::ULong max_buffered_requests, ::CORBA::ULong max_request_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2789,7 +2789,7 @@ namespace RTCORBA ::CORBA::Boolean allow_request_buffering, ::CORBA::ULong max_buffered_requests, ::CORBA::ULong max_request_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2800,7 +2800,7 @@ namespace RTCORBA virtual void destroy_threadpool ( ::RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2813,7 +2813,7 @@ namespace RTCORBA virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy ( ::RTCORBA::PriorityModel priority_model, ::RTCORBA::Priority server_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2824,7 +2824,7 @@ namespace RTCORBA virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy ( ::RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2835,7 +2835,7 @@ namespace RTCORBA virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy ( const ::RTCORBA::PriorityBands & priority_bands - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2846,7 +2846,7 @@ namespace RTCORBA virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy ( const ::RTCORBA::ProtocolList & protocols - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2857,7 +2857,7 @@ namespace RTCORBA virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy ( const ::RTCORBA::ProtocolList & protocols - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2867,7 +2867,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + void ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2878,7 +2878,7 @@ namespace RTCORBA virtual CORBA::Boolean _is_a ( const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp index 5c9170dd78e..f7eec31df0e 100644 --- a/TAO/tao/RTCORBA/RT_Current.cpp +++ b/TAO/tao/RTCORBA/RT_Current.cpp @@ -30,7 +30,7 @@ TAO_RT_Current::~TAO_RT_Current (void) } RTCORBA::Priority -TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Current::the_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Protocols_Hooks *tph = @@ -40,8 +40,7 @@ TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL) int result = tph->get_thread_CORBA_priority (priority - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); if (result == -1) ACE_THROW_RETURN (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO), -1); @@ -51,7 +50,7 @@ TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL) void TAO_RT_Current::the_priority (RTCORBA::Priority the_priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -60,11 +59,10 @@ TAO_RT_Current::the_priority (RTCORBA::Priority the_priority int result = tph->set_thread_CORBA_priority (the_priority - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (result == -1) - ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); + throw ( ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h index 58b994d0bee..eb4ec47a061 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -52,11 +52,11 @@ public: /// Default constructor. TAO_RT_Current (TAO_ORB_Core *orb_core); - virtual RTCORBA::Priority the_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual RTCORBA::Priority the_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void the_priority (RTCORBA::Priority the_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp index a74d7ea7277..ff81c17061e 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp @@ -32,7 +32,7 @@ RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void) } TAO_Invocation_Endpoint_Selector * -RT_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +RT_Endpoint_Selector_Factory::get_selector (void) { return this->rt_invocation_endpoint_selector_; } diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h index f361563ad22..90a7b58caed 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h @@ -61,7 +61,7 @@ public: virtual ~RT_Endpoint_Selector_Factory (void); virtual TAO_Invocation_Endpoint_Selector *get_selector ( - ACE_ENV_SINGLE_ARG_DECL); + void); private: TAO_RT_Invocation_Endpoint_Selector *rt_invocation_endpoint_selector_; diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp index 841c73bc6dc..1d3c767d922 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp @@ -18,35 +18,30 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy * TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type, - TAO::Profile_Transport_Resolver &r - ACE_ENV_ARG_DECL) + TAO::Profile_Transport_Resolver &r) { CORBA::Policy *policy = CORBA::Policy::_nil (); TAO_RT_Stub *rt_stub = dynamic_cast<TAO_RT_Stub *> (r.stub ()); - ACE_TRY + try { policy = rt_stub->get_cached_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (CORBA::INV_POLICY, ex) + catch ( ::CORBA::INV_POLICY&) { if (r.inconsistent_policies ()) { CORBA::PolicyList *p = r.inconsistent_policies (); p->length (1); (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return policy; } diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h index 649c3ca2896..22b71e8a727 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h @@ -46,7 +46,7 @@ public: static CORBA::Policy *policy (TAO_Cached_Policy_Type type, TAO::Profile_Transport_Resolver &r - ACE_ENV_ARG_DECL); + ); private: /// ctor. diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index a850ca0bea8..72481b3476a 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -28,16 +28,15 @@ void TAO_RT_Invocation_Endpoint_Selector::select_endpoint ( TAO::Profile_Transport_Resolver *r, ACE_Time_Value *val - ACE_ENV_ARG_DECL) + ) { if (r == 0) - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); CORBA::Policy_var client_protocol_policy_base = TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL, *r - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (client_protocol_policy_base.ptr () == 0) { @@ -48,8 +47,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint ( int status = this->endpoint_from_profile (*r, val - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (status == 1) return; @@ -58,7 +56,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint ( // If we get here, we completely failed to find an endpoint selector // that we know how to use, so throw an exception. - ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2, + throw ( ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); } else @@ -66,8 +64,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint ( RTCORBA::ClientProtocolPolicy_var client_protocol_policy = RTCORBA::ClientProtocolPolicy::_narrow ( client_protocol_policy_base.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); /// Cast to TAO_ClientProtocolPolicy TAO_ClientProtocolPolicy *tao_client_protocol_policy = @@ -82,8 +79,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint ( client_protocol_policy.in (), client_protocols, val - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } @@ -93,7 +89,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po RTCORBA::ClientProtocolPolicy_ptr client_protocol_policy, RTCORBA::ProtocolList &client_protocols, ACE_Time_Value *val - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean valid_profile_found = false; @@ -127,8 +123,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po int const status = this->endpoint_from_profile (r, val - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (status == 1) return; @@ -150,12 +145,12 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po (*p)[0u] = CORBA::Policy::_duplicate (client_protocol_policy); } - ACE_THROW (CORBA::INV_POLICY ()); + throw ( ::CORBA::INV_POLICY ()); } // If we get here, we found at least one pertinent profile, but no // usable endpoints. - ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2, + throw ( ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); } @@ -164,7 +159,7 @@ int TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( TAO::Profile_Transport_Resolver &r, ACE_Time_Value *val - ACE_ENV_ARG_DECL) + ) { // Narrow to the RT Stub. TAO_RT_Stub *rt_stub = @@ -173,15 +168,13 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( // Get the priority model policy. CORBA::Policy_var priority_model_policy = rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // Get the bands policy. CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION, r - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); int all_endpoints_are_valid = 0; int match_priority = 0; @@ -241,8 +234,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( int status = protocol_hooks->get_thread_CORBA_priority ( client_thread_priority // side effect - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (status == -1) { ACE_THROW_RETURN (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, @@ -263,7 +255,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( { // Check which band range we fall in. - int in_range = 0; + bool in_range = false; protocol_hooks->get_selector_bands_policy_hook ( bands_policy.in (), client_thread_priority, @@ -337,8 +329,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( CORBA::Policy_var private_connection_policy = rt_stub->get_cached_policy (TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!CORBA::is_nil (private_connection_policy.in ())) { @@ -360,8 +351,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( bool status = r.try_connect (&rt_transport_descriptor, val - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // Check if the invocation has completed. if (status == true) diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h index 4c6d75e022e..2222edd4fe2 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h @@ -52,7 +52,7 @@ public: virtual void select_endpoint (TAO::Profile_Transport_Resolver *r, ACE_Time_Value *val - ACE_ENV_ARG_DECL); + ); protected: void select_endpoint_based_on_client_protocol_policy ( @@ -60,12 +60,12 @@ protected: RTCORBA::ClientProtocolPolicy_ptr client_protocol_policy, RTCORBA::ProtocolList &protocols, ACE_Time_Value *v - ACE_ENV_ARG_DECL + ); int endpoint_from_profile (TAO::Profile_Transport_Resolver &r, ACE_Time_Value *v - ACE_ENV_ARG_DECL); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp index 701505481ee..fefde587437 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.cpp +++ b/TAO/tao/RTCORBA/RT_Mutex.cpp @@ -17,24 +17,24 @@ TAO_RT_Mutex::~TAO_RT_Mutex (void) } void -TAO_RT_Mutex::lock (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Mutex::lock (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->mu_.acquire () != 0) - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } void -TAO_RT_Mutex::unlock (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Mutex::unlock (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->mu_.release () != 0) - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } CORBA::Boolean TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { int result; diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index 2381712964f..89732b0008b 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -58,11 +58,11 @@ class TAO_RTCORBA_Export TAO_RT_Mutex public: /// Acquire the lock. - virtual void lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void lock (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Release the lock. - virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void unlock (void) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -72,7 +72,7 @@ public: * using this operation in your program designs. */ virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns the name of the mutex. diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 7f6e2cc028b..bc94e1f7926 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -41,41 +41,41 @@ TAO_RT_ORB::~TAO_RT_ORB (void) } RTCORBA::Mutex_ptr -TAO_RT_ORB::create_mutex (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_ORB::create_mutex (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->mutex_mgr_.create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->mutex_mgr_.create_mutex (); } void TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->mutex_mgr_.destroy_mutex (mutex - ACE_ENV_ARG_PARAMETER); + ); } RTCORBA::Mutex_ptr TAO_RT_ORB::create_named_mutex (const char *name, CORBA::Boolean_out created_flag - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mutex_mgr_.create_named_mutex (name, created_flag - ACE_ENV_ARG_PARAMETER); + ); } RTCORBA::Mutex_ptr TAO_RT_ORB::open_named_mutex (const char *name - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)) { return this->mutex_mgr_.open_named_mutex (name - ACE_ENV_ARG_PARAMETER); + ); } //////////////////////////////////////////////////////////////////////////////// @@ -89,7 +89,7 @@ TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void) } RTCORBA::Mutex_ptr -TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL) +TAO_Named_RT_Mutex_Manager::create_mutex (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *mutex = 0; @@ -100,7 +100,6 @@ TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ()); return mutex; } @@ -110,7 +109,7 @@ TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL) #if (TAO_HAS_NAMED_RT_MUTEXES == 1) void TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *tao_mutex = @@ -126,19 +125,18 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex monitor, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK; int result = this->map_.unbind (name); if (result != 0) - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } } #else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ void TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -147,7 +145,7 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr RTCORBA::Mutex_ptr TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, CORBA::Boolean_out created_flag - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_NAMED_RT_MUTEXES == 1) @@ -156,7 +154,6 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, monitor, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ()); // Optimistic that we'll find it. created_flag = 0; @@ -179,7 +176,6 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ()); mutex = tmp_mutex; @@ -205,7 +201,7 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, RTCORBA::Mutex_ptr TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)) { @@ -215,7 +211,6 @@ TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name monitor, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ()); // If we find the mutex, simply return it. RTCORBA::Mutex_var mutex; @@ -242,7 +237,7 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size, CORBA::Boolean dont_route, CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException )) { TAO_TCP_Protocol_Properties *tmp = 0; @@ -255,7 +250,6 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size, enable_network_priority), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::TCPProtocolProperties::_nil ()); return tmp; } @@ -264,7 +258,7 @@ RTCORBA::UnixDomainProtocolProperties_ptr TAO_RT_ORB::create_unix_domain_protocol_properties ( CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UnixDomain_Protocol_Properties *tmp = 0; @@ -274,7 +268,6 @@ TAO_RT_ORB::create_unix_domain_protocol_properties ( recv_buffer_size), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::UnixDomainProtocolProperties::_nil ()); return tmp; } @@ -289,7 +282,7 @@ TAO_RT_ORB::create_shared_memory_protocol_properties ( CORBA::Long preallocate_buffer_size, const char *mmap_filename, const char *mmap_lockname - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SharedMemory_Protocol_Properties *tmp = 0; @@ -304,7 +297,6 @@ TAO_RT_ORB::create_shared_memory_protocol_properties ( mmap_lockname), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::SharedMemoryProtocolProperties::_nil ()); return tmp; } @@ -312,7 +304,7 @@ TAO_RT_ORB::create_shared_memory_protocol_properties ( RTCORBA::UserDatagramProtocolProperties_ptr TAO_RT_ORB::create_user_datagram_protocol_properties ( CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UserDatagram_Protocol_Properties *tmp = 0; @@ -321,7 +313,6 @@ TAO_RT_ORB::create_user_datagram_protocol_properties ( enable_network_priority), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::UserDatagramProtocolProperties::_nil ()); return tmp; } @@ -334,7 +325,7 @@ TAO_RT_ORB::create_stream_control_protocol_properties ( CORBA::Boolean dont_route, CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_StreamControl_Protocol_Properties *tmp = 0; @@ -348,7 +339,6 @@ TAO_RT_ORB::create_stream_control_protocol_properties ( enable_network_priority), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::StreamControlProtocolProperties::_nil ()); return tmp; } @@ -361,7 +351,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->tp_manager_->create_threadpool (stacksize, @@ -372,7 +362,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize, max_buffered_requests, max_request_buffer_size, this->dynamic_thread_idle_timeout_ - ACE_ENV_ARG_PARAMETER); + ); } RTCORBA::ThreadpoolId @@ -382,7 +372,7 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->tp_manager_->create_threadpool_with_lanes (stacksize, @@ -392,23 +382,23 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize, max_buffered_requests, max_request_buffer_size, this->dynamic_thread_idle_timeout_ - ACE_ENV_ARG_PARAMETER); + ); } void TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)) { this->tp_manager_->destroy_threadpool (threadpool - ACE_ENV_ARG_PARAMETER); + ); } RTCORBA::PriorityModelPolicy_ptr TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityModelPolicy *tmp = 0; @@ -416,14 +406,13 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model, TAO_PriorityModelPolicy (priority_model, server_priority), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::PriorityModelPolicy::_nil ()); return tmp; } RTCORBA::ThreadpoolPolicy_ptr TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ThreadpoolPolicy *tmp = 0; @@ -431,7 +420,6 @@ TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool TAO_ThreadpoolPolicy (threadpool), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::ThreadpoolPolicy::_nil ()); return tmp; } @@ -439,7 +427,7 @@ TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool RTCORBA::PriorityBandedConnectionPolicy_ptr TAO_RT_ORB::create_priority_banded_connection_policy (const RTCORBA::PriorityBands & priority_bands - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityBandedConnectionPolicy *tmp = 0; @@ -447,13 +435,12 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const TAO_PriorityBandedConnectionPolicy (priority_bands), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::PriorityBandedConnectionPolicy::_nil ()); return tmp; } RTCORBA::PrivateConnectionPolicy_ptr -TAO_RT_ORB::create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_ORB::create_private_connection_policy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PrivateConnectionPolicy *tmp = 0; @@ -461,14 +448,13 @@ TAO_RT_ORB::create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL) TAO_PrivateConnectionPolicy (), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::PrivateConnectionPolicy::_nil ()); return tmp; } RTCORBA::ServerProtocolPolicy_ptr TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ServerProtocolPolicy *tmp = 0; @@ -476,14 +462,13 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco TAO_ServerProtocolPolicy (protocols), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::ServerProtocolPolicy::_nil ()); return tmp; } RTCORBA::ClientProtocolPolicy_ptr TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ClientProtocolPolicy *tmp = 0; @@ -491,7 +476,6 @@ TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protoco TAO_ClientProtocolPolicy (protocols), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (RTCORBA::ClientProtocolPolicy::_nil ()); return tmp; } diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 612108d048d..110a44ab880 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -60,20 +60,20 @@ public: /// Destructor. ~TAO_Named_RT_Mutex_Manager (void); - RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + RTCORBA::Mutex_ptr create_mutex (void) ACE_THROW_SPEC ((CORBA::SystemException)); void destroy_mutex (RTCORBA::Mutex_ptr the_mutex - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::Mutex_ptr create_named_mutex (const char *name, CORBA::Boolean_out created_flag - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::Mutex_ptr open_named_mutex (const char * name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound )); @@ -117,7 +117,7 @@ public: * consistant priority inheritance/piority ceiling semantics * can be guaranteed. */ - virtual RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual RTCORBA::Mutex_ptr create_mutex (void) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -126,7 +126,7 @@ public: * 0. */ virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -136,12 +136,12 @@ public: */ virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name, CORBA::Boolean_out created_flag - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Retrieve a previously created mutex. virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound )); @@ -158,14 +158,14 @@ public: CORBA::Boolean dont_route, CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException )); RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties ( CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::SharedMemoryProtocolProperties_ptr @@ -178,13 +178,13 @@ public: CORBA::Long preallocate_buffer_size, const char *mmap_filename, const char *mmap_lockname - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::UserDatagramProtocolProperties_ptr create_user_datagram_protocol_properties ( CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::StreamControlProtocolProperties_ptr @@ -195,7 +195,7 @@ public: CORBA::Boolean dont_route, CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Create a RTCORBA threadpool to manage a set of threads without lanes. @@ -207,7 +207,7 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -221,12 +221,12 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Free the resources associated with the specified threadpool. virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)); @@ -235,13 +235,13 @@ public: create_priority_model_policy ( RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Create a ThreadpoolPolicy instance for POA creation virtual RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -251,7 +251,7 @@ public: virtual RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (const RTCORBA::PriorityBands & priority_bands - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -260,7 +260,7 @@ public: * to the server. */ virtual RTCORBA::PrivateConnectionPolicy_ptr - create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create_private_connection_policy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -269,7 +269,7 @@ public: */ virtual RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (const RTCORBA::ProtocolList & protocols - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -278,7 +278,7 @@ public: */ virtual RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (const RTCORBA::ProtocolList & protocols - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Reference to our creating ORB Core. diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 464c35660aa..724f2f49578 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -64,7 +64,7 @@ TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type, void TAO_RT_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ -120,14 +120,12 @@ TAO_RT_ORBInitializer::pre_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; TAO_Priority_Mapping_Manager_var safe_manager = manager; info->register_initial_reference ("PriorityMappingManager", manager - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Create the initial priority mapping instance. TAO_Network_Priority_Mapping *npm = 0; @@ -155,22 +153,19 @@ TAO_RT_ORBInitializer::pre_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; TAO_Network_Priority_Mapping_Manager_var safe_network_manager = network_manager; info->register_initial_reference ("NetworkPriorityMappingManager", network_manager - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (CORBA::is_nil (tao_info.in ())) { @@ -181,7 +176,7 @@ TAO_RT_ORBInitializer::pre_init ( "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" "(%P|%t) \"TAO_ORBInitInfo *.\"\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } // Create the RT_ORB. @@ -194,13 +189,11 @@ TAO_RT_ORBInitializer::pre_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; CORBA::Object_var safe_rt_orb = rt_orb; info->register_initial_reference (TAO_OBJID_RTORB, rt_orb - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Create the RT_Current. CORBA::Object_ptr current = CORBA::Object::_nil (); @@ -211,13 +204,11 @@ TAO_RT_ORBInitializer::pre_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; CORBA::Object_var safe_rt_current = current; info->register_initial_reference (TAO_OBJID_RTCURRENT, current - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_); tao_info->orb_core ()->orb_params ()->sched_policy (this->sched_policy_); @@ -227,19 +218,18 @@ TAO_RT_ORBInitializer::pre_init ( void TAO_RT_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - ACE_ENV_ARG_PARAMETER); + ); - ACE_CHECK; } void TAO_RT_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + ) { // The RTCorba policy factory is stateless and reentrant, so share a // single instance between all ORBs. @@ -253,7 +243,6 @@ TAO_RT_ORBInitializer::register_policy_factories ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; this->policy_factory_ = policy_factory; } @@ -277,14 +266,13 @@ TAO_RT_ORBInitializer::register_policy_factories ( i != end; ++i) { - ACE_TRY + try { info->register_policy_factory (*i, this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch ( ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -295,15 +283,13 @@ TAO_RT_ORBInitializer::register_policy_factories ( // ORBInitializer. return; } - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // Rethrow any other exceptions... - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h index c2f04c46c04..905a4ed1fa7 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.h +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h @@ -66,11 +66,11 @@ public: ACE_Time_Value const &dynamic_thread_idle_timeout); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -78,7 +78,7 @@ private: /// Register RTCORBA policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); + ); private: /// Instance of the RTCorba policy factory. diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 381da1bd572..faba49d63c8 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -153,7 +153,7 @@ TAO_RT_ORB_Loader::init (int argc, } // Register the ORB initializer. - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_orb_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -171,23 +171,20 @@ TAO_RT_ORB_Loader::init (int argc, TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; PortableInterceptor::ORBInitializer_var orb_initializer; orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception caught while " "initializing the RTORB"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp index cd80662c192..3c6ff8c53f7 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp @@ -17,33 +17,33 @@ CORBA::Policy_ptr TAO_RT_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) return TAO_PriorityModelPolicy::create (value - ACE_ENV_ARG_PARAMETER); + ); if (type == RTCORBA::THREADPOOL_POLICY_TYPE) return TAO_ThreadpoolPolicy::create (value - ACE_ENV_ARG_PARAMETER); + ); if (type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE) return TAO_ServerProtocolPolicy::create (value - ACE_ENV_ARG_PARAMETER); + ); if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE) return TAO_ClientProtocolPolicy::create (value - ACE_ENV_ARG_PARAMETER); + ); if (type == RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE) return TAO_PrivateConnectionPolicy::create (value - ACE_ENV_ARG_PARAMETER); + ); if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE) return TAO_PriorityBandedConnectionPolicy::create (value - ACE_ENV_ARG_PARAMETER); + ); ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); @@ -52,7 +52,7 @@ TAO_RT_PolicyFactory::create_policy ( CORBA::Policy_ptr TAO_RT_PolicyFactory::_create_policy ( CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { @@ -67,7 +67,6 @@ TAO_RT_PolicyFactory::_create_policy ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return policy; } @@ -81,7 +80,6 @@ TAO_RT_PolicyFactory::_create_policy ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return policy; } @@ -95,7 +93,6 @@ TAO_RT_PolicyFactory::_create_policy ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return policy; } diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h index 0d7877c9489..d51b6ec34c8 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.h +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h @@ -48,12 +48,12 @@ public: CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); CORBA::Policy_ptr _create_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index 5cb4737b17a..8fc4e57f21f 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -56,7 +56,7 @@ TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void) CORBA::Policy_ptr TAO_PriorityModelPolicy::create (const CORBA::Any & - ACE_ENV_ARG_DECL) + ) { /* * @@ The following code should be changed once the OMG spec has @@ -74,28 +74,28 @@ TAO_PriorityModelPolicy::get_priority_model (void) } RTCORBA::PriorityModel -TAO_PriorityModelPolicy::priority_model (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityModelPolicy::priority_model (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->priority_model_; } RTCORBA::Priority -TAO_PriorityModelPolicy::server_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityModelPolicy::server_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->server_priority_; } CORBA::PolicyType -TAO_PriorityModelPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityModelPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::PRIORITY_MODEL_POLICY_TYPE; } CORBA::Policy_ptr -TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_PriorityModelPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityModelPolicy* tmp = 0; @@ -103,13 +103,12 @@ TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO_PriorityModelPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_PriorityModelPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityModelPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -176,7 +175,7 @@ TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy (void) CORBA::Policy_ptr TAO_ThreadpoolPolicy::create (const CORBA::Any &val - ACE_ENV_ARG_DECL) + ) { RTCORBA::ThreadpoolId value; if ((val >>= value) == 0) @@ -188,27 +187,26 @@ TAO_ThreadpoolPolicy::create (const CORBA::Any &val TAO_ThreadpoolPolicy (value), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } RTCORBA::ThreadpoolId -TAO_ThreadpoolPolicy::threadpool (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ThreadpoolPolicy::threadpool (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->id_; } CORBA::PolicyType -TAO_ThreadpoolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ThreadpoolPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::THREADPOOL_POLICY_TYPE; } CORBA::Policy_ptr -TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_ThreadpoolPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ThreadpoolPolicy* tmp = 0; @@ -216,13 +214,12 @@ TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO_ThreadpoolPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_ThreadpoolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ThreadpoolPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -266,27 +263,26 @@ TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void) CORBA::Policy_ptr TAO_PrivateConnectionPolicy::create (const CORBA::Any & - ACE_ENV_ARG_DECL) + ) { TAO_PrivateConnectionPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_PrivateConnectionPolicy (), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } CORBA::PolicyType -TAO_PrivateConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PrivateConnectionPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE; } CORBA::Policy_ptr -TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_PrivateConnectionPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PrivateConnectionPolicy* tmp = 0; @@ -294,13 +290,12 @@ TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO_PrivateConnectionPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_PrivateConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PrivateConnectionPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -351,7 +346,7 @@ TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy (void) CORBA::Policy_ptr TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val - ACE_ENV_ARG_DECL) + ) { RTCORBA::PriorityBands *value = 0; if ((val >>= value) == 0) @@ -363,13 +358,12 @@ TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val TAO_PriorityBandedConnectionPolicy (*value), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } RTCORBA::PriorityBands * -TAO_PriorityBandedConnectionPolicy::priority_bands (ACE_ENV_SINGLE_ARG_DECL) +TAO_PriorityBandedConnectionPolicy::priority_bands (void) ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::PriorityBands *tmp; @@ -377,20 +371,19 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (ACE_ENV_SINGLE_ARG_DECL) RTCORBA::PriorityBands (this->priority_bands_), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return tmp; } CORBA::PolicyType -TAO_PriorityBandedConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityBandedConnectionPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE; } CORBA::Policy_ptr -TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_PriorityBandedConnectionPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityBandedConnectionPolicy *tmp = 0; @@ -398,13 +391,12 @@ TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO_PriorityBandedConnectionPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_PriorityBandedConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityBandedConnectionPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -468,7 +460,7 @@ TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy (void) CORBA::Policy_ptr TAO_ServerProtocolPolicy::create (const CORBA::Any &val - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolList *value = 0; if ((val >>= value) == 0) @@ -480,13 +472,12 @@ TAO_ServerProtocolPolicy::create (const CORBA::Any &val TAO_ServerProtocolPolicy (*value), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } RTCORBA::ProtocolList * -TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL) +TAO_ServerProtocolPolicy::protocols (void) ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::ProtocolList *tmp = 0; @@ -494,20 +485,19 @@ TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL) RTCORBA::ProtocolList (this->protocols_), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return tmp; } CORBA::PolicyType -TAO_ServerProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerProtocolPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE; } CORBA::Policy_ptr -TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_ServerProtocolPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ServerProtocolPolicy* tmp = 0; @@ -515,13 +505,12 @@ TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO_ServerProtocolPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_ServerProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerProtocolPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -578,7 +567,7 @@ TAO_ClientProtocolPolicy::~TAO_ClientProtocolPolicy () CORBA::Policy_ptr TAO_ClientProtocolPolicy::create (const CORBA::Any &val - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolList *value = 0; if ((val >>= value) == 0) @@ -590,13 +579,12 @@ TAO_ClientProtocolPolicy::create (const CORBA::Any &val TAO_ClientProtocolPolicy (*value), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } RTCORBA::ProtocolList * -TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientProtocolPolicy::protocols (void) ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::ProtocolList *tmp = 0; @@ -604,20 +592,19 @@ TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL) RTCORBA::ProtocolList (this->protocols_), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return tmp; } CORBA::PolicyType -TAO_ClientProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ClientProtocolPolicy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE; } CORBA::Policy_ptr -TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_ClientProtocolPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ClientProtocolPolicy* tmp = 0; @@ -625,13 +612,12 @@ TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO_ClientProtocolPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_ClientProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ClientProtocolPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -732,7 +718,7 @@ TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties (void) } CORBA::Long -TAO_TCP_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TCP_Protocol_Properties::send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; @@ -740,14 +726,14 @@ TAO_TCP_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_TCP_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long -TAO_TCP_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TCP_Protocol_Properties::recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; @@ -755,14 +741,14 @@ TAO_TCP_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_TCP_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; } CORBA::Boolean -TAO_TCP_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TCP_Protocol_Properties::keep_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->keep_alive_; @@ -770,14 +756,14 @@ TAO_TCP_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_TCP_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->keep_alive_ = keep_alive; } CORBA::Boolean -TAO_TCP_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TCP_Protocol_Properties::dont_route (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->dont_route_; @@ -785,13 +771,13 @@ TAO_TCP_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_TCP_Protocol_Properties::dont_route (CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->dont_route_ = dont_route; } -CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->no_delay_; @@ -799,14 +785,14 @@ CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NO void TAO_TCP_Protocol_Properties::no_delay (CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->no_delay_ = no_delay; } CORBA::Boolean -TAO_TCP_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TCP_Protocol_Properties::enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->enable_network_priority_; @@ -814,7 +800,7 @@ TAO_TCP_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NO void TAO_TCP_Protocol_Properties::enable_network_priority (CORBA::Boolean enable - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->enable_network_priority_ = enable; @@ -863,7 +849,7 @@ TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties (void) } CORBA::Long -TAO_UnixDomain_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UnixDomain_Protocol_Properties::send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; @@ -871,14 +857,14 @@ TAO_UnixDomain_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NO void TAO_UnixDomain_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long -TAO_UnixDomain_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; @@ -886,7 +872,7 @@ TAO_UnixDomain_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NO void TAO_UnixDomain_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; @@ -933,7 +919,7 @@ TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties (voi CORBA::Long -TAO_SharedMemory_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SharedMemory_Protocol_Properties::send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; @@ -941,14 +927,14 @@ TAO_SharedMemory_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_ void TAO_SharedMemory_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long -TAO_SharedMemory_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; @@ -956,14 +942,14 @@ TAO_SharedMemory_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_ void TAO_SharedMemory_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; } CORBA::Boolean -TAO_SharedMemory_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SharedMemory_Protocol_Properties::keep_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->keep_alive_; @@ -971,14 +957,14 @@ TAO_SharedMemory_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_US void TAO_SharedMemory_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->keep_alive_ = keep_alive; } CORBA::Boolean -TAO_SharedMemory_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SharedMemory_Protocol_Properties::dont_route (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->dont_route_; @@ -986,14 +972,14 @@ TAO_SharedMemory_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_US void TAO_SharedMemory_Protocol_Properties::dont_route (CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->dont_route_ = dont_route; } CORBA::Boolean -TAO_SharedMemory_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SharedMemory_Protocol_Properties::no_delay (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->no_delay_; @@ -1001,14 +987,14 @@ TAO_SharedMemory_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED void TAO_SharedMemory_Protocol_Properties::no_delay (CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->no_delay_ = no_delay; } CORBA::Long -TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->preallocate_buffer_size_; @@ -1016,14 +1002,14 @@ TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (ACE_ENV_SINGLE_AR void TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->preallocate_buffer_size_ = preallocate_buffer_size; } char * -TAO_SharedMemory_Protocol_Properties::mmap_filename (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SharedMemory_Protocol_Properties::mmap_filename (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mmap_filename_.rep (); @@ -1031,14 +1017,14 @@ TAO_SharedMemory_Protocol_Properties::mmap_filename (ACE_ENV_SINGLE_ARG_DECL_NOT void TAO_SharedMemory_Protocol_Properties::mmap_filename (const char * mmap_filename - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->mmap_filename_.set (mmap_filename); } char * -TAO_SharedMemory_Protocol_Properties::mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SharedMemory_Protocol_Properties::mmap_lockname (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mmap_lockname_.rep (); @@ -1046,7 +1032,7 @@ TAO_SharedMemory_Protocol_Properties::mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_NOT void TAO_SharedMemory_Protocol_Properties::mmap_lockname (const char * mmap_lockname - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->mmap_lockname_.set (mmap_lockname); @@ -1104,7 +1090,7 @@ TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties (voi } CORBA::Boolean -TAO_UserDatagram_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UserDatagram_Protocol_Properties::enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->enable_network_priority_; @@ -1112,7 +1098,7 @@ TAO_UserDatagram_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_AR void TAO_UserDatagram_Protocol_Properties::enable_network_priority (CORBA::Boolean enable - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->enable_network_priority_ = enable; @@ -1152,7 +1138,7 @@ TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties (v } CORBA::Long -TAO_StreamControl_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StreamControl_Protocol_Properties::send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; @@ -1160,14 +1146,14 @@ TAO_StreamControl_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL void TAO_StreamControl_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long -TAO_StreamControl_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StreamControl_Protocol_Properties::recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; @@ -1175,14 +1161,14 @@ TAO_StreamControl_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL void TAO_StreamControl_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; } CORBA::Boolean -TAO_StreamControl_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StreamControl_Protocol_Properties::keep_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->keep_alive_; @@ -1190,14 +1176,14 @@ TAO_StreamControl_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_U void TAO_StreamControl_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->keep_alive_ = keep_alive; } CORBA::Boolean -TAO_StreamControl_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StreamControl_Protocol_Properties::dont_route (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->dont_route_; @@ -1205,13 +1191,13 @@ TAO_StreamControl_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_U void TAO_StreamControl_Protocol_Properties::dont_route (CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->dont_route_ = dont_route; } -CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->no_delay_; @@ -1219,14 +1205,14 @@ CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (ACE_ENV_SINGLE_A void TAO_StreamControl_Protocol_Properties::no_delay (CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->no_delay_ = no_delay; } CORBA::Boolean -TAO_StreamControl_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StreamControl_Protocol_Properties::enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->enable_network_priority_; @@ -1234,7 +1220,7 @@ TAO_StreamControl_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_A void TAO_StreamControl_Protocol_Properties::enable_network_priority (CORBA::Boolean enable - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->enable_network_priority_ = enable; diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index ed8e1cfe6a4..90af34a3ff6 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -68,19 +68,19 @@ public: */ RTCORBA::PriorityModel get_priority_model (void); - RTCORBA::PriorityModel priority_model (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + RTCORBA::PriorityModel priority_model (void) ACE_THROW_SPEC ((CORBA::SystemException)); - RTCORBA::Priority server_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + RTCORBA::Priority server_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of the object state. @@ -98,7 +98,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any &val - ACE_ENV_ARG_DECL); + ); protected: @@ -138,16 +138,16 @@ public: /// Copy constructor. TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs); - RTCORBA::ThreadpoolId threadpool (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + RTCORBA::ThreadpoolId threadpool (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -159,7 +159,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any &val - ACE_ENV_ARG_DECL); + ); protected: @@ -195,13 +195,13 @@ public: /// Copy constructor. TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -213,7 +213,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any &val - ACE_ENV_ARG_DECL); + ); protected: @@ -254,16 +254,16 @@ public: */ RTCORBA::PriorityBands &priority_bands_rep (void); - RTCORBA::PriorityBands *priority_bands (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + RTCORBA::PriorityBands *priority_bands (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of the current object. @@ -281,7 +281,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any &val - ACE_ENV_ARG_DECL); + ); protected: @@ -329,16 +329,16 @@ public: RTCORBA::ProtocolList & protocols_rep (void); RTCORBA::ProtocolList *protocols - (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -350,7 +350,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any &val - ACE_ENV_ARG_DECL); + ); protected: @@ -393,16 +393,16 @@ public: RTCORBA::ProtocolList & protocols_rep (void); RTCORBA::ProtocolList *protocols - (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); // = CDR Encoder/Decoder. @@ -422,7 +422,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any &val - ACE_ENV_ARG_DECL); + ); protected: @@ -463,46 +463,46 @@ public: CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority); - CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); void send_buffer_size (CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); void recv_buffer_size (CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean keep_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)); void keep_alive (CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean dont_route (void) ACE_THROW_SPEC ((CORBA::SystemException)); void dont_route (CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean no_delay (void) ACE_THROW_SPEC ((CORBA::SystemException)); void no_delay (CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); void enable_network_priority (CORBA::Boolean enable - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of TCPProtocolProperties. @@ -548,18 +548,18 @@ public: TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size); - CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); void send_buffer_size (CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); void recv_buffer_size (CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -621,63 +621,63 @@ public: // = IDL interface methods. - CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); void send_buffer_size (CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); void recv_buffer_size (CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean keep_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)); void keep_alive (CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean dont_route (void) ACE_THROW_SPEC ((CORBA::SystemException)); void dont_route (CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean no_delay (void) ACE_THROW_SPEC ((CORBA::SystemException)); void no_delay (CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long preallocate_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); void preallocate_buffer_size (CORBA::Long preallocate_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - char *mmap_filename (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + char *mmap_filename (void) ACE_THROW_SPEC ((CORBA::SystemException)); void mmap_filename (const char *mmap_filename - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - char *mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + char *mmap_lockname (void) ACE_THROW_SPEC ((CORBA::SystemException)); void mmap_lockname (const char *mmap_lockname - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -734,11 +734,11 @@ public: /// Constructor. TAO_UserDatagram_Protocol_Properties (CORBA::Boolean enable_network_priority); - CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); void enable_network_priority (CORBA::Boolean enable - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of UserDatagramProtocolProperties. @@ -781,46 +781,46 @@ public: CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority); - CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); void send_buffer_size (CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); void recv_buffer_size (CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean keep_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)); void keep_alive (CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean dont_route (void) ACE_THROW_SPEC ((CORBA::SystemException)); void dont_route (CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean no_delay (void) ACE_THROW_SPEC ((CORBA::SystemException)); void no_delay (CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); void enable_network_priority (CORBA::Boolean enable - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of StreamControlProtocolProperties. diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index bcb82f8efbf..5a7db421e33 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -40,8 +40,7 @@ TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void) } void -TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL) +TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core) { this->orb_core_ = orb_core; @@ -51,9 +50,7 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core TAO_OBJID_PRIORITYMAPPINGMANAGER); this->mapping_manager_ = - TAO_Priority_Mapping_Manager::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + TAO_Priority_Mapping_Manager::_narrow (obj.in ()); // Save a reference to the priority mapping manager. CORBA::Object_var object = @@ -61,33 +58,26 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core TAO_OBJID_NETWORKPRIORITYMAPPINGMANAGER); this->network_mapping_manager_ = - TAO_Network_Priority_Mapping_Manager::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + TAO_Network_Priority_Mapping_Manager::_narrow (object.in ()); object = this->orb_core_->object_ref_table ().resolve_initial_reference ( TAO_OBJID_RTCURRENT); - this->current_ = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->current_ = RTCORBA::Current::_narrow (object.in ()); } RTCORBA::ProtocolProperties_ptr TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag, CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL) + ) { if (CORBA::is_nil (policy)) return 0; RTCORBA::ServerProtocolPolicy_var server_protocol_policy = - RTCORBA::ServerProtocolPolicy::_narrow (policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + RTCORBA::ServerProtocolPolicy::_narrow (policy); if (CORBA::is_nil (server_protocol_policy.in ())) return 0; @@ -106,7 +96,8 @@ TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag, { if (protocols[j].protocol_type == protocol_tag) { - return RTCORBA::ProtocolProperties::_duplicate (protocols[j].transport_protocol_properties.in ()); + return RTCORBA::ProtocolProperties::_duplicate ( + protocols[j].transport_protocol_properties.in ()); } } @@ -116,15 +107,13 @@ TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag, RTCORBA::ProtocolProperties_ptr TAO_RT_Protocols_Hooks::client_protocol_properties (IOP::ProfileId protocol_tag, CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL) + ) { if (CORBA::is_nil (policy)) return 0; RTCORBA::ClientProtocolPolicy_var client_protocol_policy = - RTCORBA::ClientProtocolPolicy::_narrow (policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + RTCORBA::ClientProtocolPolicy::_narrow (policy); if (CORBA::is_nil (client_protocol_policy.in ())) return 0; @@ -143,7 +132,8 @@ TAO_RT_Protocols_Hooks::client_protocol_properties (IOP::ProfileId protocol_tag, { if (protocols[j].protocol_type == protocol_tag) { - return RTCORBA::ProtocolProperties::_duplicate (protocols[j].transport_protocol_properties.in ()); + return RTCORBA::ProtocolProperties::_duplicate ( + protocols[j].transport_protocol_properties.in ()); } } @@ -151,57 +141,44 @@ TAO_RT_Protocols_Hooks::client_protocol_properties (IOP::ProfileId protocol_tag, } RTCORBA::ProtocolProperties_ptr -TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag - ACE_ENV_ARG_DECL) +TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level ( + IOP::ProfileId protocol_tag) { CORBA::Policy_var policy = - this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL); - return this->server_protocol_properties (protocol_tag, - policy.in () - ACE_ENV_ARG_PARAMETER); + return this->server_protocol_properties (protocol_tag, policy.in ()); } RTCORBA::ProtocolProperties_ptr -TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag - ACE_ENV_ARG_DECL) +TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level ( + IOP::ProfileId protocol_tag) { CORBA::Policy_var policy = - this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL); - return this->client_protocol_properties (protocol_tag, - policy.in () - ACE_ENV_ARG_PARAMETER); + return this->client_protocol_properties (protocol_tag, policy.in ()); } RTCORBA::ProtocolProperties_ptr -TAO_RT_Protocols_Hooks::client_protocol_properties_at_object_level (IOP::ProfileId protocol_tag, - TAO_Stub *stub - ACE_ENV_ARG_DECL) +TAO_RT_Protocols_Hooks::client_protocol_properties_at_object_level ( + IOP::ProfileId protocol_tag, + TAO_Stub *stub) { CORBA::Policy_var policy = - stub->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + stub->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL); - return this->client_protocol_properties (protocol_tag, - policy.in () - ACE_ENV_ARG_PARAMETER); + return this->client_protocol_properties (protocol_tag, policy.in ()); } void TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL) + ) { RTCORBA::TCPProtocolProperties_var protocol_properties = RTCORBA::TCPProtocolProperties::_narrow (from - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); to.send_buffer_size_ = protocol_properties->send_buffer_size (); to.recv_buffer_size_ = protocol_properties->recv_buffer_size (); @@ -213,44 +190,38 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Propertie void TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = - this->server_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->server_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, - from.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + from.in ()); } void TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = this->client_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, from.in () - ACE_ENV_ARG_PARAMETER); + ); } void TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_UIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL) + ) { RTCORBA::UnixDomainProtocolProperties_var protocol_properties = RTCORBA::UnixDomainProtocolProperties::_narrow (from - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); to.send_buffer_size_ = protocol_properties->send_buffer_size (); to.recv_buffer_size_ = protocol_properties->recv_buffer_size (); @@ -258,44 +229,40 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_UIOP_Protocol_Propertie void TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = this->server_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, from.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = this->client_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, from.in () - ACE_ENV_ARG_PARAMETER); + ); } void TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SHMIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL) + ) { RTCORBA::SharedMemoryProtocolProperties_var protocol_properties = RTCORBA::SharedMemoryProtocolProperties::_narrow (from - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); to.preallocate_buffer_size_ = protocol_properties->preallocate_buffer_size (); to.mmap_filename_ = protocol_properties->mmap_filename (); @@ -304,88 +271,80 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SHMIOP_Protocol_Propert void TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = this->server_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, from.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = this->client_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, from.in () - ACE_ENV_ARG_PARAMETER); + ); } void TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_DIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL) + ) { RTCORBA::UserDatagramProtocolProperties_var protocol_properties = RTCORBA::UserDatagramProtocolProperties::_narrow (from - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); to.enable_network_priority_ = protocol_properties->enable_network_priority (); } void TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = this->server_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, from.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = this->client_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, from.in () - ACE_ENV_ARG_PARAMETER); + ); } void TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SCIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL) + ) { RTCORBA::StreamControlProtocolProperties_var protocol_properties = RTCORBA::StreamControlProtocolProperties::_narrow (from - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); to.send_buffer_size_ = protocol_properties->send_buffer_size (); to.recv_buffer_size_ = protocol_properties->recv_buffer_size (); @@ -397,39 +356,35 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SCIOP_Protocol_Properti void TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = - this->server_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->server_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, from.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &to - ACE_ENV_ARG_DECL) + ) { RTCORBA::ProtocolProperties_var from = this->client_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (from.in ())) this->extract_protocol_properties (to, from.in () - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag, RTCORBA::ProtocolProperties_ptr protocol_properties - ACE_ENV_ARG_DECL) + ) { if (CORBA::is_nil (protocol_properties)) return false; @@ -438,8 +393,7 @@ TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag, { RTCORBA::TCPProtocolProperties_var tcp_protocol_properties = RTCORBA::TCPProtocolProperties::_narrow (protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); return tcp_protocol_properties->enable_network_priority (); } @@ -448,8 +402,7 @@ TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag, { RTCORBA::UserDatagramProtocolProperties_var udp_protocol_properties = RTCORBA::UserDatagramProtocolProperties::_narrow (protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); return udp_protocol_properties->enable_network_priority (); } @@ -458,8 +411,7 @@ TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag, { RTCORBA::StreamControlProtocolProperties_var sctp_protocol_properties = RTCORBA::StreamControlProtocolProperties::_narrow (protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); return sctp_protocol_properties->enable_network_priority (); } @@ -470,7 +422,7 @@ TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag, CORBA::Boolean TAO_RT_Protocols_Hooks::set_client_network_priority (IOP::ProfileId protocol_tag, TAO_Stub *stub - ACE_ENV_ARG_DECL) + ) { if (protocol_tag != IOP::TAG_INTERNET_IOP && protocol_tag != TAO_TAG_DIOP_PROFILE && @@ -479,19 +431,16 @@ TAO_RT_Protocols_Hooks::set_client_network_priority (IOP::ProfileId protocol_tag RTCORBA::ProtocolProperties_var protocol_properties = this->client_protocol_properties_at_object_level (protocol_tag, - stub - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + stub); return this->set_network_priority (protocol_tag, - protocol_properties.in () - ACE_ENV_ARG_PARAMETER); + protocol_properties.in ()); } CORBA::Boolean TAO_RT_Protocols_Hooks::set_server_network_priority (IOP::ProfileId protocol_tag, CORBA::Policy *policy - ACE_ENV_ARG_DECL) + ) { if (protocol_tag != IOP::TAG_INTERNET_IOP && protocol_tag != TAO_TAG_DIOP_PROFILE && @@ -501,12 +450,11 @@ TAO_RT_Protocols_Hooks::set_server_network_priority (IOP::ProfileId protocol_tag RTCORBA::ProtocolProperties_var protocol_properties = this->server_protocol_properties (protocol_tag, policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); return this->set_network_priority (protocol_tag, protocol_properties.in () - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Long @@ -518,8 +466,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void) CORBA::Long codepoint = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Make several invocation, changing the priority of this thread // for each. @@ -528,8 +475,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void) this->network_mapping_manager_->mapping (); const CORBA::Short priority = - this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->current_->the_priority (); if (pm->to_network (priority, codepoint) == 0) { @@ -544,7 +490,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void) return -1; } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { @@ -554,8 +500,6 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void) return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return codepoint; } @@ -564,9 +508,7 @@ void TAO_RT_Protocols_Hooks::rt_service_context ( TAO_Stub *stub, TAO_Service_Context &service_context, - CORBA::Boolean restart - ACE_ENV_ARG_DECL - ) + CORBA::Boolean restart) { // If the restart flag is true, then this call for a // reinvocation. We need not prepare the Service Context List once @@ -577,27 +519,22 @@ TAO_RT_Protocols_Hooks::rt_service_context ( dynamic_cast<TAO_RT_Stub *> (stub); CORBA::Policy_var priority_model_policy = - rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL); if (!CORBA::is_nil (priority_model_policy.in ())) { CORBA::Short client_priority; - int status = - this->get_thread_CORBA_priority (client_priority - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + int const status = + this->get_thread_CORBA_priority (client_priority); if (status == -1) - ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); + throw ( ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); this->add_rt_service_context_hook (service_context, priority_model_policy.in (), client_priority - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } else { @@ -612,14 +549,13 @@ TAO_RT_Protocols_Hooks::add_rt_service_context_hook ( TAO_Service_Context &service_context, CORBA::Policy *model_policy, CORBA::Short &client_priority - ACE_ENV_ARG_DECL + ) { RTCORBA::PriorityModelPolicy_var model_policy_ptr = RTCORBA::PriorityModelPolicy::_narrow (model_policy - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); TAO_PriorityModelPolicy *priority_model = static_cast<TAO_PriorityModelPolicy *> (model_policy_ptr.in ()); @@ -632,7 +568,7 @@ TAO_RT_Protocols_Hooks::add_rt_service_context_hook ( if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0) || (cdr << client_priority) == 0) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } service_context.set_context (IOP::RTCorbaPriority, cdr); @@ -643,8 +579,7 @@ void TAO_RT_Protocols_Hooks::get_selector_hook ( CORBA::Policy *model_policy, CORBA::Boolean &is_client_propagated, - CORBA::Short &server_priority - ) + CORBA::Short &server_priority) { RTCORBA::PriorityModelPolicy_var model_policy_ptr = @@ -653,8 +588,7 @@ TAO_RT_Protocols_Hooks::get_selector_hook ( TAO_PriorityModelPolicy *priority_model_policy = static_cast<TAO_PriorityModelPolicy *> (model_policy_ptr.in ()); - if (priority_model_policy->get_priority_model () - == RTCORBA::CLIENT_PROPAGATED) + if (priority_model_policy->get_priority_model () == RTCORBA::CLIENT_PROPAGATED) { is_client_propagated = true; } @@ -673,7 +607,7 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook ( CORBA::Short priority, CORBA::Short &min_priority, CORBA::Short &max_priority, - int &in_range + bool &in_range ) { RTCORBA::PriorityBandedConnectionPolicy_var bands_policy_ptr = @@ -693,7 +627,7 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook ( min_priority = bands[i].low; max_priority = bands[i].high; - in_range = 1; + in_range = true; break; } } @@ -701,14 +635,13 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook ( int TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority - ACE_ENV_ARG_DECL) + ) { CORBA::Short native_priority = 0; int const result = this->get_thread_CORBA_and_native_priority (priority, native_priority - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); if (result == -1) { @@ -721,7 +654,7 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority int TAO_RT_Protocols_Hooks::get_thread_native_priority ( CORBA::Short &native_priority - ACE_ENV_ARG_DECL_NOT_USED + ) { ACE_hthread_t current; @@ -747,13 +680,12 @@ int TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority ( CORBA::Short &priority, CORBA::Short &native_priority - ACE_ENV_ARG_DECL + ) { int result = this->get_thread_native_priority (native_priority - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); if (result == -1) { @@ -777,7 +709,7 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority ( int TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority - ACE_ENV_ARG_DECL) + ) { TAO_Priority_Mapping *priority_mapping = this->mapping_manager_.in ()->mapping (); @@ -790,13 +722,13 @@ TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority } return this->set_thread_native_priority (native_priority - ACE_ENV_ARG_PARAMETER); + ); } int TAO_RT_Protocols_Hooks::set_thread_native_priority ( CORBA::Short native_priority - ACE_ENV_ARG_DECL_NOT_USED + ) { ACE_hthread_t current; diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h index a1542f2e2a8..c0fcc0da284 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h @@ -44,57 +44,55 @@ public: /// Initialize the protocols hooks instance. void init_hooks (TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL); + ); CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag, - TAO_Stub *stub - ACE_ENV_ARG_DECL); + TAO_Stub *stub); CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag, - CORBA::Policy *policy - ACE_ENV_ARG_DECL); + CORBA::Policy *policy); void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties - ACE_ENV_ARG_DECL); + ); CORBA::Long get_dscp_codepoint (void); void rt_service_context (TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean restart - ACE_ENV_ARG_DECL); + ); void add_rt_service_context_hook (TAO_Service_Context &service_context, CORBA::Policy *model_policy, CORBA::Short &client_priority - ACE_ENV_ARG_DECL); + ); void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean @@ -105,7 +103,7 @@ public: CORBA::Short priority, CORBA::Short &min_priority, CORBA::Short &max_priority, - int &in_range); + bool &in_range); /** * Accessor and modifier to the current thread priority, used to @@ -114,20 +112,20 @@ public: */ //@{ int get_thread_CORBA_priority (CORBA::Short & - ACE_ENV_ARG_DECL); + ); int get_thread_native_priority (CORBA::Short & - ACE_ENV_ARG_DECL); + ); int get_thread_CORBA_and_native_priority (CORBA::Short &, CORBA::Short & - ACE_ENV_ARG_DECL); + ); int set_thread_CORBA_priority (CORBA::Short - ACE_ENV_ARG_DECL); + ); int set_thread_native_priority (CORBA::Short - ACE_ENV_ARG_DECL); + ); //@} @@ -135,45 +133,45 @@ protected: RTCORBA::ProtocolProperties_ptr server_protocol_properties (IOP::ProfileId protocol_tag, CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL); + ); RTCORBA::ProtocolProperties_ptr client_protocol_properties (IOP::ProfileId protocol_tag, CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL); + ); RTCORBA::ProtocolProperties_ptr server_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag - ACE_ENV_ARG_DECL); + ); RTCORBA::ProtocolProperties_ptr client_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag - ACE_ENV_ARG_DECL); + ); RTCORBA::ProtocolProperties_ptr client_protocol_properties_at_object_level (IOP::ProfileId protocol_tag, TAO_Stub *stub - ACE_ENV_ARG_DECL); + ); void extract_protocol_properties (TAO_IIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL); + ); void extract_protocol_properties (TAO_UIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL); + ); void extract_protocol_properties (TAO_SHMIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL); + ); void extract_protocol_properties (TAO_DIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL); + ); void extract_protocol_properties (TAO_SCIOP_Protocol_Properties &to, RTCORBA::ProtocolProperties_ptr from - ACE_ENV_ARG_DECL); + ); CORBA::Boolean set_network_priority (IOP::ProfileId protocol_tag, RTCORBA::ProtocolProperties_ptr protocol_properties - ACE_ENV_ARG_DECL); + ); protected: diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp index a82714e4802..e8478ab48cb 100644 --- a/TAO/tao/RTCORBA/RT_Stub.cpp +++ b/TAO/tao/RTCORBA/RT_Stub.cpp @@ -43,11 +43,10 @@ TAO_RT_Stub::~TAO_RT_Stub (void) } void -TAO_RT_Stub::parse_policies (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::parse_policies (void) { CORBA::PolicyList_var policy_list - = this->base_profiles_.policy_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + = this->base_profiles_.policy_list (); CORBA::ULong length = policy_list->length (); @@ -71,12 +70,11 @@ TAO_RT_Stub::parse_policies (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Policy * -TAO_RT_Stub::exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::exposed_priority_model (void) { if (!this->are_policies_parsed_) { - this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->parse_policies (); } return CORBA::Policy::_duplicate (this->priority_model_policy_.in ()); @@ -89,12 +87,11 @@ TAO_RT_Stub::exposed_priority_model (CORBA::Policy_ptr policy) } CORBA::Policy * -TAO_RT_Stub::exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::exposed_priority_banded_connection (void) { if (!this->are_policies_parsed_) { - this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->parse_policies (); } return CORBA::Policy::_duplicate (this->priority_banded_connection_policy_.in ()); @@ -108,12 +105,11 @@ TAO_RT_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy) } CORBA::Policy * -TAO_RT_Stub::exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::exposed_client_protocol (void) { if (!this->are_policies_parsed_) { - this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->parse_policies (); } return CORBA::Policy::_duplicate (this->client_protocol_policy_.in ()); @@ -129,45 +125,45 @@ TAO_RT_Stub::exposed_client_protocol (CORBA::Policy_ptr policy) CORBA::Policy_ptr TAO_RT_Stub::get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) { // If we are dealing with a client exposed policy, check if any // value came in the IOR/reconcile IOR value and overrides. if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) - return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->exposed_priority_model (); if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE) - return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->effective_priority_banded_connection (); if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE) - return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->effective_client_protocol (); - return this->TAO_Stub::get_policy (type ACE_ENV_ARG_PARAMETER); + return this->TAO_Stub::get_policy (type); } CORBA::Policy_ptr TAO_RT_Stub::get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL) + ) { // If we are dealing with a client exposed policy, check if any // value came in the IOR/reconcile IOR value and overrides. if (type == TAO_CACHED_POLICY_PRIORITY_MODEL) - return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->exposed_priority_model (); if (type == TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION) - return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->effective_priority_banded_connection (); if (type == TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL) - return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->effective_client_protocol (); - return this->TAO_Stub::get_cached_policy (type ACE_ENV_ARG_PARAMETER); + return this->TAO_Stub::get_cached_policy (type); } TAO_Stub * TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL) + ) { // Validity check. Make sure requested policies are allowed to be // set at this scope. @@ -177,8 +173,7 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies, if (CORBA::is_nil (policy)) continue; - CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::PolicyType type = policy->policy_type (); if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE || type == RTCORBA::THREADPOOL_POLICY_TYPE || @@ -189,24 +184,22 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies, // We are not required to check for consistency of <policies> with // overrides at other levels or with policies exported in the IOR. - return this->TAO_Stub::set_policy_overrides(policies, set_add ACE_ENV_ARG_PARAMETER); + return this->TAO_Stub::set_policy_overrides(policies, set_add); } #endif /* TAO_HAS_CORBA_MESSAGING */ CORBA::Policy * -TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::effective_priority_banded_connection (void) { // Get effective override. CORBA::Policy_var override = this->TAO_Stub::get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); // Get the value from the ior. CORBA::Policy_var exposed = - this->exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->exposed_priority_banded_connection (); // Reconcile client-exposed and locally set values. if (CORBA::is_nil (exposed.in ())) @@ -217,16 +210,14 @@ TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL) RTCORBA::PriorityBandedConnectionPolicy_var override_policy_var = RTCORBA::PriorityBandedConnectionPolicy::_narrow (override.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); TAO_PriorityBandedConnectionPolicy *override_policy = static_cast<TAO_PriorityBandedConnectionPolicy *> (override_policy_var.in ()); RTCORBA::PriorityBandedConnectionPolicy_var exposed_policy_var = RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); TAO_PriorityBandedConnectionPolicy *exposed_policy = static_cast<TAO_PriorityBandedConnectionPolicy *> (exposed_policy_var.in ()); @@ -246,18 +237,16 @@ TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Policy * -TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::effective_client_protocol (void) { // Get effective override. CORBA::Policy_var override = this->TAO_Stub::get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); // Get the value from the ior. CORBA::Policy_var exposed = - this->exposed_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->exposed_client_protocol (); // Reconcile client-exposed and locally set values. if (CORBA::is_nil (exposed.in ())) @@ -268,16 +257,14 @@ TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL) RTCORBA::ClientProtocolPolicy_var override_policy_var = RTCORBA::ClientProtocolPolicy::_narrow (override.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); TAO_ClientProtocolPolicy *override_policy = static_cast<TAO_ClientProtocolPolicy *> (override_policy_var.in ()); RTCORBA::ClientProtocolPolicy_var exposed_policy_var = RTCORBA::ClientProtocolPolicy::_narrow (exposed.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); TAO_ClientProtocolPolicy *exposed_policy = static_cast<TAO_ClientProtocolPolicy *> (exposed_policy_var.in ()); diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index fcaf8a32562..4a9fdbe8d87 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -64,21 +64,21 @@ public: * types. */ CORBA::Policy_ptr get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL); + ); CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + ); TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL); + ); #endif /* TAO_HAS_CORBA_MESSAGING */ private: /// Helper method used to parse the policies. - void parse_policies (ACE_ENV_SINGLE_ARG_DECL); + void parse_policies (void); void exposed_priority_model (CORBA::Policy_ptr policy); @@ -89,17 +89,17 @@ private: /// Returns the CORBA::Policy (which will be narrowed to be /// used as RTCORBA::PriorityModelPolicy) exported /// in object's IOR. - CORBA::Policy_ptr exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Policy_ptr exposed_priority_model (void); /// Returns the CORBA::Policy (which will be narrowed and used /// as RTCORBA::PriorityBandedConnectionPolicy) exported /// in object's IOR. - CORBA::Policy_ptr exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Policy_ptr exposed_priority_banded_connection (void); /// Returns the CORBA::Policy (which will be narrowed and used /// as RTCORBA::ClientProtocolPolicy) exported /// in object's IOR. - CORBA::Policy_ptr exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Policy_ptr exposed_client_protocol (void); // = Methods for obtaining effective policies. // @@ -108,8 +108,8 @@ private: // override for a given policy type, and then reconciling it with // the policy value exported in the Object's IOR. - CORBA::Policy *effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL); - CORBA::Policy *effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Policy *effective_priority_banded_connection (void); + CORBA::Policy *effective_client_protocol (void); // The following attribute are used to cache // the different kind of policies and avoid to diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp index 84f376955cd..9547b094338 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp @@ -26,7 +26,7 @@ TAO_Stub * TAO_RT_Stub_Factory::create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL) + ) { // @@ TODO: As soon as the RT_STUB is done change this to // create an RT_STUB @@ -37,7 +37,6 @@ TAO_RT_Stub_Factory::create_stub (const char *repository_id, CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_MAYBE)); - ACE_CHECK_RETURN (retval); return retval; } diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h index 27a8f8cf712..d1bac507e1b 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.h +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h @@ -54,7 +54,7 @@ public: virtual TAO_Stub *create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp index 1b7aa28ff78..31bfb251a0e 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp @@ -43,7 +43,7 @@ TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (voi } int -TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (void) { TAO_ORB_Parameters *params = this->orb_core_->orb_params (); @@ -58,8 +58,7 @@ TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG int result = this->default_lane_resources_->open_acceptor_registry (endpoint_set, ignore_address - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); return result; } diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h index a1cfe5cdbf8..3b1d8633d5b 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -54,7 +54,7 @@ public: void finalize (void); /// Open default resources. - int open_default_resources (ACE_ENV_SINGLE_ARG_DECL); + int open_default_resources (void); /// Shutdown reactor. void shutdown_reactor (void); diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 32476bbef4b..846f759c78f 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -56,12 +56,12 @@ TAO_Thread_Pool_Threads::svc (void) TAO_Thread_Pool_Threads::set_tss_resources (orb_core, this->lane_); - ACE_TRY_NEW_ENV + try { // Do the work this->run (orb_core); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // No point propagating this exception. Print it out. ACE_ERROR ((LM_ERROR, @@ -70,19 +70,17 @@ TAO_Thread_Pool_Threads::svc (void) ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ""); } - ACE_ENDTRY; return 0; } int -TAO_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER) +TAO_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) { CORBA::ORB_ptr orb = orb_core.orb (); // Run the ORB. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + orb->run (); return 0; } @@ -105,15 +103,14 @@ TAO_Dynamic_Thread_Pool_Threads::TAO_Dynamic_Thread_Pool_Threads (TAO_Thread_Lan } int -TAO_Dynamic_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER) +TAO_Dynamic_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) { CORBA::ORB_ptr orb = orb_core.orb (); if (this->lane_.dynamic_thread_idle_timeout () == ACE_Time_Value::zero) { // No timeout specified, run the ORB until it shutdowns - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); } else { @@ -146,7 +143,7 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool, CORBA::ULong static_threads, CORBA::ULong dynamic_threads, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL_NOT_USED) + ) : pool_ (pool), id_ (id), lane_priority_ (lane_priority), @@ -224,11 +221,11 @@ TAO_Thread_Lane::shutting_down (void) } void -TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL) +TAO_Thread_Lane::validate_and_map_priority (void) { // Make sure that static_threads_number_ is not zero. if (this->static_threads_number_ == 0) - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); // Check that the priority is in bounds. if (this->lane_priority_ < RTCORBA::minPriority @@ -238,7 +235,7 @@ TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL) // || this->lane_priority_ > RTCORBA::maxPriority ) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); } CORBA::ORB_ptr orb = @@ -247,13 +244,11 @@ TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL) // Get the priority mapping manager. CORBA::Object_var obj = orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); TAO_Priority_Mapping_Manager_var mapping_manager = TAO_Priority_Mapping_Manager::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); RTCORBA::PriorityMapping *pm = mapping_manager.in ()->mapping (); @@ -264,7 +259,7 @@ TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL) this->native_priority_); if (!result) - ACE_THROW (CORBA::DATA_CONVERSION ()); + throw ( ::CORBA::DATA_CONVERSION ()); if (TAO_debug_level > 3) { @@ -277,11 +272,10 @@ TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_Thread_Lane::open (ACE_ENV_SINGLE_ARG_DECL) +TAO_Thread_Lane::open (void) { // Validate and map priority. - this->validate_and_map_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->validate_and_map_priority (); // Create a string with the pool:thread id. char pool_lane_id[10]; @@ -322,11 +316,10 @@ TAO_Thread_Lane::open (ACE_ENV_SINGLE_ARG_DECL) result = this->resources_.open_acceptor_registry (endpoint_set, ignore_address - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (result == -1) - ACE_THROW (CORBA::INTERNAL ( + throw ( ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE, 0), @@ -468,7 +461,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) : manager_ (manager), id_ (id), stack_size_ (stack_size), @@ -483,7 +476,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, { // No support for buffering. if (allow_request_buffering) - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); // Create one lane. ACE_NEW (this->lanes_, @@ -495,7 +488,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, static_threads, dynamic_threads, dynamic_thread_idle_timeout - ACE_ENV_ARG_PARAMETER)); + )); } TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, @@ -507,7 +500,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) : manager_ (manager), id_ (id), stack_size_ (stack_size), @@ -523,7 +516,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, // No support for buffering or borrowing. if (allow_borrowing || allow_request_buffering) - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); // Create multiple lane. ACE_NEW (this->lanes_, @@ -538,19 +531,18 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, lanes[i].static_threads, lanes[i].dynamic_threads, dynamic_thread_idle_timeout - ACE_ENV_ARG_PARAMETER)); + )); } void -TAO_Thread_Pool::open (ACE_ENV_SINGLE_ARG_DECL) +TAO_Thread_Pool::open (void) { // Open all the lanes. for (CORBA::ULong i = 0; i != this->number_of_lanes_; ++i) { - this->lanes_[i]->open (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->lanes_[i]->open (); } } @@ -728,11 +720,10 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_THREAD_POOL_MANAGER_GUARD; - ACE_CHECK_RETURN (0); return this->create_threadpool_i (stacksize, static_threads, @@ -742,7 +733,7 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize, max_buffered_requests, max_request_buffer_size, dynamic_thread_idle_timeout - ACE_ENV_ARG_PARAMETER); + ); } RTCORBA::ThreadpoolId @@ -753,11 +744,10 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_THREAD_POOL_MANAGER_GUARD; - ACE_CHECK_RETURN (0); return this->create_threadpool_with_lanes_i (stacksize, lanes, @@ -766,12 +756,12 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize, max_buffered_requests, max_request_buffer_size, dynamic_thread_idle_timeout - ACE_ENV_ARG_PARAMETER); + ); } void TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)) { @@ -783,7 +773,6 @@ TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool // results in a deadlock { TAO_THREAD_POOL_MANAGER_GUARD; - ACE_CHECK; // Unbind the thread pool from the map. int result = @@ -792,7 +781,7 @@ TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool // If the thread pool is not found in our map. if (result != 0) - ACE_THROW (RTCORBA::RTORB::InvalidThreadpool ()); + throw (RTCORBA::RTORB::InvalidThreadpool ()); } // Mark the thread pool that we are shutting down. @@ -821,7 +810,7 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the thread pool. @@ -838,12 +827,11 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize, max_buffered_requests, max_request_buffer_size, dynamic_thread_idle_timeout - ACE_ENV_ARG_PARAMETER), + ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return this->create_threadpool_helper (thread_pool - ACE_ENV_ARG_PARAMETER); + ); } RTCORBA::ThreadpoolId @@ -854,7 +842,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the thread pool. @@ -870,25 +858,23 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize, max_buffered_requests, max_request_buffer_size, dynamic_thread_idle_timeout - ACE_ENV_ARG_PARAMETER), + ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return this->create_threadpool_helper (thread_pool - ACE_ENV_ARG_PARAMETER); + ); } RTCORBA::ThreadpoolId TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Make sure of safe deletion in case of errors. auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool); // Open the pool. - thread_pool->open (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + thread_pool->open (); // Create the static threads. int result = @@ -931,10 +917,9 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool } TAO_Thread_Pool * -TAO_Thread_Pool_Manager::get_threadpool (RTCORBA::ThreadpoolId thread_pool_id ACE_ENV_ARG_DECL) +TAO_Thread_Pool_Manager::get_threadpool (RTCORBA::ThreadpoolId thread_pool_id ) { TAO_THREAD_POOL_MANAGER_GUARD; - ACE_CHECK_RETURN (0); TAO_Thread_Pool *thread_pool = 0; int result = diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index cd0047741e9..0514e9b6469 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -90,7 +90,7 @@ public: protected: /// Do the real work - virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER); + virtual int run (TAO_ORB_Core &orb_core); /// Lane to which this thread belongs to. TAO_Thread_Lane &lane_; @@ -112,7 +112,7 @@ public: protected: /// Do the real work - virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER); + virtual int run (TAO_ORB_Core &orb_core); }; class TAO_Thread_Pool; @@ -136,13 +136,13 @@ public: CORBA::ULong static_threads, CORBA::ULong dynamic_threads, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL); + ); /// Destructor. ~TAO_Thread_Lane (void); /// Open the lane. - void open (ACE_ENV_SINGLE_ARG_DECL); + void open (void); /// Finalize the resources. void finalize (void); @@ -198,7 +198,7 @@ public: private: /// Validate lane's priority and map it to a native value. - void validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL); + void validate_and_map_priority (void); int create_threads_i (TAO_Thread_Pool_Threads &thread_pool, CORBA::ULong number_of_threads, @@ -270,7 +270,7 @@ public: CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL); + ); /// Constructor (for pools with lanes). TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, @@ -282,13 +282,13 @@ public: CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL); + ); /// Destructor. ~TAO_Thread_Pool (void); /// Open the pool. - void open (ACE_ENV_SINGLE_ARG_DECL); + void open (void); /// Finalize the resources. void finalize (void); @@ -387,7 +387,7 @@ public: CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Create a threadpool with lanes. @@ -399,16 +399,16 @@ public: CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Destroy a threadpool. void destroy_threadpool (RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)); - TAO_Thread_Pool *get_threadpool (RTCORBA::ThreadpoolId thread_pool_id ACE_ENV_ARG_DECL); + TAO_Thread_Pool *get_threadpool (RTCORBA::ThreadpoolId thread_pool_id); /// Collection of thread pools. typedef ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex> THREAD_POOLS; @@ -434,7 +434,7 @@ private: CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::ThreadpoolId @@ -445,12 +445,12 @@ private: CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::ThreadpoolId create_threadpool_helper (TAO_Thread_Pool *thread_pool - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); // @} diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp index 0eecb7136a9..e49aaefad0c 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp @@ -20,8 +20,7 @@ ACE_RCSID(RTPortableServer, TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean -TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object - ACE_ENV_ARG_DECL) const +TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object) const { // Make sure that the servant is in the same ORB that created this // object. @@ -37,8 +36,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object TAO::Portable_Server::Servant_Upcall servant_upcall (orb_core); TAO_Root_POA *poa = servant_upcall.lookup_POA (object->_stubobj ()->object_key () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // Get the thread pool associated with this POA. TAO_Thread_Pool *target_thread_pool = @@ -98,7 +96,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object if (-1 == poa->find_servant_priority (servant_upcall.system_id_, target_priority - ACE_ENV_ARG_PARAMETER)) + )) { return false; }; diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h index 64f3016a4bd..a820c4dda34 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h @@ -42,10 +42,8 @@ class TAO_RTPortableServer_Export TAO_RT_Collocation_Resolver : public TAO_Collocation_Resolver { public: - /// Is @a object collocated? - virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object - ACE_ENV_ARG_DECL) const; + virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object) const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 3f8c6fb2673..1e376e54ce2 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -45,7 +45,7 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + ) : TAO_Regular_POA (name, poa_manager, policies, @@ -54,15 +54,13 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name, thread_lock, orb_core, object_adapter - ACE_ENV_ARG_PARAMETER), + ), thread_pool_ (0) { - ACE_CHECK; // Parse the RT policies and update our policy cache. this->parse_rt_policies (this->policies () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } TAO_RT_POA::~TAO_RT_POA (void) @@ -78,7 +76,7 @@ TAO_RT_POA::new_POA (const String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + ) { TAO_RT_POA *poa = 0; @@ -91,40 +89,35 @@ TAO_RT_POA::new_POA (const String &name, thread_lock, orb_core, object_adapter - ACE_ENV_ARG_PARAMETER), + ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return poa; } void TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { { CORBA::Policy_var policy = policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); RTCORBA::PriorityModelPolicy_var priority_model = RTCORBA::PriorityModelPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (priority_model.in ())) { RTCORBA::PriorityModel rt_priority_model = - priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + priority_model->priority_model (); this->cached_policies_.priority_model ( TAO::Portable_Server::Cached_Policies::PriorityModel (rt_priority_model)); RTCORBA::Priority priority = - priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + priority_model->server_priority (); this->cached_policies_.server_priority (priority); } @@ -133,13 +126,12 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies this->thread_pool_ = TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_, policies.policies () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_RT_POA::validate_priority (RTCORBA::Priority priority - ACE_ENV_ARG_DECL) + ) { if (priority < RTCORBA::minPriority // The line below will always be false unless the value of @@ -148,7 +140,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority // || priority > RTCORBA::maxPriority ) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); } // If this POA is using a thread pool with lanes, make sure the @@ -170,7 +162,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority return; } - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); } else // Else we are dealing with a thread pool without lanes. @@ -179,13 +171,11 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority CORBA::Policy_var bands = this->policies ().get_cached_policy ( TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); RTCORBA::PriorityBandedConnectionPolicy_var priority_bands = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); TAO_PriorityBandedConnectionPolicy *priority_bands_i = dynamic_cast <TAO_PriorityBandedConnectionPolicy *> @@ -207,13 +197,13 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority return; } - ACE_THROW (CORBA::BAD_PARAM ()); + throw ( ::CORBA::BAD_PARAM ()); } } } void -TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::validate_policies (void) { // For each of the above operations, if the POA supports the // IMPLICIT_ACTIVATION option for the ImplicitActivationPolicy then @@ -224,7 +214,7 @@ TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL) if (this->cached_policies_.implicit_activation () == PortableServer::IMPLICIT_ACTIVATION) { - ACE_THROW (PortableServer::POA::WrongPolicy ()); + throw (PortableServer::POA::WrongPolicy ()); } // For each of the above operations, if the POA does not support the @@ -233,7 +223,7 @@ TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL) if (this->cached_policies_.priority_model () != TAO::Portable_Server::Cached_Policies::SERVER_DECLARED) { - ACE_THROW (PortableServer::POA::WrongPolicy ()); + throw (PortableServer::POA::WrongPolicy ()); } // In all other respects the semantics of the corresponding @@ -246,24 +236,21 @@ TAO_Stub * TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key, const char *type_id, CORBA::Short priority - ACE_ENV_ARG_DECL) + ) { // Client exposed policies. CORBA::PolicyList_var client_exposed_policies = this->client_exposed_policies (priority - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // Server protocol policy. CORBA::Policy_var protocol = this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); RTCORBA::ServerProtocolPolicy_var server_protocol_policy = RTCORBA::ServerProtocolPolicy::_narrow (protocol.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); TAO_ServerProtocolPolicy *server_protocol = dynamic_cast <TAO_ServerProtocolPolicy *> (server_protocol_policy.in ()); @@ -308,7 +295,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key, client_exposed_policies._retn (), &filter, *acceptor_registry - ACE_ENV_ARG_PARAMETER); + ); } // If this POA has the SERVER_DECLARED policy, create the IOR with @@ -330,7 +317,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key, client_exposed_policies._retn (), &filter, lanes[i]->resources ().acceptor_registry () - ACE_ENV_ARG_PARAMETER); + ); } ACE_ASSERT (0); @@ -342,13 +329,11 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key, CORBA::Policy_var bands = this->policies ().get_cached_policy ( TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); RTCORBA::PriorityBandedConnectionPolicy_var priority_bands = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); TAO_PriorityBandedConnectionPolicy *priority_bands_i = dynamic_cast <TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ()); @@ -358,7 +343,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key, client_exposed_policies._retn (), &filter, priority_bands_i - ACE_ENV_ARG_PARAMETER); + ); } TAO_Stub * @@ -367,7 +352,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key, CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, TAO_PriorityBandedConnectionPolicy *priority_bands - ACE_ENV_ARG_DECL) + ) { int error = 0; @@ -442,7 +427,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key, this->orb_core_.create_stub_object (mprofile, type_id, policy_list - ACE_ENV_ARG_PARAMETER); + ); } size_t @@ -486,21 +471,19 @@ TAO_RT_POA::lane_required (TAO_Thread_Lane *lane, CORBA::PolicyList * TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority - ACE_ENV_ARG_DECL) + ) { CORBA::PolicyList *client_exposed_policies = 0; ACE_NEW_THROW_EX (client_exposed_policies, CORBA::PolicyList (), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); CORBA::PolicyList_var safe_client_exposed_policies = client_exposed_policies; // Add in all of the client exposed policies. this->policies_.add_client_exposed_fixed_policies (client_exposed_policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // Check if the priority model policy has been set, and if so, let // the client know about it. @@ -532,7 +515,6 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority priority), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); (*client_exposed_policies)[current_length] = priority_model_policy; } @@ -546,7 +528,7 @@ PortableServer::POA_ptr TAO_RT_POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -554,35 +536,32 @@ TAO_RT_POA::create_POA (const char *adapter_name, PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name, poa_manager, policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (poa); + ); return poa; } PortableServer::POA_ptr TAO_RT_POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)) { PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name, activate_it - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (poa); + ); return poa; } void TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_Regular_POA::destroy (etherealize_objects, wait_for_completion - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -590,13 +569,12 @@ TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects, PortableServer::ThreadPolicy_ptr TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ThreadPolicy_ptr policy = this->TAO_Regular_POA::create_thread_policy (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (policy); + ); return policy; } @@ -605,13 +583,12 @@ TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value #if !defined (CORBA_E_MICRO) PortableServer::LifespanPolicy_ptr TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::LifespanPolicy_ptr policy = this->TAO_Regular_POA::create_lifespan_policy (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (policy); + ); return policy; } #endif @@ -619,13 +596,12 @@ TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value #if !defined (CORBA_E_MICRO) PortableServer::IdUniquenessPolicy_ptr TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdUniquenessPolicy_ptr policy = this->TAO_Regular_POA::create_id_uniqueness_policy (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (policy); + ); return policy; } #endif @@ -633,13 +609,12 @@ TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue #if !defined (CORBA_E_MICRO) PortableServer::IdAssignmentPolicy_ptr TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdAssignmentPolicy_ptr policy = this->TAO_Regular_POA::create_id_assignment_policy (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (policy); + ); return policy; } #endif @@ -649,80 +624,73 @@ TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue PortableServer::ImplicitActivationPolicy_ptr TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ImplicitActivationPolicy_ptr policy = this->TAO_Regular_POA::create_implicit_activation_policy (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (policy); + ); return policy; } PortableServer::ServantRetentionPolicy_ptr TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ServantRetentionPolicy_ptr policy = this->TAO_Regular_POA::create_servant_retention_policy (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (policy); + ); return policy; } PortableServer::RequestProcessingPolicy_ptr TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::RequestProcessingPolicy_ptr policy = this->TAO_Regular_POA::create_request_processing_policy (value - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (policy); + ); return policy; } #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ char * -TAO_RT_POA::the_name (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { char * name = - this->TAO_Regular_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (name); + this->TAO_Regular_POA::the_name (); return name; } PortableServer::POA_ptr -TAO_RT_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_parent (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_ptr parent = - this->TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (parent); + this->TAO_Regular_POA::the_parent (); return parent; } PortableServer::POAList * -TAO_RT_POA::the_children (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_children (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAList *children = - this->TAO_Regular_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (children); + this->TAO_Regular_POA::the_children (); return children; } PortableServer::POAManager_ptr -TAO_RT_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_POAManager (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAManager_ptr poa_manager = - this->TAO_Regular_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (poa_manager); + this->TAO_Regular_POA::the_POAManager (); return poa_manager; } @@ -730,83 +698,76 @@ TAO_RT_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL) #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_ptr -TAO_RT_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_activator (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::AdapterActivator_ptr activator = - this->TAO_Regular_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (activator); + this->TAO_Regular_POA::the_activator (); return activator; } void TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_Regular_POA::the_activator (adapter_activator - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } PortableServer::ServantManager_ptr -TAO_RT_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::get_servant_manager (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { PortableServer::ServantManager_ptr servant_manager = - this->TAO_Regular_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (servant_manager); + this->TAO_Regular_POA::get_servant_manager (); return servant_manager; } void TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::set_servant_manager (imgr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } PortableServer::Servant -TAO_RT_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = - this->TAO_Regular_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (servant); + this->TAO_Regular_POA::get_servant (); return servant; } void TAO_RT_POA::set_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::set_servant (servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::ObjectId * TAO_RT_POA::activate_object (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::activate_object (p_servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (object_id); + ); return object_id; } @@ -814,7 +775,7 @@ TAO_RT_POA::activate_object (PortableServer::Servant p_servant void TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -822,82 +783,76 @@ TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id, { this->TAO_Regular_POA::activate_object_with_id (id, p_servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } #endif void TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::deactivate_object (oid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } CORBA::Object_ptr TAO_RT_POA::create_reference (const char *intf - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::create_reference (intf - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (obj); + ); return obj; } CORBA::Object_ptr TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::create_reference_with_id (oid, intf - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (obj); + ); return obj; } PortableServer::ObjectId * TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::servant_to_id (p_servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (object_id); + ); return object_id; } CORBA::Object_ptr TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::servant_to_reference (p_servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (obj); + ); return obj; } PortableServer::Servant TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, @@ -905,58 +860,54 @@ TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference { PortableServer::Servant servant = this->TAO_Regular_POA::reference_to_servant (reference - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (servant); + ); return servant; } PortableServer::ObjectId * TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::reference_to_id (reference - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (object_id); + ); return object_id; } PortableServer::Servant TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::id_to_servant (oid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (servant); + ); return servant; } CORBA::Object_ptr TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::id_to_reference (oid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (obj); + ); return obj; } CORBA::OctetSeq * -TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->TAO_Regular_POA::id (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 4f2937ff125..1cf913567bf 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -53,29 +53,25 @@ public: // RTCORBA specific methods CORBA::Object_ptr create_reference_with_priority (const char * intf, - RTCORBA::Priority priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + RTCORBA::Priority priority) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id_and_priority (const PortableServer::ObjectId & oid, const char * intf, - RTCORBA::Priority priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + RTCORBA::Priority priority) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant, - RTCORBA::Priority priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + RTCORBA::Priority priority) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid, PortableServer::Servant p_servant, - RTCORBA::Priority priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + RTCORBA::Priority priority) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -85,182 +81,167 @@ public: // Standard POA interface methods PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, - const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const CORBA::PolicyList &policies) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); PortableServer::POA_ptr find_POA (const char *adapter_name, - CORBA::Boolean activate_it - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean activate_it) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); void destroy (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean wait_for_completion) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::ThreadPolicy_ptr create_thread_policy ( + PortableServer::ThreadPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if !defined (CORBA_E_MICRO) - PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::LifespanPolicy_ptr create_lifespan_policy ( + PortableServer::LifespanPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)); #endif #if !defined (CORBA_E_MICRO) - PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( + PortableServer::IdUniquenessPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)); #endif #if !defined (CORBA_E_MICRO) - PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( + PortableServer::IdAssignmentPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)); #endif #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::ImplicitActivationPolicy_ptr + create_implicit_activation_policy ( + PortableServer::ImplicitActivationPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::ServantRetentionPolicy_ptr + create_servant_retention_policy ( + PortableServer::ServantRetentionPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::RequestProcessingPolicy_ptr + create_request_processing_policy ( + PortableServer::RequestProcessingPolicyValue value) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + char * the_name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POA_ptr the_parent (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAList *the_children (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAManager_ptr the_POAManager (void) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::AdapterActivator_ptr the_activator (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void the_activator (PortableServer::AdapterActivator_ptr adapter_activator - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void the_activator (PortableServer::AdapterActivator_ptr adapter_activator) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ServantManager_ptr get_servant_manager (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - void set_servant_manager (PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void set_servant_manager (PortableServer::ServantManager_ptr imgr) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::Servant get_servant (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); - void set_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void set_servant (PortableServer::Servant servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); #if !defined (CORBA_E_MICRO) void activate_object_with_id (const PortableServer::ObjectId &id, - PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::Servant p_servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); #endif - void deactivate_object (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void deactivate_object (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::Object_ptr create_reference (const char *intf - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Object_ptr create_reference (const char *intf) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, - const char *intf - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char *intf) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); - CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); - PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); - PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); - PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::OctetSeq *id (void) ACE_THROW_SPEC ((CORBA::SystemException)); // End standard POA interface methods. - virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority - ACE_ENV_ARG_DECL); + virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority); TAO_RT_POA (const String &name, PortableServer::POAManager_ptr poa_manager, @@ -269,8 +250,7 @@ public: ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); + TAO_Object_Adapter *object_adapter); virtual ~TAO_RT_POA (void); @@ -281,28 +261,24 @@ protected: /// Template method for creating new POA's of this type. virtual TAO_Root_POA *new_POA (const String &name, PortableServer::POAManager_ptr poa_manager, - const TAO_POA_Policy_Set &policies, - TAO_Root_POA *parent, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); + const TAO_POA_Policy_Set &policies, + TAO_Root_POA *parent, + ACE_Lock &lock, + TAO_SYNCH_MUTEX &thread_lock, + TAO_ORB_Core &orb_core, + TAO_Object_Adapter *object_adapter); virtual TAO_Stub *key_to_stub_i (const TAO::ObjectKey &key, const char *type_id, - CORBA::Short priority - ACE_ENV_ARG_DECL); + CORBA::Short priority); - void validate_priority (RTCORBA::Priority priority - ACE_ENV_ARG_DECL); + void validate_priority (RTCORBA::Priority priority); - void validate_policies (ACE_ENV_SINGLE_ARG_DECL); + void validate_policies (void); /// Parse the policy list for RT policies and update our /// cached policy instance. - void parse_rt_policies (TAO_POA_Policy_Set &policies - ACE_ENV_ARG_DECL); + void parse_rt_policies (TAO_POA_Policy_Set &policies); size_t endpoint_count (void); @@ -311,7 +287,7 @@ protected: CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, TAO_PriorityBandedConnectionPolicy *priority_bands - ACE_ENV_ARG_DECL); + ); int lane_required (TAO_Thread_Lane *lane, TAO_PriorityBandedConnectionPolicy *priority_bands); diff --git a/TAO/tao/RTPortableServer/RT_POA.inl b/TAO/tao/RTPortableServer/RT_POA.inl index bc0d00c7114..8a50bd7f91e 100644 --- a/TAO/tao/RTPortableServer/RT_POA.inl +++ b/TAO/tao/RTPortableServer/RT_POA.inl @@ -12,39 +12,35 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Object_ptr TAO_RT_POA::create_reference_with_priority (const char * intf, RTCORBA::Priority priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. - this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->validate_policies (); - this->validate_priority (priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->validate_priority (priority); // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); return this->create_reference_i (intf, priority - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE CORBA::Object_ptr TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectId & oid, const char * intf, RTCORBA::Priority priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. - this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->validate_policies (); - this->validate_priority (priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + this->validate_priority (priority); // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -52,23 +48,21 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI return this->create_reference_with_id_i (oid, intf, priority - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE PortableServer::ObjectId * TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant, RTCORBA::Priority priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. - this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->validate_policies (); - this->validate_priority (priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->validate_priority (priority); while (1) { @@ -81,8 +75,7 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant, this->activate_object_i (servant, priority, wait_occurred_restart_call - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); // If we ended up waiting on a condition variable, the POA state // may have changed while we are waiting. Therefore, we need to @@ -98,18 +91,16 @@ ACE_INLINE void TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid, PortableServer::Servant servant, RTCORBA::Priority priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. - this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->validate_policies (); - this->validate_priority (priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->validate_priority (priority); while (1) { @@ -122,8 +113,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId servant, priority, wait_occurred_restart_call - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // If we ended up waiting on a condition variable, the POA state // may have changed while we are waiting. Therefore, we need to diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 4e11afb2d2e..76674598e53 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -35,16 +35,13 @@ TAO_POA_RT_Policy_Validator::~TAO_POA_RT_Policy_Validator (void) void TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { - this->validate_thread_pool (policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->validate_thread_pool (policies); - this->validate_server_protocol (policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->validate_server_protocol (policies); - this->validate_priorities (policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->validate_priorities (policies); } CORBA::Boolean @@ -59,15 +56,14 @@ TAO_POA_RT_Policy_Validator::legal_policy_impl (CORBA::PolicyType type) void TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { // Make sure we have an endpoint for at least one of the protocols // specified in the RTCORBA::ServerProtocolPolicy. This ensure we // will be able to create non-nil object references. CORBA::Policy_var protocol = policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (CORBA::is_nil (protocol.in ())) { @@ -81,15 +77,13 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies if (!CORBA::is_nil (protocol.in ())) { // If so, we'll use that policy. - policies.set_policy (protocol.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.set_policy (protocol.in ()); } } RTCORBA::ServerProtocolPolicy_var server_protocol_policy = RTCORBA::ServerProtocolPolicy::_narrow (protocol.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); TAO_ServerProtocolPolicy *server_protocol = dynamic_cast <TAO_ServerProtocolPolicy *> @@ -154,13 +148,13 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies } if (!found) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); } } void TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { // Initialize to the default priority/priority model. CORBA::Short priority = @@ -170,23 +164,19 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies CORBA::Policy_var policy = policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); RTCORBA::PriorityModelPolicy_var priority_model = RTCORBA::PriorityModelPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (priority_model.in ())) { - priority = priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + priority = priority_model->server_priority (); rt_priority_model = TAO::Portable_Server::Cached_Policies::PriorityModel ( - priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + priority_model->priority_model ()); // Check that the priority is in bounds. if (priority < RTCORBA::minPriority @@ -196,7 +186,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies // || priority > RTCORBA::maxPriority ) { - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); } } else @@ -205,18 +195,16 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies { if (this->thread_pool_ != 0 && this->thread_pool_->with_lanes ()) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); } policy = policies.get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); RTCORBA::PriorityBandedConnectionPolicy_var priority_bands = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); TAO_PriorityBandedConnectionPolicy *bands_policy = dynamic_cast<TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ()); @@ -236,14 +224,14 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies { // Checks 0. if (rt_priority_model == TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); RTCORBA::PriorityBands &bands = bands_policy->priority_bands_rep (); // Checks 1. if (bands.length () == 0) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); // Checks 2. for (CORBA::ULong i = 0; i < bands.length (); ++i) @@ -259,7 +247,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies // || bands[i].high > RTCORBA::maxPriority ) { - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); } } @@ -278,7 +266,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies } if (!match) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); } // @@ -315,7 +303,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies match = 1; } if (!match) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); } // Done with checks. @@ -354,7 +342,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies match = 1; } if (!match) - ACE_THROW (PortableServer::POA::InvalidPolicy ()); + throw (PortableServer::POA::InvalidPolicy ()); // Done with checks. return; @@ -364,24 +352,22 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies void TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { this->thread_pool_ = TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_, policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { // Check if the user has specified the priority model policy. CORBA::Policy_var priority_model = policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (CORBA::is_nil (priority_model.in ())) { @@ -389,22 +375,19 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies // at the ORB level. priority_model = this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (priority_model.in ())) { // If so, we'll use that policy. - policies.set_policy (priority_model.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.set_policy (priority_model.in ()); } } // Check if the user has specified the server protocol policy. CORBA::Policy_var server_protocol = policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (CORBA::is_nil (server_protocol.in ())) { @@ -413,22 +396,19 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies server_protocol = this->orb_core_.get_cached_policy ( TAO_CACHED_POLICY_RT_SERVER_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (server_protocol.in ())) { // If so, we'll use that policy. - policies.set_policy (server_protocol.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.set_policy (server_protocol.in ()); } } // Check if the user has specified the thread pool policy. CORBA::Policy_var thread_pool = policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (CORBA::is_nil (thread_pool.in ())) { @@ -436,14 +416,12 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies // the ORB level. thread_pool = this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (!CORBA::is_nil (thread_pool.in ())) { // If so, we'll use that policy. - policies.set_policy (thread_pool.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + policies.set_policy (thread_pool.in ()); } } } @@ -552,24 +530,21 @@ TAO_POA_RT_Policy_Validator::server_protocol_policy_from_acceptor_registry (RTCO TAO_Thread_Pool * TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core, TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ) { CORBA::Policy_var policy = policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); RTCORBA::ThreadpoolPolicy_var thread_pool_policy = RTCORBA::ThreadpoolPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (CORBA::is_nil (thread_pool_policy.in ())) return 0; RTCORBA::ThreadpoolId thread_pool_id = - thread_pool_policy->threadpool (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + thread_pool_policy->threadpool (); // Get the RTORB. CORBA::Object_var object = @@ -577,8 +552,7 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core, RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); TAO_RT_ORB *tao_rt_orb = dynamic_cast <TAO_RT_ORB *> (rt_orb.in ()); @@ -587,8 +561,7 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core, tao_rt_orb->tp_manager (); TAO_Thread_Pool *thread_pool = - tp_manager.get_threadpool (thread_pool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tp_manager.get_threadpool (thread_pool_id); if (thread_pool == 0) ACE_THROW_RETURN (PortableServer::POA::InvalidPolicy (), diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h index 2f96666c544..4dd3bfd3460 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h @@ -55,7 +55,7 @@ public: static TAO_Thread_Pool *extract_thread_pool (TAO_ORB_Core &orb_core, TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); protected: @@ -65,11 +65,11 @@ protected: * if that is not the case. */ void validate_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); /// Add/merge policies. void merge_policies_impl (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); /** * Return whether the specified policy type is legal for the @@ -81,13 +81,13 @@ protected: private: void validate_server_protocol (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); void validate_priorities (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); void validate_thread_pool (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL); + ); TAO_Thread_Pool *thread_pool_; diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 25b735ea832..ea6c55bd2ba 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -37,7 +37,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( CORBA::Short servant_priority, TAO_ServerRequest &req, TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL) + ) { TAO_Service_Context &request_service_context = req.request_service_context (); @@ -113,11 +113,11 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( context->context_data.length ()); CORBA::Boolean byte_order; if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); cdr.reset_byte_order (static_cast<int> (byte_order)); if ((cdr >> target_priority) == 0) - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); // Save the target priority in the response service // context to propagate back to the client as specified @@ -165,8 +165,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( if (tph->get_thread_CORBA_and_native_priority ( pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_ - ACE_ENV_ARG_PARAMETER) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + ) == -1) + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); ACE_DEBUG ((LM_DEBUG, @@ -200,8 +200,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( if (tph->get_thread_CORBA_and_native_priority ( pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_ - ACE_ENV_ARG_PARAMETER) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + ) == -1) + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); // Priority needs to be changed temporarily changed for the @@ -209,9 +209,9 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( if (target_priority != pre_invoke_state.original_CORBA_priority_) { if (tph->set_thread_CORBA_priority (target_priority - ACE_ENV_ARG_PARAMETER) + ) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); pre_invoke_state.state_ = @@ -221,7 +221,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( { CORBA::Short native_priority; tph->get_thread_native_priority (native_priority - ACE_ENV_ARG_PARAMETER); + ); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s processing using %s ") @@ -255,14 +255,12 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( CORBA::Policy_var policy = poa.policies ().get_cached_policy ( TAO_CACHED_POLICY_RT_SERVER_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Boolean set_server_network_priority = tph->set_server_network_priority (req.transport ()->tag (), policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); TAO_Connection_Handler *connection_handler = req.transport ()->connection_handler (); @@ -274,7 +272,7 @@ void TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa, CORBA::Short servant_priority, TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL) + ) { TAO_Thread_Pool *thread_pool = static_cast <TAO_Thread_Pool *> (poa.thread_pool ()); @@ -310,9 +308,9 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa, if (tph->get_thread_CORBA_and_native_priority (pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_ - ACE_ENV_ARG_PARAMETER) + ) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); // Change the priority of the current thread for the duration of @@ -320,9 +318,9 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa, if (servant_priority != pre_invoke_state.original_CORBA_priority_) { if (tph->set_thread_CORBA_priority (servant_priority - ACE_ENV_ARG_PARAMETER) + ) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); pre_invoke_state.state_ = @@ -341,9 +339,8 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, pre_invoke_state.state_ = TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::NO_ACTION_REQUIRED; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Reset the priority of the current thread back to its original // value. @@ -352,13 +349,12 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, if (tph->set_thread_native_priority ( pre_invoke_state.original_native_priority_ - ACE_ENV_ARG_PARAMETER) + ) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // Eat up the exception. ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, @@ -366,7 +362,6 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, "Priority_Model_Processing::" "~Priority_Model_Processing"); } - ACE_ENDTRY; } } @@ -378,7 +373,7 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + ) { TAO_RT_POA *poa = 0; @@ -391,9 +386,8 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, thread_lock, orb_core, object_adapter - ACE_ENV_ARG_PARAMETER), + ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return poa; } diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h index 2e3af3ce333..5a06ff45afb 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h @@ -49,13 +49,13 @@ public: CORBA::Short servant_priority, TAO_ServerRequest &req, TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL); + ); /// Pre_invoke collocated request. void pre_invoke_collocated_request (TAO_Root_POA &poa, CORBA::Short servant_priority, TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL); + ); /// Post_invoke request. void post_invoke (TAO_Root_POA &poa, @@ -69,7 +69,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 08a4c9584f8..96262df1996 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -33,8 +33,7 @@ TAO_RTScheduler_Current::~TAO_RTScheduler_Current (void) } void -TAO_RTScheduler_Current::init (TAO_ORB_Core* orb - ACE_ENV_ARG_DECL) +TAO_RTScheduler_Current::init (TAO_ORB_Core* orb) { this->orb_ = orb; @@ -72,8 +71,7 @@ void TAO_RTScheduler_Current::begin_scheduling_segment ( const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL) + CORBA::Policy_ptr implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { @@ -89,7 +87,6 @@ TAO_RTScheduler_Current::begin_scheduling_segment ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; this->implementation (impl); } @@ -97,8 +94,7 @@ TAO_RTScheduler_Current::begin_scheduling_segment ( impl->begin_scheduling_segment (name, sched_param, implicit_sched_param - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } @@ -106,25 +102,23 @@ void TAO_RTScheduler_Current::update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { TAO_RTScheduler_Current_i *impl = this->implementation (); if (impl == 0) - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw ( ::CORBA::BAD_INV_ORDER ()); impl->update_scheduling_segment (name, sched_param, implicit_sched_param - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void -TAO_RTScheduler_Current::end_scheduling_segment (const char * name - ACE_ENV_ARG_DECL) +TAO_RTScheduler_Current::end_scheduling_segment (const char * name) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -133,18 +127,16 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name { ACE_ERROR ((LM_ERROR, "Missing scheduling context OR DT cancelled\n")); - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw ( ::CORBA::BAD_INV_ORDER ()); return; } impl->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } RTScheduling::DistributableThread_ptr -TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id - ACE_ENV_ARG_DECL_NOT_USED) +TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id) ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::DistributableThread_var DT; @@ -166,8 +158,7 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param, CORBA::ULong stack_size, - RTCORBA::Priority base_priority - ACE_ENV_ARG_DECL) + RTCORBA::Priority base_priority) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -182,11 +173,11 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start, implicit_sched_param, stack_size, base_priority - ACE_ENV_ARG_PARAMETER); + ); } RTScheduling::Current::IdType * -TAO_RTScheduler_Current::id (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTScheduler_Current::id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -194,11 +185,11 @@ TAO_RTScheduler_Current::id (ACE_ENV_SINGLE_ARG_DECL) if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->id (ACE_ENV_SINGLE_ARG_PARAMETER); + return impl->id (); } CORBA::Policy_ptr -TAO_RTScheduler_Current::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTScheduler_Current::scheduling_parameter (void) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -207,11 +198,11 @@ TAO_RTScheduler_Current::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL) if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER); + return impl->scheduling_parameter (); } CORBA::Policy_ptr -TAO_RTScheduler_Current::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTScheduler_Current::implicit_scheduling_parameter (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -219,11 +210,11 @@ TAO_RTScheduler_Current::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL) if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER); + return impl->implicit_scheduling_parameter (); } RTScheduling::Current::NameList * -TAO_RTScheduler_Current::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTScheduler_Current::current_scheduling_segment_names (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -231,23 +222,21 @@ TAO_RTScheduler_Current::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DE if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER); + return impl->current_scheduling_segment_names (); } RTCORBA::Priority -TAO_RTScheduler_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTScheduler_Current::the_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->rt_current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->rt_current_->the_priority (); } void -TAO_RTScheduler_Current::the_priority (RTCORBA::Priority the_priority - ACE_ENV_ARG_DECL) +TAO_RTScheduler_Current::the_priority (RTCORBA::Priority the_priority) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->rt_current_->the_priority(the_priority - ACE_ENV_ARG_PARAMETER); + this->rt_current_->the_priority(the_priority); } TAO_RTScheduler_Current_i* @@ -293,8 +282,7 @@ TAO_RTScheduler_Current_i::scheduler (void) } TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (TAO_ORB_Core* orb, - DT_Hash_Map* dt_hash - ACE_ENV_ARG_DECL) + DT_Hash_Map* dt_hash) :orb_ (orb), dt_ (RTScheduling::DistributableThread::_nil ()), previous_current_ (0), @@ -304,9 +292,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (TAO_ORB_Core* orb, this->orb_->object_ref_table ().resolve_initial_reference ( "RTScheduler"); - this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ()); } TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i ( @@ -317,8 +303,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i ( CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param, RTScheduling::DistributableThread_ptr dt, - TAO_RTScheduler_Current_i* prev_current - ACE_ENV_ARG_DECL) + TAO_RTScheduler_Current_i* prev_current) : orb_ (orb), guid_ (guid), name_ (CORBA::string_dup (name)), @@ -333,8 +318,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i ( "RTScheduler"); this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i (void) @@ -345,8 +329,7 @@ void TAO_RTScheduler_Current_i::begin_scheduling_segment( const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL) + CORBA::Policy_ptr implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { @@ -371,8 +354,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( name, sched_param, implicit_sched_param - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (CORBA::is_nil (this->dt_.in ())) //Create new DT. @@ -385,8 +367,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( // Error in binding to the map - cancel thread. if (result != 0) { - this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->cancel_thread (); } // Remember parameters for the scheduling segment. @@ -400,8 +381,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( // Check current DT state. if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) { - this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->cancel_thread (); } // Inform scheduler of start of nested scheduling segment. @@ -410,8 +390,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( name, sched_param, implicit_sched_param - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); TAO_TSS_Resources *tss = TAO_TSS_Resources::instance (); @@ -431,7 +410,6 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; tss->rtscheduler_current_impl_ = new_current; } @@ -441,15 +419,14 @@ void TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { // Check if DT has been cancelled if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) { - this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->cancel_thread (); } // Let scheduler know of the updates. @@ -457,8 +434,7 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name, name, sched_param, implicit_sched_param - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Remember the new values. this->name_ = CORBA::string_dup (name); @@ -467,15 +443,13 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name, } void -TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name - ACE_ENV_ARG_DECL) +TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if DT has been cancelled if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) { - this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->cancel_thread (); } if (this->previous_current_ == 0) @@ -484,8 +458,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name // terminating. this->scheduler_->end_scheduling_segment(this->guid_, name - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Cleanup DT. this->cleanup_DT (); @@ -501,8 +474,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name this->scheduler_->end_nested_scheduling_segment (this->guid_, name, this->previous_current_->sched_param_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Cleanup current. this->cleanup_current (); @@ -521,14 +493,13 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start, CORBA::Policy_ptr implicit_sched_param, CORBA::ULong stack_size, RTCORBA::Priority base_priority - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if DT has been cancelled. if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) { - this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->cancel_thread (); } // Create new task for new DT. @@ -576,7 +547,7 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start, int DTTask::activate_task (RTCORBA::Priority base_priority, CORBA::ULong stack_size - ACE_ENV_ARG_DECL) + ) { // Activate thread. long default_flags = THR_NEW_LWP | THR_JOINABLE; @@ -591,8 +562,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority, RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); RTCORBA::PriorityMapping *pm = mapping_manager->mapping (); @@ -622,8 +592,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority, return 0; } -DTTask::DTTask (//ACE_Thread_Manager *manager, - TAO_ORB_Core *orb, +DTTask::DTTask (TAO_ORB_Core *orb, DT_Hash_Map *dt_hash, TAO_RTScheduler_Current_i* new_current, RTScheduling::ThreadAction_ptr start, @@ -631,8 +600,7 @@ DTTask::DTTask (//ACE_Thread_Manager *manager, const char *name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ://manager_ (manager), - orb_ (orb), + :orb_ (orb), dt_hash_ (dt_hash), current_ (new_current), start_ (RTScheduling::ThreadAction::_duplicate (start)), @@ -651,7 +619,7 @@ DTTask::~DTTask (void) int DTTask::svc (void) { - ACE_TRY_NEW_ENV + try { TAO_TSS_Resources *tss = @@ -662,31 +630,27 @@ DTTask::svc (void) this->current_->begin_scheduling_segment (this->name_.in (), this->sched_param_.in (), this->implicit_sched_param_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // Invoke entry point into new DT. this->start_->_cxx_do (this->data_ - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); this->current_->end_scheduling_segment (this->name_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } RTScheduling::Current::IdType * -TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RTScheduler_Current_i::id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -696,21 +660,21 @@ TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr -TAO_RTScheduler_Current_i::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RTScheduler_Current_i::scheduling_parameter (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Policy::_duplicate (this->sched_param_); } CORBA::Policy_ptr -TAO_RTScheduler_Current_i::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RTScheduler_Current_i::implicit_scheduling_parameter (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Policy::_duplicate (this->implicit_sched_param_); } RTScheduling::Current::NameList * -TAO_RTScheduler_Current_i::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RTScheduler_Current_i::current_scheduling_segment_names (void) ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::Current::NameList* name_list; @@ -741,7 +705,7 @@ TAO_RTScheduler_Current_i::name (void) #endif /* THREAD_CANCELLED */ void -TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTScheduler_Current_i::cancel_thread (void) ACE_THROW_SPEC ((CORBA::SystemException)) { size_t guid; @@ -756,8 +720,7 @@ TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL) // Let the scheduler know that the thread has // been cancelled. this->scheduler_->cancel (this->guid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); this->cleanup_DT (); @@ -765,7 +728,7 @@ TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL) this->delete_all_currents (); // Throw exception. - ACE_THROW (CORBA::THREAD_CANCELLED ()); + throw ( ::CORBA::THREAD_CANCELLED ()); } void @@ -953,10 +916,10 @@ TAO_RTScheduler_Current_var::nil (void) TAO_RTScheduler_Current_ptr TAO_RTScheduler_Current_var::narrow ( CORBA::Object *p - ACE_ENV_ARG_DECL + ) { - return ::TAO_RTScheduler_Current::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::TAO_RTScheduler_Current::_narrow (p); } CORBA::Object * @@ -969,7 +932,7 @@ TAO_RTScheduler_Current_var::upcast (void *src) TAO_RTScheduler_Current_ptr TAO_RTScheduler_Current::_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED + ) { return diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index 0189511e16f..0cdc365d86c 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -85,14 +85,12 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current TAO_RTScheduler_Current (void); virtual ~TAO_RTScheduler_Current (void); - void init (TAO_ORB_Core* orb - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + void init (TAO_ORB_Core* orb); - virtual RTCORBA::Priority the_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual RTCORBA::Priority the_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void the_priority (RTCORBA::Priority the_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void the_priority (RTCORBA::Priority the_priority) ACE_THROW_SPEC ((CORBA::SystemException)); void rt_current (RTCORBA::Current_ptr rt_current); @@ -100,27 +98,22 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current virtual void begin_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL) + CORBA::Policy_ptr implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); virtual void update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL) + CORBA::Policy_ptr implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); - virtual void end_scheduling_segment - (const char * name - ACE_ENV_ARG_DECL) + virtual void end_scheduling_segment (const char * name) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RTScheduling::DistributableThread_ptr - lookup(const RTScheduling::Current::IdType & id - ACE_ENV_ARG_DECL_NOT_USED) + lookup(const RTScheduling::Current::IdType & id) ACE_THROW_SPEC ((CORBA::SystemException)); // returns a null reference if @@ -134,24 +127,20 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param, CORBA::ULong stack_size, - RTCORBA::Priority base_priority - ACE_ENV_ARG_DECL) + RTCORBA::Priority base_priority) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual ::RTScheduling::Current::IdType * - id (ACE_ENV_SINGLE_ARG_DECL) + virtual ::RTScheduling::Current::IdType *id (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual ::CORBA::Policy_ptr - scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL) + virtual ::CORBA::Policy_ptr scheduling_parameter (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual ::CORBA::Policy_ptr - implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL) + virtual ::CORBA::Policy_ptr implicit_scheduling_parameter (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::RTScheduling::Current::NameList * - current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL) + current_scheduling_segment_names (void) ACE_THROW_SPEC ((CORBA::SystemException)); TAO_RTScheduler_Current_i* implementation (void); @@ -173,7 +162,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current static TAO_RTScheduler_Current_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); static TAO_RTScheduler_Current_ptr _nil (void) @@ -226,7 +215,7 @@ public: static TAO_RTScheduler_Current_ptr nil (void); static TAO_RTScheduler_Current_ptr narrow ( CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * upcast (void *); @@ -245,8 +234,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i public: TAO_RTScheduler_Current_i (TAO_ORB_Core* orb, - DT_Hash_Map* dt_hash - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + DT_Hash_Map* dt_hash); TAO_RTScheduler_Current_i (TAO_ORB_Core* orb, DT_Hash_Map* dt_hash, @@ -255,8 +243,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param, RTScheduling::DistributableThread_ptr dt, - TAO_RTScheduler_Current_i* prev_current - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + TAO_RTScheduler_Current_i* prev_current); virtual ~TAO_RTScheduler_Current_i (void); @@ -267,56 +254,47 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param, CORBA::ULong stack_size, - RTCORBA::Priority base_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + RTCORBA::Priority base_priority) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void begin_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL) + CORBA::Policy_ptr implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); virtual void update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL) + CORBA::Policy_ptr implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); - virtual void end_scheduling_segment - (const char * name - ACE_ENV_ARG_DECL) + virtual void end_scheduling_segment (const char * name) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual RTScheduling::Current::IdType * - id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual RTScheduling::Current::IdType *id (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void id (RTScheduling::Current::IdType guid ); + void id (RTScheduling::Current::IdType guid); - virtual CORBA::Policy_ptr - scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Policy_ptr scheduling_parameter (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr - implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Policy_ptr implicit_scheduling_parameter (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void scheduling_parameter (CORBA::Policy_ptr); void implicit_scheduling_parameter (CORBA::Policy_ptr); virtual RTScheduling::Current::NameList * - current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + current_scheduling_segment_names (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void cancel_thread (ACE_ENV_SINGLE_ARG_DECL) + void cancel_thread (void) ACE_THROW_SPEC ((CORBA::SystemException)); void cleanup_DT (void); @@ -353,8 +331,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i class DTTask : public ACE_Task <ACE_SYNCH> { public: - DTTask (//ACE_Thread_Manager manager, - TAO_ORB_Core* orb, + DTTask (TAO_ORB_Core* orb, DT_Hash_Map* dt_hash, TAO_RTScheduler_Current_i*, RTScheduling::ThreadAction_ptr start, @@ -366,13 +343,11 @@ public: virtual ~DTTask (void); int activate_task (RTCORBA::Priority base_priority, - CORBA::ULong stack_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::ULong stack_size); virtual int svc (void); private: - //ACE_Thread_Manager* manager_; TAO_ORB_Core* orb_; DT_Hash_Map* dt_hash_; TAO_RTScheduler_Current_i* current_; diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp index 87c9e02a245..db091728591 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.cpp +++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp @@ -15,14 +15,14 @@ TAO_DistributableThread::~TAO_DistributableThread (void) } void -TAO_DistributableThread::cancel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_DistributableThread::cancel (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->state_ = RTScheduling::DistributableThread::CANCELLED; } RTScheduling::DistributableThread::DT_State -TAO_DistributableThread::state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_DistributableThread::state (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->state_; @@ -31,7 +31,6 @@ TAO_DistributableThread::state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) RTScheduling::DistributableThread_ptr TAO_DistributableThread_Factory::create_DT (void) { - ACE_DECLARE_NEW_CORBA_ENV; TAO_DistributableThread* DT = 0; ACE_NEW_THROW_EX (DT, @@ -41,11 +40,6 @@ TAO_DistributableThread_Factory::create_DT (void) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); - - //RTScheduling::DistributableThread_var dt = RTScheduling::DistributableThread::_narrow (DT - // ACE_ENV_ARG_PARAMETER); - //ACE_CHECK; return DT; } diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h index 281eb6984cf..8fc2dca562a 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.h +++ b/TAO/tao/RTScheduling/Distributable_Thread.h @@ -15,18 +15,16 @@ class TAO_RTScheduler_Export TAO_DistributableThread: public TAO_Local_RefCounted_Object { public: - TAO_DistributableThread (void); ~TAO_DistributableThread (void); - virtual void cancel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void cancel (void) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual RTScheduling::DistributableThread::DT_State state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual RTScheduling::DistributableThread::DT_State state (void) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: RTScheduling::DistributableThread::DT_State state_; }; diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp index 574b964f843..44f47149ffe 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp @@ -24,8 +24,7 @@ static TAO_RTScheduler_Current_var current_cleanup; void TAO_RTScheduler_ORB_Initializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ -42,8 +41,7 @@ void "In pre_init\n")); TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (CORBA::is_nil (tao_info.in ())) { @@ -54,7 +52,7 @@ void "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" "(%P|%t) \"TAO_ORBInitInfo *.\"\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } @@ -65,22 +63,18 @@ void TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; current_cleanup = this->current_; this->current_->init (tao_info->orb_core () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Object_var current_obj = RTScheduling::Current::_narrow (this->current_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); info->register_initial_reference ("RTScheduler_Current", current_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); Client_Interceptor *client_interceptor = 0; ACE_NEW_THROW_EX (client_interceptor, @@ -90,14 +84,12 @@ void TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var safe_client = client_interceptor; info->add_client_request_interceptor (client_interceptor - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); Server_Interceptor *server_interceptor = 0; ACE_NEW_THROW_EX (server_interceptor, @@ -107,14 +99,12 @@ void TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var safe_server = server_interceptor; info->add_server_request_interceptor (server_interceptor - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Set the RTScheduler_Manager TAO_RTScheduler_Manager *manager = 0; @@ -126,20 +116,17 @@ void TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; TAO_RTScheduler_Manager_var safe_manager = manager; info->register_initial_reference ("RTSchedulerManager", manager - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void -TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -148,28 +135,25 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. //TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - // ACE_ENV_ARG_PARAMETER); - //ACE_CHECK; + // ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "In post_init\n")); CORBA::Object_var rt_current_obj = info->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (rt_current_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (CORBA::is_nil (rt_current.in ())) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) ::post_init \n" "(%P|%t) Unable to narrow to RTCORBA::Current\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } this->current_->rt_current (rt_current.in ()); diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h index 8b242f9af9e..09bf03a1c91 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h @@ -43,12 +43,10 @@ class TAO_RTScheduler_ORB_Initializer , public virtual TAO_Local_RefCounted_Object { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp index bc4f99432bb..bef5e1f7510 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp @@ -36,7 +36,7 @@ TAO_RTScheduler_Loader::init (int, initialized = 1; // Register the ORB initializer. - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_orb_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -49,22 +49,19 @@ TAO_RTScheduler_Loader::init (int, TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; PortableInterceptor::ORBInitializer_var orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception caught while initializing the RTScheduler:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp index 79e85a12dd4..477e550a994 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void) { - + } TAO_RTScheduler_Manager::~TAO_RTScheduler_Manager (void) @@ -21,9 +21,9 @@ TAO_RTScheduler_Manager::~TAO_RTScheduler_Manager (void) TAO_RTScheduler_Manager_ptr TAO_RTScheduler_Manager::_narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED) + ) { - return + return TAO_RTScheduler_Manager::_duplicate ( dynamic_cast<TAO_RTScheduler_Manager *> (obj) ); diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index be6d4637d0d..b4981756215 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -36,15 +36,13 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Manager : { public: - TAO_RTScheduler_Manager (void); + TAO_RTScheduler_Manager (void); + /// Constructor. TAO_RTScheduler_Manager (TAO_ORB_Core*); - /// - void rtscheduler (RTScheduling::Scheduler_ptr rtscheduler - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + void rtscheduler (RTScheduling::Scheduler_ptr rtscheduler); - /// RTScheduling::Scheduler_ptr rtscheduler (void); public: @@ -55,7 +53,7 @@ public: static TAO_RTScheduler_Manager_ptr _duplicate (TAO_RTScheduler_Manager_ptr obj); static TAO_RTScheduler_Manager_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); static TAO_RTScheduler_Manager_ptr _nil (void) { @@ -107,7 +105,7 @@ public: static TAO_RTScheduler_Manager_ptr duplicate (TAO_RTScheduler_Manager_ptr); static void release (TAO_RTScheduler_Manager_ptr); static TAO_RTScheduler_Manager_ptr nil (void); - static TAO_RTScheduler_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static TAO_RTScheduler_Manager_ptr narrow (CORBA::Object * ); static CORBA::Object * upcast (void *); private: diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl index da473a28e64..cb2b4924159 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl @@ -129,9 +129,9 @@ TAO_RTScheduler_Manager_var::nil (void) ACE_INLINE ::TAO_RTScheduler_Manager_ptr TAO_RTScheduler_Manager_var::narrow ( CORBA::Object * p - ACE_ENV_ARG_DECL) + ) { - return ::TAO_RTScheduler_Manager::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::TAO_RTScheduler_Manager::_narrow (p); } ACE_INLINE CORBA::Object * @@ -221,14 +221,13 @@ TAO_RTScheduler_Manager::rtscheduler (void) ACE_INLINE void TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler - ACE_ENV_ARG_DECL) + ) { this->rtscheduler_ = RTScheduling::Scheduler::_duplicate (rtscheduler); this->orb_->orb ()->register_initial_reference ( "RTScheduler", RTScheduling::Scheduler::_duplicate (this->rtscheduler_.in ()) - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index d0a8fc4c313..87aeead2e8b 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -22,8 +22,7 @@ const IOP::ServiceId Client_Interceptor::SchedulingInfo = 30; void -Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) +Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -75,7 +74,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri { ACE_DEBUG ((LM_DEBUG, "No Scheduling Segment Context\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } @@ -90,7 +89,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri current->dt_hash (), guid, 0, - current->implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER), + current->implicit_scheduling_parameter (), 0, dt.in (), current)); @@ -119,8 +118,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri } void -Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) +Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -140,8 +138,7 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri } void -Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) +Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -161,8 +158,7 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri } void -Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) +Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -187,8 +183,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt } CORBA::Any_var ex = - ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception (); CORBA::TypeCode_var type = ex->type (); if (CORBA::is_nil (type.in ())) @@ -197,8 +192,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt "type = 0 \n")); return; } - const char * id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char * id = type->id (); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -213,8 +207,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt { // Perform the necessary cleanup as the // thread was cancelled. - current->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + current->cancel_thread (); } else { @@ -227,8 +220,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt } void -Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) +Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -249,14 +241,14 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri } char* -Client_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("RTSchdeuler_Client_Interceptor"); } void -Client_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -270,8 +262,8 @@ Server_Interceptor::Server_Interceptor (TAO_RTScheduler_Current_ptr current) } void -Server_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Server_Interceptor::receive_request_service_contexts ( + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -283,7 +275,7 @@ Server_Interceptor::receive_request_service_contexts (PortableInterceptor::Serve void Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -293,22 +285,19 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr IOP::ServiceContext_var serv_cxt; - ACE_TRY + try { serv_cxt = ri->get_request_service_context (Server_Interceptor::SchedulingInfo - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Invalid Service Request\n")); return; } - ACE_ENDTRY; - ACE_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -328,7 +317,6 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; // Scheduler retrieves scheduling parameters // from request and populates the out @@ -371,7 +359,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr if (result != 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } // Create new temporary current. Note that the new <sched_param> is @@ -392,7 +380,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr void Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -410,8 +398,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri if (current->DT ()->state () == RTScheduling::DistributableThread::CANCELLED) { - current->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + current->cancel_thread (); return; } @@ -421,8 +408,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri // Inform scheduler that upcall is complete. RTScheduling::Scheduler_var scheduler = current->scheduler (); - scheduler->send_reply (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + scheduler->send_reply (ri); current->cleanup_DT (); current->cleanup_current (); @@ -443,7 +429,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri void Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -469,7 +455,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r void Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -494,14 +480,14 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri } char* -Server_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("RTSchdeuler_Server_Interceptor"); } void -Server_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h index 1a8c74a389a..194a03cccdc 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.h +++ b/TAO/tao/RTScheduling/Request_Interceptor.h @@ -26,32 +26,30 @@ public: // Client_Interceptor (RTScheduling::Current_ptr current); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual char* name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); static const IOP::ServiceId SchedulingInfo; @@ -66,34 +64,29 @@ class TAO_RTScheduler_Export Server_Interceptor : public: Server_Interceptor (TAO_RTScheduler_Current_ptr current); - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual char* name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); static const IOP::ServiceId SchedulingInfo; diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h index e7b7fc530cd..62af6e4cbde 100644 --- a/TAO/tao/RTScheduling/ThreadAction.h +++ b/TAO/tao/RTScheduling/ThreadAction.h @@ -12,14 +12,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -class TAO_RTScheduler_Export TAO_ThreadAction: +class TAO_RTScheduler_Export TAO_ThreadAction: public RTScheduling::ThreadAction, public TAO_Local_RefCounted_Object { public: - + virtual void do (CORBA::VoidData data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp index 17a9d2d642a..dcba0a754f0 100644 --- a/TAO/tao/Reactive_Connect_Strategy.cpp +++ b/TAO/tao/Reactive_Connect_Strategy.cpp @@ -57,14 +57,12 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev, ACE_TEXT ("connection completion - wait ()\n"))); } - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { while (ev->keep_waiting ()) { result = - this->orb_core_->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_core_->run (max_wait_time, 1); // Did we timeout? If so, stop running the loop. if (result == 0 && @@ -81,11 +79,10 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev, break; } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { result = -1; } - ACE_ENDTRY; // Set the result. if (result != -1 && ev->error_detected ()) diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp index 085779f99ed..31191cc3cd2 100644 --- a/TAO/tao/Reactive_Flushing_Strategy.cpp +++ b/TAO/tao/Reactive_Flushing_Strategy.cpp @@ -33,22 +33,19 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport, int result = 0; // @@ Should we pass this down? Can we? - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO_ORB_Core * const orb_core = transport->orb_core (); while (!msg->all_data_sent () && result >= 0) { - result = orb_core->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + result = orb_core->run (max_wait_time, 1); } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return -1; } - ACE_ENDTRY; return result; } @@ -57,25 +54,22 @@ int TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport) { // @@ Should we pass this down? Can we? - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO_ORB_Core * const orb_core = transport->orb_core (); while (!transport->queue_is_empty ()) { - int const result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + int const result = orb_core->run (0, 1); if (result == -1) return -1; } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp index 417722db92b..038e7cb7001 100644 --- a/TAO/tao/Remote_Invocation.cpp +++ b/TAO/tao/Remote_Invocation.cpp @@ -36,7 +36,7 @@ namespace TAO void Remote_Invocation::init_target_spec (TAO_Target_Specification &target_spec - ACE_ENV_ARG_DECL) + ) { /** * Mega hack for RTCORBA start. I don't think that @@ -47,8 +47,7 @@ namespace TAO this->resolver_.stub (), this->details_.request_service_context (), 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); /** * Mega hack for RTCORBA END */ @@ -82,8 +81,7 @@ namespace TAO int const retval = this->resolver_.stub ()->create_ior_info (ior_info, index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (retval == -1) { @@ -110,7 +108,7 @@ namespace TAO void Remote_Invocation::write_header (TAO_Target_Specification &spec, TAO_OutputCDR &out_stream - ACE_ENV_ARG_DECL) + ) { this->resolver_.transport ()->clear_translators (0, &out_stream); @@ -121,7 +119,7 @@ namespace TAO out_stream) == -1) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } this->resolver_.transport ()->assign_translators (0, @@ -130,11 +128,11 @@ namespace TAO void Remote_Invocation::marshal_data (TAO_OutputCDR &out_stream - ACE_ENV_ARG_DECL) + ) { if (this->details_.marshal_args (out_stream) == false) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } return; @@ -144,7 +142,7 @@ namespace TAO Remote_Invocation::send_message (TAO_OutputCDR &cdr, short message_semantics, ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + ) { TAO_Protocols_Hooks *tph = this->resolver_.stub ()->orb_core ()->get_protocols_hooks (); @@ -152,8 +150,7 @@ namespace TAO CORBA::Boolean set_client_network_priority = tph->set_client_network_priority (this->resolver_.transport ()->tag (), this->resolver_.stub () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); TAO_Connection_Handler *connection_handler = this->resolver_.transport ()->connection_handler (); diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h index 9bb187a3ea8..a5a71c9116c 100644 --- a/TAO/tao/Remote_Invocation.h +++ b/TAO/tao/Remote_Invocation.h @@ -29,11 +29,6 @@ class TAO_Operation_Details; class TAO_Target_Specification; class TAO_OutputCDR; -namespace CORBA -{ - class Environment; -} - namespace TAO { class Profile_Transport_Resolver; @@ -72,22 +67,22 @@ namespace TAO /// Initialize the @a spec. void init_target_spec (TAO_Target_Specification &spec - ACE_ENV_ARG_DECL); + ); /// Write the GIOP header into the stream. void write_header (TAO_Target_Specification &spec, TAO_OutputCDR &out_stream - ACE_ENV_ARG_DECL); + ); /// Marshal the arguments into the stream. void marshal_data (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL); + ); /// Write the message onto the socket Invocation_Status send_message (TAO_OutputCDR &cdr, short message_semantics, ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL); + ); protected: /// Our resolver diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp index fd4bc75cde0..38593b6d754 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.cpp +++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp @@ -20,8 +20,7 @@ namespace TAO { CORBA::Boolean Remote_Object_Proxy_Broker::_is_a (CORBA::Object_ptr target, - const char *type_id - ACE_ENV_ARG_DECL) + const char *type_id) { TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval; TAO::Arg_Traits<char *>::in_arg_val _tao_id (type_id); @@ -39,8 +38,7 @@ namespace TAO 5, 0); - tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval.excp ()); + tao_call.invoke (0, 0); return _tao_retval.retn (); } @@ -48,8 +46,7 @@ namespace TAO #if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::Boolean - Remote_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Remote_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target) { TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval; @@ -65,15 +62,13 @@ namespace TAO 13, 0); - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval.excp ()); + _tao_call.invoke (0, 0); return _tao_retval.retn (); } CORBA::Object_ptr - Remote_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Remote_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target) { TAO::Arg_Traits<CORBA::Object>::ret_val _tao_retval; @@ -89,15 +84,13 @@ namespace TAO 10, 0); - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval.excp ()); + _tao_call.invoke (0, 0); return _tao_retval.retn (); } CORBA::InterfaceDef_ptr - Remote_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Remote_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target) { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -110,13 +103,11 @@ namespace TAO 0); } - return adapter->get_interface_remote (target - ACE_ENV_ARG_PARAMETER); + return adapter->get_interface_remote (target); } char * - Remote_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Remote_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target) { TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval; @@ -132,8 +123,7 @@ namespace TAO 14, 0); - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval.excp ()); + _tao_call.invoke (0, 0); return _tao_retval.retn (); } diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h index eab7f29e5b7..d6488b41289 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.h +++ b/TAO/tao/Remote_Object_Proxy_Broker.h @@ -46,24 +46,17 @@ namespace TAO /// details. virtual CORBA::Boolean _is_a (CORBA::Object_ptr target, - const char *logical_type_id - ACE_ENV_ARG_DECL); + const char *logical_type_id); #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target - ACE_ENV_ARG_DECL); + virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target); - virtual CORBA::InterfaceDef * _get_interface ( - CORBA::Object_ptr target - ACE_ENV_ARG_DECL - ); + virtual CORBA::InterfaceDef * _get_interface (CORBA::Object_ptr target); - virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target - ACE_ENV_ARG_DECL); + virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target); - virtual char * _repository_id (CORBA::Object_ptr target - ACE_ENV_ARG_DECL); + virtual char * _repository_id (CORBA::Object_ptr target); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ }; diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp index 3663d1ee49e..3b6cc4b02b4 100644 --- a/TAO/tao/Request_Dispatcher.cpp +++ b/TAO/tao/Request_Dispatcher.cpp @@ -4,8 +4,8 @@ #include "tao/TAO_Server_Request.h" #include "tao/ORB_Core.h" -ACE_RCSID (tao, - Request_Dispatcher, +ACE_RCSID (tao, + Request_Dispatcher, "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -17,15 +17,12 @@ TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void) void TAO_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, TAO_ServerRequest &request, - CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) + CORBA::Object_out forward_to) { // Dispatch based on object key orb_core->adapter_registry ()->dispatch (request.object_key (), request, - forward_to - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + forward_to); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h index ce097986e58..e70b0f2f81a 100644 --- a/TAO/tao/Request_Dispatcher.h +++ b/TAO/tao/Request_Dispatcher.h @@ -57,8 +57,7 @@ public: */ virtual void dispatch (TAO_ORB_Core *orb_core, TAO_ServerRequest &request, - CORBA::Object_out forward_to - ACE_ENV_ARG_DECL); + CORBA::Object_out forward_to); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h index 49c90159837..d429a356686 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter.h @@ -82,8 +82,7 @@ namespace TAO void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions, - CORBA::OctetSeq_out oc - ACE_ENV_ARG_DECL) = 0; + CORBA::OctetSeq_out oc) = 0; #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/ /// This method implements the "intermediate" server side @@ -99,8 +98,7 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) = 0; + CORBA::ULong nexceptions) = 0; /// This method an "intermediate" server side interception point. virtual void receive_request ( @@ -109,8 +107,7 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) = 0; + CORBA::ULong nexceptions) = 0; /// This method implements one of the "ending" server side /// interception points. @@ -120,8 +117,7 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) = 0; + CORBA::ULong nexceptions) = 0; /// This method implements one of the "ending" server side /// interception points. @@ -131,8 +127,7 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) = 0; + CORBA::ULong nexceptions) = 0; /// This method implements one of the "ending" server side /// interception points. @@ -142,22 +137,20 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ACE_ENV_ARG_DECL) = 0; + CORBA::ULong nexceptions) = 0; //@} /// Register an interceptor. virtual void add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor - ACE_ENV_ARG_DECL) = 0; + PortableInterceptor::ServerRequestInterceptor_ptr interceptor) = 0; /// Register an interceptor with policies. virtual void add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) = 0; + ) = 0; - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void destroy_interceptors (void) = 0; virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0; @@ -167,7 +160,7 @@ namespace TAO virtual void execute_command ( TAO_ServerRequest &server_request, TAO::Upcall_Command &command - ACE_ENV_ARG_DECL) = 0; + ) = 0; }; } diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp index 53a12caf6e0..79d1fb39f07 100644 --- a/TAO/tao/Service_Callbacks.cpp +++ b/TAO/tao/Service_Callbacks.cpp @@ -1,7 +1,6 @@ #include "tao/Service_Callbacks.h" #include "tao/ORB_Constants.h" #include "tao/SystemException.h" -#include "tao/Environment.h" #include "tao/Invocation_Utils.h" ACE_RCSID (tao, @@ -57,7 +56,7 @@ TAO::Invocation_Status TAO_Service_Callbacks::raise_comm_failure ( IOP::ServiceContextList &, TAO_Profile * /*profile*/ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::COMM_FAILURE ( CORBA::SystemException::_tao_minor_code ( @@ -71,7 +70,7 @@ TAO::Invocation_Status TAO_Service_Callbacks::raise_transient_failure ( IOP::ServiceContextList &, TAO_Profile * /*profile*/ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code ( diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h index 1c9e89ff0a3..c4a865fb9f2 100644 --- a/TAO/tao/Service_Callbacks.h +++ b/TAO/tao/Service_Callbacks.h @@ -40,8 +40,6 @@ namespace CORBA { class Object; typedef Object *Object_ptr; - - class Environment; } namespace IOP @@ -103,14 +101,14 @@ public: virtual TAO::Invocation_Status raise_comm_failure ( IOP::ServiceContextList &clist, TAO_Profile *profile - ACE_ENV_ARG_DECL); + ); /// Allow the service layer to decide whether the TRANSIENT /// exception should be thrown or a reinvocation is needed virtual TAO::Invocation_Status raise_transient_failure ( IOP::ServiceContextList &clist, TAO_Profile *profile - ACE_ENV_ARG_DECL); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp index 4886def2ffe..d3f2eead383 100644 --- a/TAO/tao/Strategies/COIOP_Connector.cpp +++ b/TAO/tao/Strategies/COIOP_Connector.cpp @@ -63,8 +63,8 @@ TAO_COIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) TAO_Transport * TAO_COIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, - TAO_Transport_Descriptor_Interface &, - ACE_Time_Value * /*max_wait_time*/) + TAO_Transport_Descriptor_Interface &, + ACE_Time_Value * /*max_wait_time*/) { // No remote connection possible with COIOP return 0; @@ -89,7 +89,7 @@ TAO_COIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_COIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) +TAO_COIOP_Connector::make_profile (void) { // The endpoint should be of the form: // N.n@uuid/object_key @@ -104,7 +104,6 @@ TAO_COIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return profile; } diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h index f311f4a1c41..1b7be889cd9 100644 --- a/TAO/tao/Strategies/COIOP_Connector.h +++ b/TAO/tao/Strategies/COIOP_Connector.h @@ -84,7 +84,7 @@ protected: TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout = 0); - virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile * make_profile (void); //@} /// Cancel the passed cvs handler from the connector diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp index 5357ad8203f..3e5401c3868 100644 --- a/TAO/tao/Strategies/COIOP_Profile.cpp +++ b/TAO/tao/Strategies/COIOP_Profile.cpp @@ -99,8 +99,7 @@ TAO_COIOP_Profile::decode_profile (TAO_InputCDR& cdr) } void -TAO_COIOP_Profile::parse_string_i (const char *ior - ACE_ENV_ARG_DECL) +TAO_COIOP_Profile::parse_string_i (const char *ior) { // Pull off the "hostname:port/" part of the objref // Copy the string because we are going to modify it... @@ -110,7 +109,7 @@ TAO_COIOP_Profile::parse_string_i (const char *ior if (okd == 0 || okd == ior) { // No object key delimiter or no hostname specified. - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -158,8 +157,7 @@ TAO_COIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) } CORBA::ULong -TAO_COIOP_Profile::hash (CORBA::ULong max - ACE_ENV_ARG_DECL_NOT_USED) +TAO_COIOP_Profile::hash (CORBA::ULong max) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; @@ -209,7 +207,7 @@ TAO_COIOP_Profile::add_endpoint (TAO_COIOP_Endpoint *endp) } char * -TAO_COIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_COIOP_Profile::to_string (void) { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h index 9f8af464281..075a2ccdbe5 100644 --- a/TAO/tao/Strategies/COIOP_Profile.h +++ b/TAO/tao/Strategies/COIOP_Profile.h @@ -65,12 +65,11 @@ public: ~TAO_COIOP_Profile (void); /// Template methods. Please tao/Profile.h for documentation. - virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); + virtual char * to_string (void); virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); virtual CORBA::ULong endpoint_count (void) const; - virtual CORBA::ULong hash (CORBA::ULong max - ACE_ENV_ARG_DECL); + virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted * next to the head of the list). This profiles takes ownership of @@ -83,7 +82,7 @@ protected: /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); virtual void parse_string_i (const char *string - ACE_ENV_ARG_DECL); + ); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual int decode_endpoints (void); virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 9cb798f02ae..001410ed11e 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -134,31 +134,26 @@ TAO_DIOP_Connection_Handler::open (void*) bool client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (client) { tph->client_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { tph->server_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); this->udp_socket_.open (this->local_addr_); diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index b7fd7318cef..c70dc9ff725 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -164,7 +164,7 @@ TAO_DIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_DIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) +TAO_DIOP_Connector::make_profile (void) { // The endpoint should be of the form: // N.n@host:port/object_key @@ -179,7 +179,6 @@ TAO_DIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return profile; } diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index 7d4c8c1f182..90061e3d823 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -84,7 +84,7 @@ protected: TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout = 0); - virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile * make_profile (void); //@} /// Cancel the passed cvs handler from the connector diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 9ce819cebb8..17c14bdb339 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -118,8 +118,7 @@ TAO_DIOP_Profile::decode_profile (TAO_InputCDR& cdr) } void -TAO_DIOP_Profile::parse_string_i (const char *ior - ACE_ENV_ARG_DECL) +TAO_DIOP_Profile::parse_string_i (const char *ior) { // Pull off the "hostname:port/" part of the objref // Copy the string because we are going to modify it... @@ -129,7 +128,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior if (okd == 0 || okd == ior) { // No object key delimiter or no hostname specified. - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -144,7 +143,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior if (cp_pos == ior) { // No hostname specified! It is required by the spec. - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -198,7 +197,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior ACE_TEXT ("cannot determine hostname"))); // @@ What's the right exception to throw here? - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -238,8 +237,7 @@ TAO_DIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) } CORBA::ULong -TAO_DIOP_Profile::hash (CORBA::ULong max - ACE_ENV_ARG_DECL_NOT_USED) +TAO_DIOP_Profile::hash (CORBA::ULong max) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; @@ -289,7 +287,7 @@ TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp) } char * -TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_DIOP_Profile::to_string (void) { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index f2c670042dd..f2db5d68c01 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -77,12 +77,11 @@ public: /// Template methods. Please tao/Profile.h for documentation. - virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); + virtual char * to_string (void); virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); virtual CORBA::ULong endpoint_count (void) const; - virtual CORBA::ULong hash (CORBA::ULong max - ACE_ENV_ARG_DECL); + virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted * next to the head of the list). This profiles takes ownership of @@ -94,8 +93,7 @@ protected: /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); - virtual void parse_string_i (const char *string - ACE_ENV_ARG_DECL); + virtual void parse_string_i (const char *string); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual int decode_endpoints (void); virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp index 96c1cf8c8b2..eecb8e70779 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp @@ -34,8 +34,8 @@ TAO_OC_Endpoint_Selector_Factory::init (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("-connect_timeout")) == 0) && count < argc-1) { - count++; - long ms = ACE_OS::strtol(argv[count],0,10); + ++count; + long const ms = ACE_OS::strtol(argv[count],0,10); timeout.msec (ms); } } @@ -48,7 +48,7 @@ TAO_OC_Endpoint_Selector_Factory::init (int argc, ACE_TCHAR *argv[]) TAO_Invocation_Endpoint_Selector * -TAO_OC_Endpoint_Selector_Factory::get_selector ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) +TAO_OC_Endpoint_Selector_Factory::get_selector (void) { // Trivial endpoint selector. Just return the default selector. return this->oc_endpoint_selector_; diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h index c1cae879efb..de45e4fdc5e 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h @@ -66,8 +66,7 @@ public: /// Get an Invocation's endpoint selection strategy and /// initialize the endpoint selection state instance. - virtual TAO_Invocation_Endpoint_Selector *get_selector ( - ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Invocation_Endpoint_Selector *get_selector (void); protected: /// The possible endpoint selector strategies that can be diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index 5b0938be1df..3e5f8dd7e3e 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -21,7 +21,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Time_Value TAO_Optimized_Connection_Endpoint_Selector::timeout_; -TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv) +TAO_Optimized_Connection_Endpoint_Selector:: +TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv) { TAO_Optimized_Connection_Endpoint_Selector::timeout_ = tv; if (TAO_debug_level) @@ -38,7 +39,8 @@ TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Se } } -TAO_Optimized_Connection_Endpoint_Selector::~TAO_Optimized_Connection_Endpoint_Selector (void) +TAO_Optimized_Connection_Endpoint_Selector:: +~TAO_Optimized_Connection_Endpoint_Selector (void) { } @@ -78,9 +80,8 @@ TAO_Optimized_Connection_Endpoint_Selector::check_profile (TAO_Profile *p, void TAO_Optimized_Connection_Endpoint_Selector::select_endpoint - ( TAO::Profile_Transport_Resolver *r, - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + (TAO::Profile_Transport_Resolver *r, + ACE_Time_Value *max_wait_time) { TAO_Stub *stub = r->stub(); TAO_Profile *p = stub->profile_in_use(); @@ -155,8 +156,7 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint const bool retval = r->try_connect (&desc, max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Check if the connect has completed. if (retval) @@ -171,7 +171,7 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint // If we get here, we completely failed to find an endpoint selector // that we know how to use, so throw an exception. - ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2, + throw ( ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h index 818541916c6..c2490a44b0b 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h @@ -64,8 +64,7 @@ public: ACE_Time_Value &tv); virtual void select_endpoint (TAO::Profile_Transport_Resolver *, - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL); + ACE_Time_Value *max_wait_time); private: int check_profile (TAO_Profile *, diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index 72d72832118..4957d915f76 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -113,31 +113,26 @@ TAO_SCIOP_Connection_Handler::open (void*) bool client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (client) { tph->client_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { tph->server_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); if (this->set_socket_option (this->peer (), protocol_properties.send_buffer_size_, diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index c045c772059..7c7a41492ad 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -356,7 +356,7 @@ TAO_SCIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_SCIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) +TAO_SCIOP_Connector::make_profile (void) { // The endpoint should be of the form: // N.n@host:port/object_key @@ -371,7 +371,6 @@ TAO_SCIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return profile; } diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index 32654e24662..2327ce9880e 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -93,7 +93,7 @@ protected: /// More TAO_Connector methods, please check the documentation on /// Transport_Connector.h - virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile *make_profile (void); /// Cancel the passed cvs handler from the connector int cancel_svc_handler (TAO_Connection_Handler * svc_handler); diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index a09a100ef89..cfebab439f7 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -138,7 +138,7 @@ TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr) void TAO_SCIOP_Profile::parse_string_i (const char *ior - ACE_ENV_ARG_DECL) + ) { // Pull off the "hostname:port/" part of the objref // Copy the string because we are going to modify it... @@ -148,7 +148,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior if (okd == 0 || okd == ior) { // No object key delimiter or no hostname specified. - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -163,7 +163,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior if (cp_pos == ior) { // No hostname specified! It is required by the spec. - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -217,7 +217,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior ACE_TEXT ("cannot determine hostname"))); // @@ What's the right exception to throw here? - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -262,7 +262,7 @@ TAO_SCIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) CORBA::ULong TAO_SCIOP_Profile::hash (CORBA::ULong max - ACE_ENV_ARG_DECL_NOT_USED) + ) { // Get the hash value for all endpoints. CORBA::ULong hashval = 0; @@ -312,7 +312,7 @@ TAO_SCIOP_Profile::add_endpoint (TAO_SCIOP_Endpoint *endp) } char * -TAO_SCIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SCIOP_Profile::to_string (void) { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index 4bfc18ebb6a..4aca872c3d7 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -73,12 +73,12 @@ public: ~TAO_SCIOP_Profile (void); /// Template methods. Please see Profile.h for documentation. - virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); + virtual char * to_string (void); virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); virtual CORBA::ULong endpoint_count (void) const; virtual CORBA::ULong hash (CORBA::ULong max - ACE_ENV_ARG_DECL); + ); /** * Add <endp> to this profile's list of endpoints (it is inserted * next to the head of the list). This profiles takes ownership of @@ -92,7 +92,7 @@ protected: virtual int decode_profile (TAO_InputCDR &cdr); virtual int decode_endpoints (void); virtual void parse_string_i (const char *string - ACE_ENV_ARG_DECL); + ); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 272ebbeab56..c89b86e9fc4 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -97,31 +97,26 @@ TAO_SHMIOP_Connection_Handler::open (void*) bool client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (client) { tph->client_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { tph->server_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); if (this->set_socket_option (this->peer (), protocol_properties.send_buffer_size_, diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 9b0490b6c26..1ac25106500 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -285,7 +285,7 @@ TAO_SHMIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_SHMIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) +TAO_SHMIOP_Connector::make_profile (void) { // The endpoint should be of the form: // N.n@port/object_key @@ -300,7 +300,6 @@ TAO_SHMIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return profile; } diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index 014e4afcc90..295672e9d28 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -102,7 +102,7 @@ protected: TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout = 0); - virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile *make_profile (void); /// Cancel the passed cvs handler from the connector int cancel_svc_handler (TAO_Connection_Handler * svc_handler); diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 71a73c4dc7c..c7afacee63b 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -128,7 +128,7 @@ TAO_SHMIOP_Profile::decode_profile (TAO_InputCDR& cdr) void TAO_SHMIOP_Profile::parse_string_i (const char *string - ACE_ENV_ARG_DECL) + ) { // Pull off the "hostname:port/" part of the objref // Copy the string because we are going to modify it... @@ -140,7 +140,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string if (cp == 0) { // No host/port delimiter! - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -152,7 +152,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string if (okd == 0) { // No object key delimiter! - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -180,7 +180,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string ACE_INET_Addr ia; if (ia.string_to_addr (tmp.in ()) == -1) { - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -222,7 +222,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string ACE_TEXT ("cannot determine hostname"))); // @@ What's the right exception to throw here? - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -248,7 +248,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string } // @@ What's the right exception to throw here? - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -291,7 +291,7 @@ TAO_SHMIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) CORBA::ULong TAO_SHMIOP_Profile::hash (CORBA::ULong max - ACE_ENV_ARG_DECL_NOT_USED) + ) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; @@ -329,7 +329,7 @@ TAO_SHMIOP_Profile::add_endpoint (TAO_SHMIOP_Endpoint *endp) } char * -TAO_SHMIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SHMIOP_Profile::to_string (void) { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index d75215ed4a9..7d103435dc2 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -76,12 +76,12 @@ public: /// Template methods, please see Profile.h for documentation. - virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); + virtual char * to_string (void); virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); virtual CORBA::ULong endpoint_count (void) const; virtual CORBA::ULong hash (CORBA::ULong max - ACE_ENV_ARG_DECL); + ); /** * Add <endp> to this profile's list of endpoints (it is inserted * next to the head of the list). This profiles takes ownership of @@ -94,7 +94,7 @@ protected: /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); virtual void parse_string_i (const char *string - ACE_ENV_ARG_DECL); + ); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual int decode_endpoints (void); virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index 66ad7e60780..1d61d31ef21 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -94,31 +94,26 @@ TAO_UIOP_Connection_Handler::open (void*) bool client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (client) { tph->client_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { tph->server_protocol_properties_at_orb_level ( protocol_properties - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); if (this->set_socket_option (this->peer (), protocol_properties.send_buffer_size_, diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 5a9ded4d3c7..fd9891fcd6a 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -79,7 +79,7 @@ TAO_UIOP_Connector::close (void) TAO_Profile * TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len - ACE_ENV_ARG_DECL) + ) { if (this->check_prefix (str) != 0) return 0; @@ -95,7 +95,7 @@ TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len return 0; } len = (separator - str) + 1; - return this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->make_profile (); } @@ -326,7 +326,7 @@ TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_UIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) +TAO_UIOP_Connector::make_profile (void) { TAO_Profile *profile = 0; ACE_NEW_THROW_EX (profile, @@ -337,7 +337,6 @@ TAO_UIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return profile; } diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index e575b6b27d4..1b464857928 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -74,7 +74,7 @@ public: virtual int check_prefix (const char *endpoint); virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len - ACE_ENV_ARG_DECL); + ); virtual char object_key_delimiter (void) const; @@ -112,7 +112,7 @@ protected: TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout = 0); - virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile *make_profile (void); //@} diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index 1e665915348..45cc2e58e87 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -95,12 +95,11 @@ TAO_UIOP_Profile::endpoint_count (void) const } void -TAO_UIOP_Profile::parse_string_i (const char *string - ACE_ENV_ARG_DECL) +TAO_UIOP_Profile::parse_string_i (const char *string) { if (!string || !*string) { - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -127,7 +126,7 @@ TAO_UIOP_Profile::parse_string_i (const char *string if (this->version_.major != TAO_DEF_GIOP_MAJOR || this->version_.minor > TAO_DEF_GIOP_MINOR) { - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), @@ -144,7 +143,7 @@ TAO_UIOP_Profile::parse_string_i (const char *string if (cp == 0) { - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -161,7 +160,7 @@ TAO_UIOP_Profile::parse_string_i (const char *string if (this->endpoint_.object_addr_.set (rendezvous.in ()) != 0) { - ACE_THROW (CORBA::INV_OBJREF ( + throw ( ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), @@ -203,8 +202,7 @@ TAO_UIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) } CORBA::ULong -TAO_UIOP_Profile::hash (CORBA::ULong max - ACE_ENV_ARG_DECL_NOT_USED) +TAO_UIOP_Profile::hash (CORBA::ULong max) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; @@ -243,7 +241,7 @@ TAO_UIOP_Profile::add_endpoint (TAO_UIOP_Endpoint *endp) char * -TAO_UIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UIOP_Profile::to_string (void) { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index fe515c4d388..357cb6e1e7d 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -75,12 +75,11 @@ public: ~TAO_UIOP_Profile (void); /// Template methods. Please see Profile.h for documentation. - virtual char *to_string (ACE_ENV_SINGLE_ARG_DECL); + virtual char *to_string (void); virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); virtual CORBA::ULong endpoint_count (void) const; - virtual CORBA::ULong hash (CORBA::ULong max - ACE_ENV_ARG_DECL); + virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted * next to the head of the list). This profiles takes ownership of @@ -93,8 +92,7 @@ protected: /// Protected template methods. Please see documentation in /// Profile.h for details. virtual int decode_profile (TAO_InputCDR& cdr); - virtual void parse_string_i (const char *string - ACE_ENV_ARG_DECL); + virtual void parse_string_i (const char *string); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual int decode_endpoints (void); virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 5cf600ee90c..f20309ce1de 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -157,7 +157,7 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles, int TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index - ACE_ENV_ARG_DECL) + ) { // We are creating the IOR info. Let us not be disturbed. So grab a // lock. @@ -174,8 +174,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, { this->get_profile_ior_info (*this->forward_profiles_, tmp_info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); this->forwarded_ior_info_ = tmp_info; } @@ -201,8 +200,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, { this->get_profile_ior_info (this->base_profiles_, tmp_info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); this->ior_info_ = tmp_info; } @@ -248,14 +246,13 @@ TAO_Stub::object_key (void) const int TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, IOP::IOR *&ior_info - ACE_ENV_ARG_DECL) + ) { ACE_NEW_THROW_EX (ior_info, IOP::IOR (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (-1); // Get the number of elements @@ -309,10 +306,10 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated) CORBA::ULong TAO_Stub::hash (CORBA::ULong max - ACE_ENV_ARG_DECL) + ) { // we rely on the profile objects that its address info - return this->base_profiles_.hash (max ACE_ENV_ARG_PARAMETER); + return this->base_profiles_.hash (max); } // Expensive comparison of objref data, to see if two objrefs @@ -429,7 +426,7 @@ TAO_Stub::forward_back_one (void) CORBA::Policy_ptr TAO_Stub::get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) { // No need to lock, the stub only changes its policies at // construction time... @@ -439,7 +436,7 @@ TAO_Stub::get_policy (CORBA::PolicyType type { result = this->policies_->get_policy (type - ACE_ENV_ARG_PARAMETER); + ); ACE_CHECK (CORBA::Policy::_nil ()); } @@ -447,7 +444,7 @@ TAO_Stub::get_policy (CORBA::PolicyType type { result = this->orb_core_->get_policy_including_current (type - ACE_ENV_ARG_PARAMETER); + ); ACE_CHECK (CORBA::Policy::_nil ()); } @@ -456,7 +453,7 @@ TAO_Stub::get_policy (CORBA::PolicyType type CORBA::Policy_ptr TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL) + ) { // No need to lock, the stub only changes its policies at // construction time... @@ -466,9 +463,8 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type { result = this->policies_->get_cached_policy (type - ACE_ENV_ARG_PARAMETER); + ); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); } @@ -476,8 +472,7 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type { result = this->orb_core_->get_cached_policy_including_current (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + ); } return result._retn (); @@ -486,7 +481,7 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type TAO_Stub * TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL) + ) { // Notice the use of an explicit constructor.... auto_ptr<TAO_Policy_Set> policy_manager ( @@ -496,32 +491,27 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, { policy_manager->set_policy_overrides (policies, set_add - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } else if (this->policies_ == 0) { policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } else { policy_manager->copy_from (this->policies_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); policy_manager->set_policy_overrides (policies, set_add - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); } TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (), this->base_profiles_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); stub->policies_ = policy_manager.release (); @@ -533,7 +523,7 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::PolicyList * TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types - ACE_ENV_ARG_DECL) + ) { if (this->policies_ == 0) { @@ -541,14 +531,13 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types ACE_NEW_THROW_EX (policy_list_ptr, CORBA::PolicyList (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return policy_list_ptr; } else { return this->policies_->get_policy_overrides (types - ACE_ENV_ARG_PARAMETER); + ); } } diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 052419021ae..bc72329e84a 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -77,18 +77,18 @@ public: * types. */ virtual CORBA::Policy_ptr get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL); + ); virtual CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + ); virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL); + ); virtual CORBA::PolicyList *get_policy_overrides ( const CORBA::PolicyTypeSeq & types - ACE_ENV_ARG_DECL); + ); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -107,7 +107,7 @@ public: * equivalent). */ CORBA::ULong hash (CORBA::ULong maximum - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Implement the is_equivalent() method for the CORBA::Object CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj); @@ -252,7 +252,7 @@ public: */ int create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index - ACE_ENV_ARG_DECL); + ); /// Deallocate the TAO_Stub object. /** @@ -306,7 +306,7 @@ private: /// THREAD-SAFE Create the IOR info int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info - ACE_ENV_ARG_DECL); + ); private: diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h index d500f7d83db..ac056c56a60 100644 --- a/TAO/tao/Stub_Factory.h +++ b/TAO/tao/Stub_Factory.h @@ -29,7 +29,6 @@ #include /**/ "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -38,11 +37,6 @@ class TAO_MProfile; class TAO_ORB_Core; class TAO_Stub; -namespace CORBA -{ - class Environment; -} - /** * @class TAO_Stub_Factory * @@ -62,8 +56,7 @@ public: /// Creates a Stub Object. virtual TAO_Stub *create_stub (const char *repository_id, const TAO_MProfile &profiles, - TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL) = 0; + TAO_ORB_Core *orb_core) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index abe453e0d0c..89ef71d6365 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -51,7 +51,7 @@ namespace TAO Invocation_Status Synch_Twoway_Invocation::remote_twoway (ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::Exception)) { ACE_Countdown_Time countdown (max_wait_time); @@ -60,16 +60,14 @@ namespace TAO this->details_.reply_service_info ()); TAO_Target_Specification tspec; - this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + this->init_target_spec (tspec); Invocation_Status s = TAO_INVOKE_FAILURE; #if TAO_HAS_INTERCEPTORS == 1 // Start the interception point here.. s = - this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + this->send_request_interception (); if (s != TAO_INVOKE_SUCCESS) return s; @@ -78,7 +76,7 @@ namespace TAO // We have started the interception flow. We need to call the // ending interception flow if things go wrong. The purpose of the // try block is to do just this. - ACE_TRY + try { TAO_OutputCDR &cdr = this->resolver_.transport ()->out_stream (); @@ -89,12 +87,10 @@ namespace TAO this->write_header (tspec, cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); this->marshal_data (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // Register a reply dispatcher for this invocation. Use the // preallocated reply dispatcher. @@ -121,8 +117,7 @@ namespace TAO s = this->send_message (cdr, TAO_Transport::TAO_TWOWAY_REQUEST, max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); #if TAO_HAS_INTERCEPTORS == 1 // @@NOTE: Too much code repetition. @@ -132,8 +127,7 @@ namespace TAO if (s == TAO_INVOKE_RESTART) { const Invocation_Status tmp = - this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_other_interception (); if (tmp != TAO_INVOKE_SUCCESS) s = tmp; @@ -172,15 +166,13 @@ namespace TAO this->wait_for_reply (max_wait_time, rd, dispatch_guard - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); #if TAO_HAS_INTERCEPTORS == 1 if (s == TAO_INVOKE_RESTART) { Invocation_Status const tmp = - this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_other_interception (); // Push the latest values for the return.. if (tmp != TAO_INVOKE_SUCCESS) @@ -196,8 +188,7 @@ namespace TAO // in the interface. The call violated the contract s = this->check_reply_status (rd - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // For some strategies one may want to release the transport // back to cache after receiving the reply. @@ -209,14 +200,12 @@ namespace TAO if (s == TAO_INVOKE_RESTART) { tmp = - this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_other_interception (); } else if (s == TAO_INVOKE_SUCCESS) { tmp = - this->receive_reply_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_reply_interception (); } if (tmp != TAO_INVOKE_SUCCESS) s = tmp; @@ -225,13 +214,12 @@ namespace TAO if (s != TAO_INVOKE_SUCCESS) return s; } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ReplyStatus const status = - this->handle_any_exception (&ACE_ANY_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->handle_any_exception (&ex + ); if (status == PortableInterceptor::LOCATION_FORWARD || status == PortableInterceptor::TRANSPORT_RETRY) @@ -239,28 +227,8 @@ namespace TAO else if (status == PortableInterceptor::SYSTEM_EXCEPTION || status == PortableInterceptor::USER_EXCEPTION) #endif /*TAO_HAS_INTERCEPTORS*/ - ACE_RE_THROW; + throw; } -# if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL - { -#if TAO_HAS_INTERCEPTORS == 1 - PortableInterceptor::ReplyStatus const st = - this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (st == PortableInterceptor::LOCATION_FORWARD || - st == PortableInterceptor::TRANSPORT_RETRY) - s = TAO_INVOKE_RESTART; - else -#endif /*TAO_HAS_INTERCEPTORS == 1*/ - ACE_RE_THROW; - } -# endif /* ACE_HAS_EXCEPTIONS && - ACE_HAS_BROKEN_UNEXPECTED_EXCEPTION*/ - ACE_ENDTRY; - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); return s; } @@ -269,7 +237,7 @@ namespace TAO Synch_Twoway_Invocation::wait_for_reply (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd, TAO_Bind_Dispatcher_Guard &bd - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { /* @@ -342,22 +310,20 @@ namespace TAO (void) bd.unbind_dispatcher (); this->resolver_.transport ()->close_connection (); - ACE_TRY + try { return this->orb_core ()->service_raise_comm_failure ( this->details_.request_service_context ().service_info (), this->resolver_.profile () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { this->resolver_.stub ()->reset_profiles (); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } } @@ -366,7 +332,7 @@ namespace TAO Invocation_Status Synch_Twoway_Invocation::check_reply_status (TAO_Synch_Reply_Dispatcher &rd - ACE_ENV_ARG_DECL) + ) { /* * Precondition: We probably got a reply. <ACE_Thread::self> is @@ -405,14 +371,14 @@ namespace TAO break; case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD: return this->location_forward (cdr - ACE_ENV_ARG_PARAMETER); + ); case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM: { // Unmarshal the location forward object and set the // variable this->forward_to_. Invocation_Status const s = this->location_forward (cdr - ACE_ENV_ARG_PARAMETER); + ); if (s != TAO_INVOKE_FAILURE) { // de-marshalling of permanent object reference was successfull @@ -438,10 +404,10 @@ namespace TAO } case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION: return this->handle_user_exception (cdr - ACE_ENV_ARG_PARAMETER); + ); case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION: return this->handle_system_exception (cdr - ACE_ENV_ARG_PARAMETER); + ); case TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE: { @@ -464,8 +430,7 @@ namespace TAO // Now set this addressing mode in the profile, so that // the next invocation need not go through this. this->resolver_.profile ()->addressing_mode (addr_mode - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); mon.set_status (TAO_INVOKE_RESTART); @@ -478,7 +443,7 @@ namespace TAO Invocation_Status Synch_Twoway_Invocation::location_forward (TAO_InputCDR &inp_stream - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { Reply_Guard mon (this, @@ -512,7 +477,7 @@ namespace TAO Invocation_Status Synch_Twoway_Invocation::handle_user_exception (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::Exception)) { Reply_Guard mon (this, @@ -537,12 +502,10 @@ namespace TAO CORBA::Exception *exception = this->details_.corba_exception (buf.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); exception->_tao_decode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); if (TAO_debug_level > 5) { @@ -555,25 +518,20 @@ namespace TAO mon.set_status (TAO_INVOKE_USER_EXCEPTION); -#if defined (TAO_HAS_EXCEPTIONS) // If we have native exceptions, we must manage the memory allocated // by the call above to alloc(). Otherwise the Environment class // manages the memory. auto_ptr<CORBA::Exception> safety (exception); - // Direct throw because we don't have the ACE_TRY_ENV. + // Direct throw because we don't have the try_ENV. exception->_raise (); -#else - // We can not use ACE_THROW here. - ACE_TRY_ENV.exception (exception); -#endif return TAO_INVOKE_USER_EXCEPTION; } Invocation_Status Synch_Twoway_Invocation::handle_system_exception (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { Reply_Guard mon (this, TAO_INVOKE_FAILURE); @@ -629,8 +587,7 @@ namespace TAO this->orb_core ()->service_raise_transient_failure ( this->details_.request_service_context ().service_info (), this->resolver_.profile () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); if (s == TAO_INVOKE_RESTART) return s; @@ -666,12 +623,10 @@ namespace TAO TAO_INVOKE_FAILURE); } -#if defined (TAO_HAS_EXCEPTIONS) // Without this, the call to create_system_exception() above // causes a memory leak. On platforms without native exceptions, // the CORBA::Environment class manages the memory. auto_ptr<CORBA::SystemException> safety (ex); -#endif ex->minor (minor); ex->completed (CORBA::CompletionStatus (completion)); @@ -701,7 +656,7 @@ namespace TAO Invocation_Status Synch_Oneway_Invocation::remote_oneway (ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::Exception)) { ACE_Countdown_Time countdown (max_wait_time); @@ -715,19 +670,16 @@ namespace TAO response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET)) { s = Synch_Twoway_Invocation::remote_twoway (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + ); return s; } TAO_Target_Specification tspec; - this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + this->init_target_spec (tspec); #if TAO_HAS_INTERCEPTORS == 1 - s = this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + s = this->send_request_interception (); if (s != TAO_INVOKE_SUCCESS) return s; @@ -738,7 +690,7 @@ namespace TAO TAO_OutputCDR &cdr = transport->out_stream (); - ACE_TRY + try { cdr.message_attributes (this->details_.request_id (), this->resolver_.stub (), @@ -747,12 +699,10 @@ namespace TAO this->write_header (tspec, cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); this->marshal_data (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); countdown.update (); @@ -762,8 +712,7 @@ namespace TAO s = this->send_message (cdr, TAO_Transport::TAO_ONEWAY_REQUEST, max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { @@ -778,17 +727,14 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 s = - this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->receive_other_interception (); #endif /*TAO_HAS_INTERCEPTORS */ } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ReplyStatus const status = - this->handle_any_exception (&ACE_ANY_EXCEPTION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->handle_any_exception (&ex); if (status == PortableInterceptor::LOCATION_FORWARD || status == PortableInterceptor::TRANSPORT_RETRY) @@ -796,28 +742,8 @@ namespace TAO else if (status == PortableInterceptor::SYSTEM_EXCEPTION || status == PortableInterceptor::USER_EXCEPTION) #endif /*TAO_HAS_INTERCEPTORS*/ - ACE_RE_THROW; - } -# if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL - { -#if TAO_HAS_INTERCEPTORS == 1 - PortableInterceptor::ReplyStatus const st = - this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (st == PortableInterceptor::LOCATION_FORWARD || - st == PortableInterceptor::TRANSPORT_RETRY) - s = TAO_INVOKE_RESTART; - else -#endif /*TAO_HAS_INTERCEPTORS == 1*/ - ACE_RE_THROW; + throw; } -# endif /* ACE_HAS_EXCEPTIONS && - ACE_HAS_BROKEN_UNEXPECTED_EXCEPTION*/ - ACE_ENDTRY; - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); return s; } diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index e3441f6b7be..2d208e01a1e 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -81,7 +81,7 @@ namespace TAO * interceptor invocation points. */ Invocation_Status remote_twoway (ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::Exception)); protected: @@ -93,18 +93,18 @@ namespace TAO * user exception exception handling */ virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::Exception)); /// Helper method used to handle location forwarded replies. Invocation_Status location_forward (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Helper method used to handle system exceptions from the remote /// objects. Invocation_Status handle_system_exception (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// As the name suggests waits for a reply from the remote ORB. @@ -114,7 +114,7 @@ namespace TAO Invocation_Status wait_for_reply (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd, TAO_Bind_Dispatcher_Guard &bd - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -126,7 +126,7 @@ namespace TAO */ Invocation_Status check_reply_status ( TAO_Synch_Reply_Dispatcher &rd - ACE_ENV_ARG_DECL); + ); }; @@ -168,7 +168,7 @@ namespace TAO /// Method used by the adapter to kickstart an oneway invocation /// to the remote object. Invocation_Status remote_oneway (ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::Exception)); }; diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index dd2bc0c19d9..9e03e639281 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -1,7 +1,6 @@ // $Id$ #include "tao/SystemException.h" -#include "tao/Environment.h" #include "tao/ORB_Constants.h" #include "tao/CORBA_String.h" #include "tao/CDR.h" @@ -112,7 +111,7 @@ CORBA::SystemException::operator= (const CORBA::SystemException &src) void CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const + ) const { if (cdr.write_string (this->_rep_id ()) && cdr.write_ulong (this->minor ()) @@ -121,12 +120,12 @@ CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { // The string is read by the caller, to determine the exact type of // the exception. We just decode the fields... @@ -140,7 +139,7 @@ CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } CORBA::ULong diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 2a343346d3a..7c2c999804d 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -57,8 +57,6 @@ namespace TAO namespace CORBA { - class Environment; - /** * @enum CompletionStatus * @@ -123,10 +121,10 @@ namespace CORBA virtual ACE_CString _info (void) const; virtual void _tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const; + ) const; virtual void _tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL); + ); /// Helper to create a minor status value. static CORBA::ULong _tao_minor_code (u_int location, diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp index 4438d66db11..9fa29b29fe6 100644 --- a/TAO/tao/TAO_Singleton_Manager.cpp +++ b/TAO/tao/TAO_Singleton_Manager.cpp @@ -12,23 +12,20 @@ # include "tao/TAO_Singleton_Manager.inl" #endif /* ! __ACE_INLINE__ */ -#if defined (ACE_HAS_EXCEPTIONS) -# if defined (ACE_MVS) -# include /**/ <unexpect.h> +#if defined (ACE_MVS) +# include /**/ <unexpect.h> +#else +# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) +# include /**/ <exception> # else -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# include /**/ <exception> -# else -# include /**/ <exception.h> -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -# endif /* ACE_MVS */ -#endif /* ACE_HAS_EXCEPTIONS */ +# include /**/ <exception.h> +# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ +#endif /* ACE_MVS */ ACE_RCSID (tao, TAO_Singleton_Manager, "$Id$") - namespace { // Singleton instance pointer. @@ -65,9 +62,7 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void) #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) , internal_lock_ (0) # endif /* ACE_MT_SAFE */ -#if defined (ACE_HAS_EXCEPTIONS) , old_unexpected_ (0) -#endif /* ACE_HAS_EXCEPTIONS */ { #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) ACE_NEW (this->internal_lock_, @@ -269,7 +264,6 @@ TAO_Singleton_Manager::fini (void) this->internal_lock_ = 0; #endif /* ACE_MT_SAFE */ -#if defined (ACE_HAS_EXCEPTIONS) // Restore the old unexpected exception handler since TAO will no // longer be handling exceptions. Allow the application to once // again handle unexpected exceptions. @@ -280,7 +274,6 @@ TAO_Singleton_Manager::fini (void) # else (void) set_unexpected (this->old_unexpected_); # endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ -#endif /* ACE_HAS_EXCEPTIONS */ // Indicate that this TAO_Singleton_Manager instance has been shut down. this->object_manager_state_ = OBJ_MAN_SHUT_DOWN; @@ -314,7 +307,6 @@ TAO_Singleton_Manager::shutting_down (void) : 1; } -#if defined (ACE_HAS_EXCEPTIONS) void TAO_Singleton_Manager::_set_unexpected (TAO_unexpected_handler u) { @@ -332,7 +324,6 @@ TAO_Singleton_Manager::_set_unexpected (TAO_unexpected_handler u) this->old_unexpected_ = set_unexpected (u); # endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ } -#endif /* ACE_HAS_EXCEPTIONS */ int TAO_Singleton_Manager::at_exit_i (void *object, diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index daa0cf74975..33b60e6251f 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -8,7 +8,7 @@ * $Id$ * * Header file for the TAO-specific Singleton Manager. Based - * entirely on ace/Object_Manager.{h,i,cpp}. + * entirely on ace/Object_Manager.{h,inl,cpp}. * * @author Ossama Othman <ossama@uci.edu> */ @@ -30,9 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_EXCEPTIONS) typedef void (*TAO_unexpected_handler)(void); -#endif /* ACE_HAS_EXCEPTIONS */ /** * @class TAO_Singleton_Manager @@ -122,7 +120,6 @@ public: ACE_CLEANUP_FUNC cleanup_hook, void *param); -#if defined (ACE_HAS_EXCEPTIONS) /// Set a new unexpected exception handler. /** * The old one will be stored for restoration later on. @@ -131,7 +128,6 @@ public: * old unexpected exception handler pointer to be lost. */ void _set_unexpected (TAO_unexpected_handler u); -#endif /* ACE_HAS_EXCEPTIONS */ protected: @@ -173,7 +169,6 @@ private: TAO_SYNCH_RECURSIVE_MUTEX *internal_lock_; #endif /* ACE_MT_SAFE */ -#if defined (ACE_HAS_EXCEPTIONS) /// The old unexpected exception handler. /** * A pointer to the old unexpected exception handler is stored so @@ -183,7 +178,6 @@ private: * TAO was unloaded. */ TAO_unexpected_handler old_unexpected_; -#endif /* ACE_HAS_EXCEPTIONS */ }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp index 9f639f4b6c4..d3044934790 100644 --- a/TAO/tao/Thread_Lane_Resources.cpp +++ b/TAO/tao/Thread_Lane_Resources.cpp @@ -104,7 +104,7 @@ TAO_Thread_Lane_Resources::acceptor_registry (void) } TAO_Connector_Registry * -TAO_Thread_Lane_Resources::connector_registry (ACE_ENV_SINGLE_ARG_DECL) +TAO_Thread_Lane_Resources::connector_registry (void) { // Double check. if (this->connector_registry_ == 0) @@ -354,7 +354,7 @@ TAO_Thread_Lane_Resources::ami_response_handler_allocator (void) int TAO_Thread_Lane_Resources::open_acceptor_registry (const TAO_EndpointSet &endpoint_set, bool ignore_address - ACE_ENV_ARG_DECL) + ) { // Access the acceptor registry. TAO_Acceptor_Registry &ar = this->acceptor_registry (); @@ -364,8 +364,7 @@ TAO_Thread_Lane_Resources::open_acceptor_registry (const TAO_EndpointSet &endpoi this->leader_follower ().reactor (), endpoint_set, ignore_address - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); return result; } diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index d6cd7005f67..48955aa1b81 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -40,11 +40,6 @@ class TAO_New_Leader_Generator; class TAO_Connector_Registry; class TAO_Resource_Factory; -namespace CORBA -{ - class Environment; -} - namespace TAO { class Transport_Cache_Manager; @@ -74,8 +69,7 @@ public: /// Open the acceptor registry. int open_acceptor_registry (const TAO_EndpointSet &endpoint_set, - bool ignore_address - ACE_ENV_ARG_DECL); + bool ignore_address); /// Finalize resources. void finalize (void); @@ -97,7 +91,7 @@ public: * @note Returning a pointer helps to return 0 in case of * exceptions. */ - TAO_Connector_Registry *connector_registry (ACE_ENV_SINGLE_ARG_DECL); + TAO_Connector_Registry *connector_registry (void); TAO::Transport_Cache_Manager &transport_cache (void); diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index 69e96dd37dd..812108edd14 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -32,11 +32,6 @@ class TAO_Thread_Lane_Resources; class TAO_LF_Strategy; class TAO_MProfile; -namespace CORBA -{ - class Environment; -} - /** * @class TAO_Thread_Lane_Resources_Manager * @@ -59,7 +54,7 @@ public: virtual void finalize (void) = 0; /// Open default resources. - virtual int open_default_resources (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual int open_default_resources (void) = 0; /// Shutdown reactor. virtual void shutdown_reactor (void) = 0; diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp index 184377a62c4..4215620b9ae 100644 --- a/TAO/tao/TransportCurrent/Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/Current_Impl.cpp @@ -9,7 +9,7 @@ * */ -#include /**/ "tao/Transport.h" +#include "tao/Transport.h" #if TAO_HAS_TRANSPORT_CURRENT == 1 @@ -41,68 +41,65 @@ namespace TAO /// if, there was no "current" transport selected on the current /// thread. const TAO_Transport* - Current_Impl::transport (ACE_ENV_SINGLE_ARG_DECL) const + Current_Impl::transport (void) const ACE_THROW_SPEC ((NoContext)) { Transport_Selection_Guard* topguard = Transport_Selection_Guard::current (this->core_, this->tss_slot_id_); if (topguard == 0) - ACE_THROW (NoContext()); - ACE_CHECK; + throw NoContext(); return topguard->get (); } /// Obtains the current transport's stats const TAO::Transport::Stats* - Current_Impl::transport_stats (ACE_ENV_SINGLE_ARG_DECL) const + Current_Impl::transport_stats (void) const ACE_THROW_SPEC ((NoContext)) { static const TAO::Transport::Stats dummy; const TAO_Transport* t = - this->transport (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->transport (); return (t==0 || t->stats () == 0) ? &dummy : t->stats (); } - CORBA::Long Current_Impl::id (ACE_ENV_SINGLE_ARG_DECL) + CORBA::Long Current_Impl::id (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { const TAO_Transport* t = - this->transport (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->transport (); return (t==0) ? 0 : t->id (); } - CounterT Current_Impl::bytes_sent (ACE_ENV_SINGLE_ARG_DECL) + CounterT Current_Impl::bytes_sent (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { return transport_stats ()->bytes_sent (); } - CounterT Current_Impl::bytes_received (ACE_ENV_SINGLE_ARG_DECL) + CounterT Current_Impl::bytes_received (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { return transport_stats ()->bytes_received (); } - CounterT Current_Impl::messages_sent (ACE_ENV_SINGLE_ARG_DECL) + CounterT Current_Impl::messages_sent (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { return transport_stats ()->messages_sent (); } - CounterT Current_Impl::messages_received (ACE_ENV_SINGLE_ARG_DECL) + CounterT Current_Impl::messages_received (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { return transport_stats ()->messages_received (); } - TimeBase::TimeT Current_Impl::open_since (ACE_ENV_SINGLE_ARG_DECL) + TimeBase::TimeT Current_Impl::open_since (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { TimeBase::TimeT msecs = 0; diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h index 8fc01419b5d..9463b35c01c 100644 --- a/TAO/tao/TransportCurrent/Current_Impl.h +++ b/TAO/tao/TransportCurrent/Current_Impl.h @@ -49,22 +49,22 @@ namespace TAO * PortableInterceptor::Current interface. */ //@{ - virtual CORBA::Long id (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long id (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual CounterT bytes_sent (ACE_ENV_SINGLE_ARG_DECL) + virtual CounterT bytes_sent (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual CounterT bytes_received (ACE_ENV_SINGLE_ARG_DECL) + virtual CounterT bytes_received (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual CounterT messages_sent (ACE_ENV_SINGLE_ARG_DECL) + virtual CounterT messages_sent (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual CounterT messages_received (ACE_ENV_SINGLE_ARG_DECL) + virtual CounterT messages_received (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual ::TimeBase::TimeT open_since (ACE_ENV_SINGLE_ARG_DECL) + virtual ::TimeBase::TimeT open_since (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); //@} @@ -75,13 +75,13 @@ namespace TAO */ //@{ /// A (strategy) method used to obtain the transport ptr - const TAO_Transport* transport (ACE_ENV_SINGLE_ARG_DECL) const + const TAO_Transport* transport (void) const ACE_THROW_SPEC ((NoContext)); /// A Stats instance. If protocol is unavailable (0) or the /// TAO_HAS_TRANSPORT_CURRENT macro is defined as anything but /// 1, a single static instance will be used. - const TAO::Transport::Stats* transport_stats (ACE_ENV_SINGLE_ARG_DECL) const + const TAO::Transport::Stats* transport_stats (void) const ACE_THROW_SPEC ((NoContext)); //@} @@ -107,7 +107,6 @@ namespace TAO // The ORB's TSS slot id for the Transport ptr size_t tss_slot_id_; - }; } diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp index 11fa994497b..86e5bddbc26 100644 --- a/TAO/tao/TransportCurrent/Current_Loader.cpp +++ b/TAO/tao/TransportCurrent/Current_Loader.cpp @@ -51,13 +51,11 @@ namespace TAO (CORBA::SystemException::_tao_minor_code (TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; PortableInterceptor::ORBInitializer_var initializer (tmp); PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return 0; } diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h index 7ea115f8c6b..e76fdd81453 100644 --- a/TAO/tao/TransportCurrent/Current_Loader.h +++ b/TAO/tao/TransportCurrent/Current_Loader.h @@ -24,7 +24,6 @@ #include "ace/Service_Config.h" #include "tao/Versioned_Namespace.h" - #if TAO_HAS_TRANSPORT_CURRENT == 1 #include "tao/TransportCurrent/Transport_Current_Export.h" diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp index 7df02188655..339ec752f16 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp @@ -28,7 +28,7 @@ namespace TAO TAO::Transport::Current_ptr Current_ORBInitializer<Impl>::make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the Current @@ -39,7 +39,6 @@ namespace TAO (CORBA::SystemException::_tao_minor_code (TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; return tmp; } diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h index bf4d4dda30d..7b1ff98c6a2 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h @@ -41,7 +41,7 @@ namespace TAO virtual TAO::Transport::Current_ptr make_current_instance (TAO_ORB_Core* c, size_t s - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp index 306f8a13fcc..7c5edf734ef 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp @@ -25,15 +25,14 @@ namespace TAO void Current_ORBInitializer_Base::pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { // Narrow to a TAO_ORBInitInfo object to get access to the // allocate_tss_slot_id() TAO extension. TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (CORBA::is_nil (tao_info.in ())) { @@ -42,20 +41,18 @@ namespace TAO "TAO (%P|%t) TAO::Transport::ORBInitializer::pre_init - " "Panic: unable to narrow the ORBInitInfo_ptr\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw ( ::CORBA::INTERNAL ()); } // Reserve a TSS slot in the ORB core internal TSS resources for the // thread-specific portion of the Current object. size_t tss_slot = tao_info->allocate_tss_slot_id (0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // Create the Current Current_var current (this->make_current_instance (tao_info->orb_core (), tss_slot - ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; + )); info->register_initial_reference (ACE_TEXT_ALWAYS_CHAR (this->id_.fast_rep ()), current.in ()); @@ -64,7 +61,7 @@ namespace TAO void Current_ORBInitializer_Base::post_init (PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { // do nothing diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h index 6fa97142298..cb4ce2fa446 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h @@ -42,21 +42,16 @@ namespace TAO Current_ORBInitializer_Base (const ACE_TCHAR* id); virtual ~Current_ORBInitializer_Base (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) - ACE_THROW_SPEC( (CORBA::SystemException) ); - - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_NOT_USED ) - ACE_THROW_SPEC( (CORBA::SystemException) ); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: - virtual TAO::Transport::Current_ptr - make_current_instance (TAO_ORB_Core* core, - size_t tss_slot_id - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; - + virtual TAO::Transport::Current_ptr + make_current_instance (TAO_ORB_Core* core, + size_t tss_slot_id) + ACE_THROW_SPEC ((CORBA::SystemException)) = 0; protected: const ACE_TString id_; }; diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp index 015ff4cd099..d66306b1aac 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp @@ -24,7 +24,7 @@ namespace TAO /// throw NoContext, if no transport has been selected yet. TAO_IIOP_Connection_Handler* - IIOP_Current_Impl::handler (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + IIOP_Current_Impl::handler (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) @@ -58,7 +58,7 @@ namespace TAO } CORBA::Long - IIOP_Current_Impl::id (ACE_ENV_SINGLE_ARG_DECL) + IIOP_Current_Impl::id (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) @@ -71,7 +71,7 @@ namespace TAO } ::SSLIOP::Current_ptr - IIOP_Current_Impl::ssliop_current (ACE_ENV_SINGLE_ARG_DECL) + IIOP_Current_Impl::ssliop_current (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); @@ -79,7 +79,7 @@ namespace TAO CORBA::Long - IIOP_Current_Impl::remote_port (ACE_ENV_SINGLE_ARG_DECL) + IIOP_Current_Impl::remote_port (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) @@ -96,7 +96,7 @@ namespace TAO } char* - IIOP_Current_Impl::remote_host (ACE_ENV_SINGLE_ARG_DECL) + IIOP_Current_Impl::remote_host (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) @@ -113,7 +113,7 @@ namespace TAO } CORBA::Long - IIOP_Current_Impl::local_port (ACE_ENV_SINGLE_ARG_DECL) + IIOP_Current_Impl::local_port (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) @@ -130,7 +130,7 @@ namespace TAO } char* - IIOP_Current_Impl::local_host (ACE_ENV_SINGLE_ARG_DECL) + IIOP_Current_Impl::local_host (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h index 76659a27cc4..acb48edcbe2 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h +++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h @@ -51,22 +51,22 @@ namespace TAO IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id); //@{ - virtual ::CORBA::Long id (ACE_ENV_SINGLE_ARG_DECL) + virtual ::CORBA::Long id (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual ::SSLIOP::Current_ptr ssliop_current (ACE_ENV_SINGLE_ARG_DECL) + virtual ::SSLIOP::Current_ptr ssliop_current (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual ::CORBA::Long remote_port (ACE_ENV_SINGLE_ARG_DECL) + virtual ::CORBA::Long remote_port (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual char* remote_host (ACE_ENV_SINGLE_ARG_DECL) + virtual char* remote_host (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual ::CORBA::Long local_port (ACE_ENV_SINGLE_ARG_DECL) + virtual ::CORBA::Long local_port (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); - virtual char* local_host (ACE_ENV_SINGLE_ARG_DECL) + virtual char* local_host (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); //@} @@ -87,7 +87,7 @@ namespace TAO /// Transport. Will throw NO_IMPLEMENT if the (selected) transport /// () == 0, or if transport->connection_handler () == 0. Will /// throw NoContext, if no transport has been selected yet. - TAO_IIOP_Connection_Handler* handler (ACE_ENV_SINGLE_ARG_DECL) + TAO_IIOP_Connection_Handler* handler (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); private: diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp index 2f1e5a86f58..88caa7ae6d9 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp +++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp @@ -45,13 +45,11 @@ namespace TAO CORBA::NO_MEMORY (CORBA::SystemException::_tao_minor_code (TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; PortableInterceptor::ORBInitializer_var initializer (tmp); PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return 0; } diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 1fd2461becb..b24b2ef13ea 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -3,7 +3,6 @@ #include "tao/ORB_Core.h" #include "tao/MProfile.h" #include "tao/Profile.h" -#include "tao/Environment.h" #include "tao/Thread_Lane_Resources.h" #include "tao/debug.h" #include "tao/Connect_Strategy.h" @@ -86,7 +85,7 @@ TAO_Connector::~TAO_Connector (void) TAO_Profile * TAO_Connector::corbaloc_scan (const char *str, size_t &len - ACE_ENV_ARG_DECL) + ) { if (this->check_prefix (str) != 0) return 0; @@ -99,13 +98,13 @@ TAO_Connector::corbaloc_scan (const char *str, else if (comma_pos == 0 || comma_pos > slash_pos) len = (slash_pos - str); else len = comma_pos - str; - return this->make_profile(ACE_ENV_SINGLE_ARG_PARAMETER); + return this->make_profile(); } int TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile - ACE_ENV_ARG_DECL) + ) { // This method utilizes the "Template Method" design pattern to // parse the given URL style IOR for the protocol being used @@ -243,16 +242,14 @@ TAO_Connector::make_mprofile (const char *string, // `endpoint/object_key' TAO_Profile *profile = - this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->make_profile (); // Failure: Problem during profile creation // Initialize a Profile using the individual endpoint // string. // @@ Not exception safe! We need a TAO_Profile_var! profile->parse_string (endpoint.c_str () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); // Give up ownership of the profile. if (mprofile.give_profile (profile) == -1) @@ -298,7 +295,7 @@ TAO_Transport* TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r, TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *timeout - ACE_ENV_ARG_DECL_NOT_USED) + ) { if (this->supports_parallel_connects() == 0) { @@ -361,7 +358,7 @@ TAO_Transport* TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *timeout - ACE_ENV_ARG_DECL) + ) { if (desc == 0 || (this->set_validate_endpoint (desc->endpoint ()) == -1)) @@ -410,7 +407,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, return this->connect (r, desc, timeout - ACE_ENV_ARG_PARAMETER); + ); } return t; diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index 22a99ac0e47..09db417f804 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -48,11 +48,6 @@ namespace TAO class Profile_Transport_Resolver; } -namespace CORBA -{ - class Environment; -} - /* * Hook to add includes and forward declaration * to the Connector class. @@ -92,7 +87,7 @@ public: int make_mprofile ( const char *ior, TAO_MProfile &mprofile - ACE_ENV_ARG_DECL); + ); /// Helper function to assist corbaloc parsing. The default simply validates /// the protocol identifyier and scans up to the next comma or slash. @@ -102,7 +97,7 @@ public: /// empty profile of the correct type, obtained from make_profile(). virtual TAO_Profile * corbaloc_scan (const char *ior, size_t &len - ACE_ENV_ARG_DECL); + ); /// Initialize object and register with reactor. virtual int open ( @@ -120,7 +115,7 @@ public: TAO::Profile_Transport_Resolver *r, TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *timeout - ACE_ENV_ARG_DECL); + ); /// A variation on connect that will try simultanious connections /// on all endpoints listed in the desc. @@ -128,7 +123,7 @@ public: TAO::Profile_Transport_Resolver *r, TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *timeout - ACE_ENV_ARG_DECL); + ); /// Create a profile for this protocol and initialize it based on the /// encapsulation in @a cdr @@ -152,7 +147,7 @@ protected: virtual int supports_parallel_connects (void) const; /// Create a profile with a given endpoint. - virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual TAO_Profile *make_profile (void) = 0; /// Set and validate endpoint. We need to do this to initialize our /// remote *_Addr's which have not been done during IOR decode. diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp index fbf6595904a..00025783a9d 100644 --- a/TAO/tao/Transport_Queueing_Strategies.cpp +++ b/TAO/tao/Transport_Queueing_Strategies.cpp @@ -92,17 +92,15 @@ namespace TAO TAO::BufferingConstraint buffering_constraint; - ACE_TRY_NEW_ENV + try { CORBA::Policy_var bcp_policy = stub->get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); TAO::BufferingConstraintPolicy_var bcpv = TAO::BufferingConstraintPolicy::_narrow (bcp_policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); TAO_Buffering_Constraint_Policy* bcp = dynamic_cast<TAO_Buffering_Constraint_Policy *> (bcpv.in ()); @@ -112,11 +110,10 @@ namespace TAO } bcp->get_buffering_constraint (buffering_constraint); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return true; } - ACE_ENDTRY; if (buffering_constraint.mode == TAO::BUFFER_FLUSH) diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp index 3a8f77cdb6d..398bdc82136 100644 --- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp +++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp @@ -21,7 +21,6 @@ TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal ( TAO_OutputCDR & cdr, CORBA::ULong offset) const { - ACE_DECLARE_NEW_CORBA_ENV; if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -40,7 +39,6 @@ bool TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal_kind ( TAO_OutputCDR & cdr) const { - ACE_DECLARE_NEW_CORBA_ENV; if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -69,7 +67,7 @@ TAO::TypeCodeFactory::Recursive_TypeCode::tao_release (void) CORBA::Boolean TAO::TypeCodeFactory::Recursive_TypeCode::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -81,12 +79,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::equal_i (CORBA::TypeCode_ptr tc } return this->the_typecode_->equal (tc - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean TAO::TypeCodeFactory::Recursive_TypeCode::equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -98,12 +96,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::equivalent_i (CORBA::TypeCode_ptr tc } return this->the_typecode_->equivalent (tc - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO::TypeCodeFactory::Recursive_TypeCode::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -115,12 +113,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::get_compact_typecode_i ( } return - this->the_typecode_->get_compact_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); + this->the_typecode_->get_compact_typecode (); } char const * TAO::TypeCodeFactory::Recursive_TypeCode::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -129,7 +127,7 @@ TAO::TypeCodeFactory::Recursive_TypeCode::id_i ( char const * TAO::TypeCodeFactory::Recursive_TypeCode::name_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -138,12 +136,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::name_i ( 0); } - return this->the_typecode_->name (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->the_typecode_->name (); } CORBA::ULong TAO::TypeCodeFactory::Recursive_TypeCode::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -152,13 +150,13 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_count_i ( 0); } - return this->the_typecode_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->the_typecode_->member_count (); } char const * TAO::TypeCodeFactory::Recursive_TypeCode::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -168,13 +166,13 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_name_i ( } return this->the_typecode_->member_name (index - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO::TypeCodeFactory::Recursive_TypeCode::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -184,13 +182,13 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_type_i ( } return this->the_typecode_->member_type (index - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Any * TAO::TypeCodeFactory::Recursive_TypeCode::member_label_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -201,12 +199,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_label_i ( return this->the_typecode_->member_label (index - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO::TypeCodeFactory::Recursive_TypeCode::discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -216,12 +214,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::discriminator_type_i ( } return - this->the_typecode_->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); + this->the_typecode_->discriminator_type (); } CORBA::Long TAO::TypeCodeFactory::Recursive_TypeCode::default_index_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -230,13 +228,13 @@ TAO::TypeCodeFactory::Recursive_TypeCode::default_index_i ( 0); } - return this->the_typecode_->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->the_typecode_->default_index (); } CORBA::Visibility TAO::TypeCodeFactory::Recursive_TypeCode::member_visibility_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -246,12 +244,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_visibility_i ( } return this->the_typecode_->member_visibility (index - ACE_ENV_ARG_PARAMETER); + ); } CORBA::ValueModifier TAO::TypeCodeFactory::Recursive_TypeCode::type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -260,12 +258,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::type_modifier_i ( CORBA::VM_NONE); } - return this->the_typecode_->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->the_typecode_->type_modifier (); } CORBA::TypeCode_ptr TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { if (CORBA::is_nil (this->the_typecode_.in ())) { @@ -275,7 +273,7 @@ TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i ( } return - this->the_typecode_->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); + this->the_typecode_->concrete_base_type (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h index 0f92a9bdc8b..5b595e66d97 100644 --- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h +++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h @@ -81,29 +81,29 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Any * member_label_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::Long default_index_i (void) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::ValueModifier type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; virtual CORBA::TypeCode_ptr concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; //@} diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl index 2a425197aa7..3fa0eeea203 100644 --- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl +++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl @@ -18,14 +18,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::the_typecode (CORBA::TypeCode_ptr tc) { this->the_typecode_ = CORBA::TypeCode::_duplicate (tc); - ACE_DECLARE_NEW_CORBA_ENV; // @@ Lazy, I know. :( CORBA::TCKind & mutable_kind = const_cast<CORBA::TCKind &> (this->kind_); - mutable_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + mutable_kind = tc->kind (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp index 29fb9ac421f..0ceeedd523b 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp @@ -23,7 +23,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc ( const char * id, const char * name, const CORBA::StructMemberSeq & members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -32,7 +32,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc ( return tcf.create_struct_tc (id, name, members - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -41,7 +41,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( const char * name, CORBA::TypeCode_ptr discriminator_type, const CORBA::UnionMemberSeq & members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -51,7 +51,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( name, discriminator_type, members - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -59,7 +59,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( const char * id, const char * name, const CORBA::EnumMemberSeq & members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -68,7 +68,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( return tcf.create_enum_tc (id, name, members - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -76,7 +76,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc ( const char * id, const char * name, CORBA::TypeCode_ptr original_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -85,7 +85,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc ( return tcf.create_alias_tc (id, name, original_type - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -93,7 +93,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc ( const char * id, const char * name, const CORBA::StructMemberSeq & members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -102,14 +102,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc ( return tcf.create_exception_tc (id, name, members - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc ( const char * id, const char * name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -117,40 +117,40 @@ TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc ( return tcf.create_interface_tc (id, name - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_string_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_string_tc (bound - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_wstring_tc (bound - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -158,14 +158,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc ( return tcf.create_fixed_tc (digits, scale - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -173,14 +173,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc ( return tcf.create_sequence_tc (bound, element_type - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -188,7 +188,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_array_tc ( return tcf.create_array_tc (length, element_type - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -198,7 +198,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc ( CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq & members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -209,7 +209,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc ( type_modifier, concrete_base, members - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -217,7 +217,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc ( const char * id, const char * name, CORBA::TypeCode_ptr boxed_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -226,14 +226,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc ( return tcf.create_value_box_tc (id, name, boxed_type - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_native_tc ( const char * id, const char * name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -241,27 +241,27 @@ TAO_TypeCodeFactory_Adapter_Impl::create_native_tc ( return tcf.create_native_tc (id, name - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc ( const char * id - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_recursive_tc (id - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc ( const char * id, const char * name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -269,14 +269,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc ( return tcf.create_abstract_interface_tc (id, name - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc ( const char * id, const char * name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -284,14 +284,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc ( return tcf.create_local_interface_tc (id, name - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_component_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -299,14 +299,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_component_tc ( return tcf.create_component_tc (id, name - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_home_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -314,7 +314,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_home_tc ( return tcf.create_home_tc (id, name - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -324,7 +324,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_event_tc ( CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -335,7 +335,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_event_tc ( type_modifier, concrete_base, members - ACE_ENV_ARG_PARAMETER); + ); } // -- @@ -346,7 +346,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( char const * /* name */, ACE_Array_Base<CORBA::String_var> const & /* enumerators */, CORBA::ULong /* ncases */ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } @@ -360,7 +360,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_except_tc ( TAO::TypeCode::Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > const & /* fields */, CORBA::ULong /* nfields */ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } @@ -376,7 +376,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( CORBA::Long /* default_index */, char const * /* default_case_name */, CORBA::TypeCode_ptr /* default_case_type */ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } @@ -392,7 +392,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_event_tc ( TAO::TypeCode::Value_Field<CORBA::String_var, CORBA::TypeCode_var> > const & /* fields */, CORBA::ULong /* nfields */ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h index 5f20f2af5b8..530d58361f7 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h @@ -46,7 +46,7 @@ public: const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -55,7 +55,7 @@ public: const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA::UnionMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -63,7 +63,7 @@ public: const char *id, const char *name, const CORBA::EnumMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -71,7 +71,7 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr original_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -79,47 +79,47 @@ public: const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -129,7 +129,7 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -137,48 +137,48 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_recursive_tc ( const char *id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_component_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_home_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -188,7 +188,7 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -205,7 +205,7 @@ public: char const * name, ACE_Array_Base<CORBA::String_var> const & enumerators, CORBA::ULong ncases - ACE_ENV_ARG_DECL); + ); /// Create a structure or exception TypeCode. virtual CORBA::TypeCode_ptr create_struct_except_tc ( @@ -216,7 +216,7 @@ public: TAO::TypeCode::Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > const & fields, CORBA::ULong nfields - ACE_ENV_ARG_DECL); + ); /// Create a union TypeCode. virtual CORBA::TypeCode_ptr create_union_tc ( @@ -229,7 +229,7 @@ public: CORBA::Long default_index, char const * default_case_name, CORBA::TypeCode_ptr default_case_type - ACE_ENV_ARG_DECL); + ); /// Create a valuetype or eventtype TypeCode. virtual CORBA::TypeCode_ptr create_value_event_tc ( @@ -242,7 +242,7 @@ public: TAO::TypeCode::Value_Field<CORBA::String_var, CORBA::TypeCode_var> > const & fields, CORBA::ULong nfields - ACE_ENV_ARG_DECL); + ); //@} diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp index 36d20aeda87..4330cffdaa0 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp @@ -33,7 +33,7 @@ CORBA::Object_ptr TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR * [] - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h index 55a524c32b8..9030064bbc6 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h @@ -42,7 +42,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to force the initialization of the ORB code. diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index 6183754d39b..a3a19e95c46 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -115,7 +115,7 @@ TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i (void) TAO_TypeCodeFactory_i * TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED) + ) { if (CORBA::is_nil (_tao_objref)) { @@ -130,7 +130,7 @@ TAO_TypeCodeFactory_i::create_struct_tc ( const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -138,7 +138,7 @@ TAO_TypeCodeFactory_i::create_struct_tc ( name, members, CORBA::tk_struct - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -147,7 +147,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA::UnionMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -169,8 +169,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::Boolean const good_disc_type = this->valid_disc_type (discriminator_type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); if (!good_disc_type) { @@ -208,8 +207,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( { CORBA::Boolean const equiv = member.type.in ()->equivalent (members[i - 1].type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); // If adjacent names are the same and their types are // equivalent, then they are duplicate case labels. If @@ -257,8 +255,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( // Valid member type? CORBA::Boolean const valid_member = this->valid_content_type (tc_holder - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); if (!valid_member) { @@ -286,8 +283,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::Boolean const equiv = discriminator_type->equivalent (tmp.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); if (!equiv) { @@ -302,8 +298,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( this->unique_label_values (members, discriminator_type, raw_default_index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); if (!unique_labels) { @@ -317,8 +312,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( case_array_type cases (len - dups); CORBA::TCKind const kind = - discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + discriminator_type->kind (); CORBA::ULong ci = 0; // Case array index. @@ -346,8 +340,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( id, member.type.in (), recursive_tc.inout () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); // Do not clobber previous positive detection. if (recursion_detected) @@ -413,7 +406,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_NEW_THROW_EX (the_case, case_type (label), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } break; case CORBA::tk_ulong: @@ -435,7 +427,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_NEW_THROW_EX (the_case, case_type (label), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } break; case CORBA::tk_long: @@ -457,7 +448,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_NEW_THROW_EX (the_case, case_type (label), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } break; case CORBA::tk_ushort: @@ -479,7 +469,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_NEW_THROW_EX (the_case, case_type (label), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } break; case CORBA::tk_short: @@ -501,7 +490,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_NEW_THROW_EX (the_case, case_type (label), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } break; case CORBA::tk_char: @@ -523,7 +511,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_NEW_THROW_EX (the_case, case_type (label), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } break; case CORBA::tk_boolean: @@ -545,7 +532,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_NEW_THROW_EX (the_case, case_type (label), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } break; case CORBA::tk_longlong: @@ -567,7 +553,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_NEW_THROW_EX (the_case, case_type (label), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } break; #if !defined (ACE_LACKS_LONGLONG_T) @@ -590,7 +575,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_NEW_THROW_EX (the_case, case_type (label), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } break; #endif /* !ACE_LACKS_LONGLONG_T */ @@ -639,7 +623,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( cases.size (), default_index), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return tc; } @@ -649,7 +632,7 @@ TAO_TypeCodeFactory_i::create_enum_tc ( const char *id, const char *name, const CORBA::EnumMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -702,7 +685,6 @@ TAO_TypeCodeFactory_i::create_enum_tc ( enumerators, len), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); return tc; } @@ -712,7 +694,7 @@ TAO_TypeCodeFactory_i::create_alias_tc ( const char *id, const char *name, CORBA::TypeCode_ptr original_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -720,7 +702,7 @@ TAO_TypeCodeFactory_i::create_alias_tc ( name, original_type, CORBA::tk_alias - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -728,7 +710,7 @@ TAO_TypeCodeFactory_i::create_exception_tc ( const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -736,52 +718,52 @@ TAO_TypeCodeFactory_i::create_exception_tc ( name, members, CORBA::tk_except - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_objref - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_string_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->string_wstring_tc_common (bound, CORBA::tk_string - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_wstring_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->string_wstring_tc_common (bound, CORBA::tk_wstring - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -790,7 +772,6 @@ TAO_TypeCodeFactory_i::create_fixed_tc ( TAO::TypeCode::Fixed<TAO::True_RefCount_Policy> (digits, scale), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); return tc; } @@ -799,28 +780,28 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return sequence_array_tc_common (bound, element_type, CORBA::tk_sequence - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return sequence_array_tc_common (length, element_type, CORBA::tk_array - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -830,7 +811,7 @@ TAO_TypeCodeFactory_i::create_value_tc ( CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -840,7 +821,7 @@ TAO_TypeCodeFactory_i::create_value_tc ( concrete_base, members, CORBA::tk_value - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -848,7 +829,7 @@ TAO_TypeCodeFactory_i::create_value_box_tc ( const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -856,27 +837,27 @@ TAO_TypeCodeFactory_i::create_value_box_tc ( name, boxed_type, CORBA::tk_value_box - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_native_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_native - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_recursive_tc ( const char *id - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -892,7 +873,6 @@ TAO_TypeCodeFactory_i::create_recursive_tc ( ACE_NEW_THROW_EX (tc, TAO::TypeCodeFactory::Recursive_TypeCode (id), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); return tc; } @@ -901,56 +881,56 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_abstract_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_abstract_interface - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_local_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_local_interface - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_component_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_component - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_home_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_home - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr @@ -960,7 +940,7 @@ TAO_TypeCodeFactory_i::create_event_tc ( CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -970,7 +950,7 @@ TAO_TypeCodeFactory_i::create_event_tc ( concrete_base, members, CORBA::tk_event - ACE_ENV_ARG_PARAMETER); + ); } // ===================================================================== @@ -1235,7 +1215,7 @@ TAO_TypeCodeFactory_i::create_tc_common ( const char *id, const char *name, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1262,7 +1242,6 @@ TAO_TypeCodeFactory_i::create_tc_common ( ACE_NEW_THROW_EX (tc, typecode_type (kind, id, name), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); return tc; } @@ -1271,7 +1250,7 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::string_wstring_tc_common ( CORBA::ULong bound, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1280,7 +1259,6 @@ TAO_TypeCodeFactory_i::string_wstring_tc_common ( TAO::TypeCode::String<TAO::True_RefCount_Policy> (kind, bound), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); return tc; } @@ -1290,7 +1268,7 @@ TAO_TypeCodeFactory_i::sequence_array_tc_common ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1298,8 +1276,7 @@ TAO_TypeCodeFactory_i::sequence_array_tc_common ( CORBA::Boolean const valid_element = this->valid_content_type (element_type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); if (!valid_element) { @@ -1316,7 +1293,6 @@ TAO_TypeCodeFactory_i::sequence_array_tc_common ( ACE_NEW_THROW_EX (tc, typecode_type (kind, tmp, bound), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); return tc; } @@ -1327,7 +1303,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( const char *name, const CORBA::StructMemberSeq & members, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1366,8 +1342,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( CORBA::Boolean const valid_member = this->valid_content_type (member_tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); if (!valid_member) { @@ -1405,8 +1380,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( id, member_tc, recursive_tc.inout () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); // Do not clobber previous positive detection. if (recursion_detected) @@ -1435,7 +1409,6 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( fields, len), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); return tc; } @@ -1446,7 +1419,7 @@ TAO_TypeCodeFactory_i::alias_value_box_tc_common ( const char *name, CORBA::TypeCode_ptr underlying_type, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1468,8 +1441,7 @@ TAO_TypeCodeFactory_i::alias_value_box_tc_common ( CORBA::Boolean const valid_content = this->valid_content_type (underlying_type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); if (!valid_content) { @@ -1487,7 +1459,6 @@ TAO_TypeCodeFactory_i::alias_value_box_tc_common ( ACE_NEW_THROW_EX (tc, typecode_type (kind, id, name, tmp), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); return tc; } @@ -1500,7 +1471,7 @@ TAO_TypeCodeFactory_i::value_event_tc_common ( CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1538,8 +1509,7 @@ TAO_TypeCodeFactory_i::value_event_tc_common ( CORBA::Boolean const valid_member = this->valid_content_type (member_tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); if (!valid_member) { @@ -1574,8 +1544,7 @@ TAO_TypeCodeFactory_i::value_event_tc_common ( id, member_tc, recursive_tc.inout () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + ); // Do not clobber previous positive detection. if (recursion_detected) @@ -1619,7 +1588,6 @@ TAO_TypeCodeFactory_i::value_event_tc_common ( fields, len), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); return tc; } @@ -1684,12 +1652,11 @@ TAO_TypeCodeFactory_i::valid_id (const char *id) CORBA::Boolean TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { CORBA::TCKind const kind = TAO::unaliased_kind (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); switch (kind) { @@ -1708,10 +1675,9 @@ TAO_TypeCodeFactory_i::unique_label_values ( const CORBA::UnionMemberSeq &members, CORBA::TypeCode_ptr disc_tc, CORBA::ULong default_index_slot - ACE_ENV_ARG_DECL) + ) { - CORBA::TCKind disc_kind = disc_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TCKind disc_kind = disc_tc->kind (); CORBA::ULong length = members.length (); @@ -1861,10 +1827,9 @@ TAO_TypeCodeFactory_i::unique_label_values ( CORBA::Boolean TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { - CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TCKind const kind = tc->kind (); return (kind == CORBA::tk_enum @@ -1883,7 +1848,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, char const * id, CORBA::TypeCode_ptr member, CORBA::TypeCode_ptr & recursive_tc - ACE_ENV_ARG_DECL) + ) { if (kind != CORBA::tk_struct && kind != CORBA::tk_union @@ -1893,12 +1858,10 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, CORBA::TypeCode_var unaliased_member = TAO::unaliased_typecode (member - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::TCKind const unaliased_member_kind = - unaliased_member->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + unaliased_member->kind (); // Recursively iterate through the member and content types until // we've exhausted all TypeCodes capable of containing other @@ -1911,19 +1874,16 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, case CORBA::tk_event: { CORBA::ULong const nfields = - unaliased_member->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + unaliased_member->member_count (); for (CORBA::ULong i = 0; i < nfields; ++i) { CORBA::TypeCode_var member_tc = unaliased_member->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::TCKind const member_tc_kind = - member_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + member_tc->kind (); if (member_tc_kind == CORBA::TAO_TC_KIND_COUNT) { @@ -1934,8 +1894,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, if (kind == CORBA::tk_value || kind == CORBA::tk_event) { char const * member_tc_id = - member_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + member_tc->id (); if (ACE_OS::strcmp (id, member_tc_id) == 0) { @@ -1951,8 +1910,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, recursive_tc = this->make_recursive_tc (kind, id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); } // Set the actual recursive TypeCode. @@ -1980,8 +1938,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, id, member_tc.in (), recursive_tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (recursion_detected) { @@ -1999,18 +1956,15 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, case CORBA::tk_array: { CORBA::TypeCode_var content_tc = - unaliased_member->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + unaliased_member->content_type (); CORBA::TCKind const content_tc_kind = - content_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + content_tc->kind (); if (content_tc_kind == CORBA::TAO_TC_KIND_COUNT) { char const * content_tc_id = - content_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + content_tc->id (); if (ACE_OS::strcmp (id, content_tc_id) == 0) { @@ -2025,8 +1979,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, recursive_tc = this->make_recursive_tc (kind, id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); } // Set the actual recursive TypeCode. @@ -2042,7 +1995,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, id, content_tc.in (), recursive_tc - ACE_ENV_ARG_PARAMETER); + ); } default: @@ -2055,7 +2008,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind, char const * id - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil (); @@ -2065,14 +2018,12 @@ TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind, ACE_NEW_THROW_EX (tc, TCF::Struct::recursive_typecode_type (kind, id), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); break; case CORBA::tk_union: ACE_NEW_THROW_EX (tc, TCF::Union::recursive_typecode_type (kind, id), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); break; case CORBA::tk_value: @@ -2080,7 +2031,6 @@ TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind, ACE_NEW_THROW_EX (tc, TCF::Value::recursive_typecode_type (kind, id), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (tc); break; default: // Should never hit this case. diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h index e463d0a4169..d2c2b708bf5 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h @@ -61,13 +61,13 @@ public: /// = LocalObject methods static TAO_TypeCodeFactory_i *_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL); + ); virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -76,7 +76,7 @@ public: const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA::UnionMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -84,7 +84,7 @@ public: const char *id, const char *name, const CORBA::EnumMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -92,7 +92,7 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr original_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -100,47 +100,47 @@ public: const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -150,7 +150,7 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -158,48 +158,48 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_recursive_tc ( const char *id - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_component_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_home_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -209,7 +209,7 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -225,7 +225,7 @@ private: const char *id, const char *name, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -233,7 +233,7 @@ private: CORBA::TypeCode_ptr string_wstring_tc_common ( CORBA::ULong bound, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -242,7 +242,7 @@ private: CORBA::ULong bound, CORBA::TypeCode_ptr element_type, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -252,7 +252,7 @@ private: const char *name, const CORBA::StructMemberSeq &members, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -262,7 +262,7 @@ private: const char *name, CORBA::TypeCode_ptr underlying_type, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -273,7 +273,7 @@ private: CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members, CORBA::TCKind kind - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -282,13 +282,13 @@ private: CORBA::Boolean valid_name (const char *name); CORBA::Boolean valid_id (const char *id); CORBA::Boolean valid_content_type (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); CORBA::Boolean unique_label_values (const CORBA::UnionMemberSeq &members, CORBA::TypeCode_ptr disc_tc, CORBA::ULong default_index_slot - ACE_ENV_ARG_DECL); + ); CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Check @a member for recursive @c TypeCode. /** @@ -301,12 +301,12 @@ private: char const * id, CORBA::TypeCode_ptr member, CORBA::TypeCode_ptr & recursive_tc - ACE_ENV_ARG_DECL); + ); /// Make a recursive TypeCode with the given kind and repository ID. CORBA::TypeCode_ptr make_recursive_tc (CORBA::TCKind kind, char const * id - ACE_ENV_ARG_DECL); + ); /// Prohibited TAO_TypeCodeFactory_i (const TAO_TypeCodeFactory_i &src); diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index 67353a5d2da..9c954c7a864 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -71,81 +71,65 @@ public: virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL - ) + const CORBA::StructMemberSeq &members) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, - const CORBA::UnionMemberSeq &members - ACE_ENV_ARG_DECL - ) + const CORBA::UnionMemberSeq &members) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_enum_tc ( const char *id, const char *name, - const CORBA::EnumMemberSeq &members - ACE_ENV_ARG_DECL - ) + const CORBA::EnumMemberSeq &members) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_alias_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr original_type - ACE_ENV_ARG_DECL - ) + CORBA::TypeCode_ptr original_type) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_exception_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL - ) + const CORBA::StructMemberSeq &members) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; @@ -155,7 +139,6 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; @@ -163,49 +146,37 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_recursive_tc ( - const char *id - ACE_ENV_ARG_DECL - ) + const char *id) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_component_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) + const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_home_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) + const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_event_tc ( @@ -213,9 +184,7 @@ public: const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) + const CORBA::ValueMemberSeq &members) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // -- @@ -233,7 +202,7 @@ public: char const * name, ACE_Array_Base<CORBA::String_var> const & enumerators, CORBA::ULong ncases - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Create a structure or exception TypeCode. virtual CORBA::TypeCode_ptr create_struct_except_tc ( @@ -244,7 +213,7 @@ public: TAO::TypeCode::Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > const & fields, CORBA::ULong nfields - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Create a union TypeCode. virtual CORBA::TypeCode_ptr create_union_tc ( @@ -257,7 +226,7 @@ public: CORBA::Long default_index, char const * default_case_name, CORBA::TypeCode_ptr default_case_type - ACE_ENV_ARG_DECL) = 0; + ) = 0; /// Create a valuetype or eventtype TypeCode. virtual CORBA::TypeCode_ptr create_value_event_tc ( @@ -270,7 +239,7 @@ public: TAO::TypeCode::Value_Field<CORBA::String_var, CORBA::TypeCode_var> > const & fields, CORBA::ULong nfields - ACE_ENV_ARG_DECL) = 0; + ) = 0; //@} }; diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp index 9e0fb6444f9..b1799cf088b 100644 --- a/TAO/tao/Utils/Implicit_Deactivator.cpp +++ b/TAO/tao/Utils/Implicit_Deactivator.cpp @@ -12,27 +12,22 @@ TAO::Utils::Implicit_Deactivation_Functor::operator () ( PortableServer::ServantBase * servant) ACE_THROW_SPEC (()) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableServer::POA_var poa (servant->_default_POA ( - ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_TRY_CHECK; + )); PortableServer::ObjectId_var id (poa->servant_to_id (servant - ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; + )); poa->deactivate_object (id.in() - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHALL + catch (...) { // @@ Cannot let exceptions escape, yet we need to log them! } - ACE_ENDTRY; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp index 8b8a74220ff..f21bef3f86d 100644 --- a/TAO/tao/Utils/ORB_Destroyer.cpp +++ b/TAO/tao/Utils/ORB_Destroyer.cpp @@ -11,17 +11,14 @@ void TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb) ACE_THROW_SPEC (()) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } - ACE_CATCHALL + catch (...) { // @@ Cannot let exceptions escape, yet we need to log them! } - ACE_ENDTRY; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp index d777b683ab8..b0796f39060 100644 --- a/TAO/tao/Utils/ORB_Manager.cpp +++ b/TAO/tao/Utils/ORB_Manager.cpp @@ -41,27 +41,26 @@ TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb, int TAO_ORB_Manager::init (int &argc, char **argv - ACE_ENV_ARG_DECL) + ) { return this->init (argc, argv, 0 - ACE_ENV_ARG_PARAMETER); + ); } int TAO_ORB_Manager::init (int &argc, char **argv, const char *orb_name - ACE_ENV_ARG_DECL) + ) { if (CORBA::is_nil (this->orb_.in ())) { this->orb_ = CORBA::ORB_init (argc, argv, orb_name - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); } if (CORBA::is_nil (this->poa_.in ())) @@ -69,8 +68,7 @@ TAO_ORB_Manager::init (int &argc, // Get the POA from the ORB. CORBA::Object_var poa_object = this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -80,18 +78,16 @@ TAO_ORB_Manager::init (int &argc, // Get the POA object. this->poa_ = PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + ); - ACE_CHECK_RETURN (-1); } if (CORBA::is_nil (this->poa_manager_.in ())) { // Get the POA_Manager. this->poa_manager_ = - this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); + this->poa_->the_POAManager (); - ACE_CHECK_RETURN (-1); } return 0; @@ -103,14 +99,13 @@ TAO_ORB_Manager::init_child_poa (int& argc, char **argv, const char *poa_name, const char *orb_name - ACE_ENV_ARG_DECL) + ) { // check to see if root poa has to be created. int init_result = this->init (argc, argv, orb_name - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); if (init_result == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -125,14 +120,12 @@ TAO_ORB_Manager::init_child_poa (int& argc, // Id Assignment policy policies[0] = this->poa_->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); // Lifespan policy policies[1] = this->poa_->create_lifespan_policy (PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ); // We use a different POA, otherwise the user would have to change // the object key each time it invokes the server. @@ -141,10 +134,9 @@ TAO_ORB_Manager::init_child_poa (int& argc, this->poa_->create_POA (poa_name, this->poa_manager_.in (), policies - ACE_ENV_ARG_PARAMETER); + ); // Warning! If create_POA fails, then the policies won't be // destroyed and there will be hell to pay in memory leaks! - ACE_CHECK_RETURN (-1); // Creation of the new POAs over, so destroy the Policy_ptr's. for (CORBA::ULong i = 0; @@ -152,8 +144,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policy->destroy (); } return 0; } @@ -162,10 +153,9 @@ TAO_ORB_Manager::init_child_poa (int& argc, // Activate POA manager. int -TAO_ORB_Manager::activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Manager::activate_poa_manager (void) { - this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->poa_manager_->activate (); return 0; } @@ -173,42 +163,37 @@ TAO_ORB_Manager::activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL) char * TAO_ORB_Manager::activate (PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { PortableServer::ObjectId_var id = this->poa_->activate_object (servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::Object_var obj = this->poa_->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::String_var str = this->orb_->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); return str._retn (); } void TAO_ORB_Manager::deactivate (const char *id - ACE_ENV_ARG_DECL) + ) { CORBA::Object_var object = this->orb_->string_to_object (id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::ObjectId_var object_id = this->poa_->reference_to_id (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); this->poa_->deactivate_object (object_id.in () - ACE_ENV_ARG_PARAMETER); + ); } #if !defined (CORBA_E_MICRO) @@ -216,7 +201,7 @@ TAO_ORB_Manager::deactivate (const char *id char * TAO_ORB_Manager::activate_under_child_poa (const char *object_name, PortableServer::Servant servant - ACE_ENV_ARG_DECL) + ) { if (object_name == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -229,39 +214,34 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name, this->child_poa_->activate_object_with_id (id.in (), servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::Object_var obj = this->child_poa_->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); char * str = this->orb_->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + ); - ACE_CHECK_RETURN (0); return str; } void TAO_ORB_Manager::deactivate_under_child_poa (const char *id - ACE_ENV_ARG_DECL) + ) { CORBA::Object_var object = this->orb_->string_to_object (id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); PortableServer::ObjectId_var object_id = this->child_poa_->reference_to_id (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); this->child_poa_->deactivate_object (object_id.in () - ACE_ENV_ARG_PARAMETER); + ); } #endif /* CORBA_E_MICRO */ @@ -269,40 +249,34 @@ TAO_ORB_Manager::deactivate_under_child_poa (const char *id int TAO_ORB_Manager::run (ACE_Time_Value &tv - ACE_ENV_ARG_DECL) + ) { - this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->poa_manager_->activate (); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->orb_->run (tv); return 0; } int -TAO_ORB_Manager::fini (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Manager::fini (void) { - this->poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->poa_->destroy (1, 1); this->poa_ = 0; - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->orb_->destroy (); this->orb_ = 0; return 0; } int -TAO_ORB_Manager::run (ACE_ENV_SINGLE_ARG_DECL) +TAO_ORB_Manager::run (void) { - this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->poa_manager_->activate (); - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->orb_->run (); return 0; } @@ -339,21 +313,19 @@ TAO_ORB_Manager::poa_manager (void) TAO_ORB_Manager::~TAO_ORB_Manager (void) { - ACE_TRY_NEW_ENV + try { if (!CORBA::is_nil (this->poa_.in ())) { this->poa_->destroy (1, 1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { // ignore any exceptions.. } - ACE_ENDTRY; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h index 9f06fe7d3ba..db311d817be 100644 --- a/TAO/tao/Utils/ORB_Manager.h +++ b/TAO/tao/Utils/ORB_Manager.h @@ -68,7 +68,7 @@ public: */ int init (int &argc, char *argv[] - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /** * Initialize the ORB/root POA, using the supplied command line @@ -80,7 +80,7 @@ public: int init (int &argc, char *argv[], const char *orb_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #if !defined (CORBA_E_MICRO) /** @@ -95,7 +95,7 @@ public: char *argv[], const char *poa_name, const char *orb_name = 0 - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #endif /* CORBA_E_MICRO */ /** @@ -104,7 +104,7 @@ public: * @retval -1 Failure * @retval 0 Success */ - int fini (ACE_ENV_SINGLE_ARG_DECL); + int fini (void); /// Destructor. ~TAO_ORB_Manager (void); @@ -121,7 +121,7 @@ public: * @retval -1 Failure * @retval 0 Success */ - int activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int activate_poa_manager (void); /** * Activate <servant>, using the POA <activate_object> call. Users @@ -132,7 +132,7 @@ public: * memory deallocation of the string. */ char *activate (PortableServer::Servant servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /** Deactivate object in RootPOA. * @@ -140,7 +140,7 @@ public: * of the servant to deactivate in the POA */ void deactivate (const char *id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #if !defined (CORBA_E_MICRO) /** @@ -159,7 +159,7 @@ public: */ char *activate_under_child_poa (const char *object_name, PortableServer::Servant servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /** * Deactivate object in child POA. @@ -168,7 +168,7 @@ public: * the object to deactivate in the POA */ void deactivate_under_child_poa (const char *id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); #endif /* CORBA_E_MICRO */ /** @@ -179,12 +179,12 @@ public: * @retval 0 Success */ int run (ACE_Time_Value &tv - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /** * Run the ORB event loop. */ - int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run (void); /** * Accessor which returns the ORB pointer. Following the normal diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp index 426d841991c..a5acabe07da 100644 --- a/TAO/tao/Utils/PolicyList_Destroyer.cpp +++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp @@ -14,7 +14,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() ACE_THROW_SPEC (()) { - ACE_DECLARE_NEW_CORBA_ENV; for (CORBA::ULong i = 0; i != length(); ++i) { @@ -24,15 +23,13 @@ TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() continue; } - ACE_TRY + try { - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy->destroy (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; (*this)[i] = CORBA::Policy::_nil(); } diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp index fad7ef86477..6d5fe007366 100644 --- a/TAO/tao/Utils/RIR_Narrow.cpp +++ b/TAO/tao/Utils/RIR_Narrow.cpp @@ -5,47 +5,42 @@ #include "tao/Utils/RIR_Narrow.h" #include "tao/SystemException.h" -#if defined (ACE_HAS_EXCEPTIONS) - #include <stdexcept> -#endif +#include <stdexcept> TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb, char const * id - ACE_ENV_ARG_DECL) + ) { CORBA::Object_var object = orb->resolve_initial_references (id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (T::_nil ()); + ); return RIR_Narrow<T>::narrow_object (object.in () - ACE_ENV_ARG_PARAMETER); + ); } template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info, char const * id - ACE_ENV_ARG_DECL) + ) { CORBA::Object_var object = info->resolve_initial_references (id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (T::_nil ()); + ); return RIR_Narrow<T>::narrow_object (object.in () - ACE_ENV_ARG_PARAMETER); + ); } template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object - ACE_ENV_ARG_DECL) + ) { _var_type narrowed_object = T::_narrow (object - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (T::_nil ()); + ); if (CORBA::is_nil (narrowed_object.in ())) { diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h index fdeba60f91e..8afa8931e41 100644 --- a/TAO/tao/Utils/RIR_Narrow.h +++ b/TAO/tao/Utils/RIR_Narrow.h @@ -47,17 +47,17 @@ namespace TAO /// narrow it. static _ptr_type narrow (CORBA::ORB_ptr orb, char const * id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Use resolve_initial_references to find an object and then /// narrow it. static _ptr_type narrow (PortableInterceptor::ORBInitInfo_ptr orb, char const * id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); private: static _ptr_type narrow_object (CORBA::Object_ptr object - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); }; } // namespace Utils diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl index be906d9982f..ca6e0e6f9bf 100644 --- a/TAO/tao/Utils/Servant_Var.inl +++ b/TAO/tao/Utils/Servant_Var.inl @@ -11,21 +11,17 @@ template <class T> ACE_INLINE T * TAO::Utils::Servant_Var<T>::_duplicate (T * p) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (p != 0) { - p->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + p->_add_ref (); } } - ACE_CATCHALL + catch (...) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); return p; } @@ -85,19 +81,17 @@ TAO::Utils::Servant_Var<T>::~Servant_Var (void) // can't assume that it will not throw. If it does, then we are in // trouble. In any event, we can't let the exception escape our // destructor. - ACE_TRY_NEW_ENV + try { if (ptr_ != 0) { - ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ptr_->_remove_ref (); } } - ACE_CATCHALL + catch (...) { // Forget the exception.. } - ACE_ENDTRY; } #if !defined(ACE_LACKS_MEMBER_TEMPLATES) diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index a4dce4bb8eb..43dba960a5a 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -47,13 +47,12 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) char ** asciiArgv = command_line.get_ASCII_argv (); - ACE_TRY_NEW_ENV + try { // Initialize the orb CORBA::ORB_var orb = - CORBA::ORB_init (argc, asciiArgv, name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, asciiArgv, name_); if (! ::CORBA::is_nil(orb.in ())) { @@ -65,8 +64,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) { ////////////////////////////////// // let the servant register itself - result = servant.init (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + result = servant.init (orb.in ()); if (result == 0) { @@ -78,24 +76,19 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) // Run the event loop for the ORB. // Initial run to initialize the orb ACE_Time_Value tv (1,0); - orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (tv); // now run event loop int quit = 0; while (result == 0 && ! quit ) { ACE_Time_Value work_tv (1,0); - orb->perform_work(work_tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - quit = servant.idle (result ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->perform_work(work_tv); + quit = servant.idle (result); } - servant.fini (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant.fini (); - orb->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->shutdown (1); ACE_ERROR ((LM_INFO, "%T %s (%P|%t) Terminated normally. %s\n", @@ -120,13 +113,12 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) } } } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, name_); result = -1; } - ACE_ENDTRY; return result; } diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h index c5d3ea2d825..8054c5cd5f9 100644 --- a/TAO/tao/Utils/Server_Main.h +++ b/TAO/tao/Utils/Server_Main.h @@ -35,9 +35,9 @@ * Xyzzy_i (); // null constructor * ~Xyzzy_i (); // destructor * int parse_args (int argc, char * argv[]); - * int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_WITH_DEFAULTS); + * int init (CORBA::ORB_ptr orb ); * int idle(int &result); - * int fini (ACE_ENV_SINGLE_ARG_DECL); + * int fini (void); * const char * identity () const; * * parse_args, self_register, self_unregister return 0 if ok, nonzero for error. diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index bcb98847975..9d64485d221 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -172,18 +172,16 @@ CORBA::AbstractBase::_to_value (void) } CORBA::Boolean -CORBA::AbstractBase::_is_a (const char *type_id - ACE_ENV_ARG_DECL) +CORBA::AbstractBase::_is_a (const char *type_id) { if (! CORBA::is_nil (this->equivalent_obj_.in ())) { - return this->equivalent_obj_->_is_a (type_id - ACE_ENV_ARG_PARAMETER); + return this->equivalent_obj_->_is_a (type_id); } - - int cmp = ACE_OS::strcmp (type_id, - "IDL:omg.org/CORBA/AbstractBase:1.0"); - + + int const cmp = ACE_OS::strcmp (type_id, + "IDL:omg.org/CORBA/AbstractBase:1.0"); + return (cmp == 0); } diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index b8f039290e7..8ebddcab997 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -72,7 +72,7 @@ namespace CORBA typedef CORBA::AbstractBase_out _out_type; static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj); static CORBA::AbstractBase_ptr _nil (void); @@ -85,7 +85,7 @@ namespace CORBA CORBA::ValueBase *_to_value (void); virtual CORBA::Boolean _is_a (const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); virtual const char* _interface_repository_id (void) const; /// TAO specific operation diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl index f3d4dfb60e6..e29418e7154 100644 --- a/TAO/tao/Valuetype/AbstractBase.inl +++ b/TAO/tao/Valuetype/AbstractBase.inl @@ -15,7 +15,7 @@ CORBA::AbstractBase::_nil (void) ACE_INLINE CORBA::AbstractBase_ptr CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj - ACE_ENV_ARG_DECL_NOT_USED) + ) { return CORBA::AbstractBase::_duplicate (obj); } diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp index ff9f03fa562..0c76b07ff2b 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.cpp +++ b/TAO/tao/Valuetype/AbstractBase_T.cpp @@ -16,7 +16,7 @@ namespace TAO CORBA::AbstractBase_ptr obj, const char *repo_id, Proxy_Broker_Factory pbf - ACE_ENV_ARG_DECL) + ) { if (CORBA::is_nil (obj)) { @@ -26,9 +26,8 @@ namespace TAO CORBA::Boolean const is_it = obj->_is_a ( repo_id - ACE_ENV_ARG_PARAMETER + ); - ACE_CHECK_RETURN (T::_nil ()); if (is_it == false) { @@ -39,7 +38,7 @@ namespace TAO AbstractBase_Narrow_Utils<T>::unchecked_narrow (obj, repo_id, pbf - ACE_ENV_ARG_PARAMETER); + ); } template<typename T> T * @@ -49,26 +48,22 @@ namespace TAO { T *proxy = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { proxy = AbstractBase_Narrow_Utils<T>::unchecked_narrow ( obj, 0, pbf - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // Consume and return proxy return proxy; } - ACE_ENDTRY; - ACE_CHECK_RETURN (proxy); return proxy; } @@ -78,7 +73,7 @@ namespace TAO CORBA::AbstractBase_ptr obj, const char *, Proxy_Broker_Factory pbf - ACE_ENV_ARG_DECL) + ) { if (CORBA::is_nil (obj)) { @@ -102,7 +97,6 @@ namespace TAO collocated ? 1 : 0, obj->_servant ()), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (proxy); } else { diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h index dced03cf334..79c85ae0d87 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.h +++ b/TAO/tao/Valuetype/AbstractBase_T.h @@ -39,7 +39,7 @@ namespace TAO static T_ptr narrow (CORBA::AbstractBase_ptr, const char *repo_id, Proxy_Broker_Factory - ACE_ENV_ARG_DECL); + ); static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr, Proxy_Broker_Factory); @@ -47,7 +47,7 @@ namespace TAO static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr, const char *repo_id, Proxy_Broker_Factory - ACE_ENV_ARG_DECL); + ); }; } diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 3b7376ea2bf..dfa55ef1c7f 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -703,7 +703,7 @@ TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm) // Read a long value that might be an endtag, the chunk size or the value tag // of the nested valuetype. CORBA::Long tag; - + if (!strm.read_long (tag)) { return false; @@ -721,7 +721,7 @@ TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm) this->value_nesting_level_), false); } - + this->value_nesting_level_ = - tag; this->value_nesting_level_--; @@ -796,7 +796,7 @@ CORBA::ValueBase::_tao_read_repository_id_list (ACE_InputCDR& strm, Repository_Id_List& ids) { CORBA::Long num_ids; - + if (!strm.read_long (num_ids)) { return false; @@ -849,7 +849,7 @@ CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm, { return false; } - + buffer_size = -(offset) + sizeof (CORBA::Long); } @@ -862,7 +862,7 @@ CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm, { return false; } - + indir_stream.read_string (id); // Since the ID is always read from the indirection cdr we have to skip @@ -881,11 +881,7 @@ CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm, void CORBA::ValueBase::truncation_hook () { -#if defined (ACE_HAS_EXCEPTIONS) - ACE_THROW (CORBA::INTERNAL ()); -#else - ACE_OS::abort (); -#endif /* ACE_HAS_EXCEPTIONS */ + throw ::CORBA::INTERNAL (); } diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 0935bba77a4..6bfd4dd0c14 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -65,7 +65,7 @@ namespace CORBA /// In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T) /// (see at definition below) virtual CORBA::ValueBase * create_for_unmarshal ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; + void) = 0; // Not pure virtual because this will be overridden only by valuetypes // that support an abstract interface. diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp index 0c58622685d..21093cf9ca7 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp @@ -16,14 +16,13 @@ TAO_Valuetype_Adapter_Factory_Impl::~TAO_Valuetype_Adapter_Factory_Impl (void) } TAO_Valuetype_Adapter * -TAO_Valuetype_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL) +TAO_Valuetype_Adapter_Factory_Impl::create (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Valuetype_Adapter_Impl *nva = 0; ACE_NEW_THROW_EX (nva, TAO_Valuetype_Adapter_Impl (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (nva); return nva; } diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h index 91b8cbe6e8c..6cac11a715b 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h @@ -44,7 +44,7 @@ public: virtual ~TAO_Valuetype_Adapter_Factory_Impl (void); virtual TAO_Valuetype_Adapter * create ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tao/Valuetype_Adapter_Factory.h b/TAO/tao/Valuetype_Adapter_Factory.h index dabd7e7159a..3e1ab345ee0 100644 --- a/TAO/tao/Valuetype_Adapter_Factory.h +++ b/TAO/tao/Valuetype_Adapter_Factory.h @@ -43,7 +43,7 @@ public: virtual ~TAO_Valuetype_Adapter_Factory (void); virtual TAO_Valuetype_Adapter * create ( - ACE_ENV_SINGLE_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index 8c7368c54cf..ad6e5150b31 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -127,7 +127,6 @@ void CORBA::WrongTransaction::_raise (void) const void CORBA::WrongTransaction::_tao_encode ( TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -135,12 +134,11 @@ void CORBA::WrongTransaction::_tao_encode ( return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::WrongTransaction::_tao_decode ( TAO_InputCDR &cdr - ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -148,7 +146,7 @@ void CORBA::WrongTransaction::_tao_decode ( return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } // TAO extension - the virtual _type method. diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index 18d10826955..1fdf4a35e91 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -95,12 +95,10 @@ namespace CORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL ); // TAO_IDL - Generated from diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index 96c38a1014a..383fb11b695 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -21,8 +21,7 @@ ACE_RCSID (tao, TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Exception * -TAO_Operation_Details::corba_exception (const char *id - ACE_ENV_ARG_DECL) +TAO_Operation_Details::corba_exception (const char *id) ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i != this->ex_count_; ++i) diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 70e5344e7e7..38cbc0314be 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -132,8 +132,7 @@ public: * is not found in the list of exceptions specified by the operation * this call would raise an UNKNOWN exception. */ - CORBA::Exception *corba_exception (const char *ex - ACE_ENV_ARG_DECL) + CORBA::Exception *corba_exception (const char *ex) ACE_THROW_SPEC ((CORBA::SystemException)); /** diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 177a100b6d1..7ad3103640d 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -190,14 +190,7 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; # define TAO_NO_COPY_OCTET_SEQUENCES 1 #endif /* TAO_NO_COPY_OCTET_SEQUENCES */ -#if defined (ACE_HAS_EXCEPTIONS) -# define TAO_HAS_EXCEPTIONS -// TAO_USE_EXCEPTIONS is only here for backwards compatibility and -// will go away shortly so don't use it... -# define TAO_USE_EXCEPTIONS -#elif (defined (TAO_HAS_EXCEPTIONS) || defined (TAO_USE_EXCEPTIONS)) && !defined (ACE_HAS_EXCEPTIONS) -# error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them" -#endif /* TAO_HAS_EXCEPTIONS */ +#define TAO_HAS_EXCEPTIONS // BC++ seems to have a different convention for detecting Win32 than // VC++. |