diff options
| author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
|---|---|---|
| committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
| commit | 15f9b16afed320b4e581b8f61fee7d7fbf1aa9a8 (patch) | |
| tree | fd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/tao | |
| parent | 5e12d6686388ccadee1714b94ddee0cce6587bfd (diff) | |
| download | ATCD-15f9b16afed320b4e581b8f61fee7d7fbf1aa9a8.tar.gz | |
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/tao')
418 files changed, 13017 insertions, 13104 deletions
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp index 356d29da390..9a810548d4e 100644 --- a/TAO/tao/Abstract_Servant_Base.cpp +++ b/TAO/tao/Abstract_Servant_Base.cpp @@ -16,12 +16,12 @@ TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void) void -TAO_Abstract_ServantBase::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Abstract_ServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } void -TAO_Abstract_ServantBase::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Abstract_ServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } @@ -34,7 +34,7 @@ TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (const TAO_Abstract_ServantBa 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 9e7cf13aad7..760ffc1924c 100644 --- a/TAO/tao/Abstract_Servant_Base.h +++ b/TAO/tao/Abstract_Servant_Base.h @@ -37,27 +37,27 @@ public: /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; /// Default <_non_existent>: always returns false. - virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; + virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; /// Query the Interface Repository. virtual CORBA_InterfaceDef_ptr _get_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; //@{ /// @name Reference counting hooks: no-ops by default. - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); //@} /// Get the correct vtable. virtual void *_downcast (const char *repository_id) = 0; /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL) = 0; protected: /// Default constructor, only derived classes can be created. @@ -78,12 +78,12 @@ protected: */ virtual void _dispatch (TAO_ServerRequest &request, void *servant_upcall - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req, void *servant_upcall, void *derived_this - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Find an operation in the operation table. virtual int _find (const char *opname, diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 164f766fe81..17c88a70769 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -107,7 +107,7 @@ int TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, ACE_Reactor *reactor, int ignore_address - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // protocol_factories is in the following form @@ -249,7 +249,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, addrs, factory, ignore_address - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -470,7 +470,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, ACE_CString &addrs, TAO_ProtocolFactorySetItor &factory, int ignore_address - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_CString options_tmp; this->extract_endpoint_options (addrs, diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index d1234078b4c..8f7e131aeca 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -66,7 +66,7 @@ public: int open (TAO_ORB_Core *orb_core, ACE_Reactor *reactor, int ignore_address - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Close all open acceptors. @@ -119,7 +119,7 @@ private: ACE_CString &address, TAO_ProtocolFactorySetItor &factory, int ignore_address - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: // The acceptor registry should not be copied. diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index 2af75966552..833c3696a60 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -44,29 +44,29 @@ TAO_Adapter_Registry::~TAO_Adapter_Registry (void) void TAO_Adapter_Registry::close (int wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (size_t i = 0; i != this->adapters_count_; ++i) { - this->adapters_[i]->close (wait_for_completion TAO_ENV_ARG_PARAMETER); + this->adapters_[i]->close (wait_for_completion ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_Adapter_Registry::check_close (int wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (size_t i = 0; i != this->adapters_count_; ++i) { - this->adapters_[i]->check_close (wait_for_completion TAO_ENV_ARG_PARAMETER); + this->adapters_[i]->check_close (wait_for_completion ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_Adapter_Registry::insert (TAO_Adapter *adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->adapters_capacity_ == this->adapters_count_) { @@ -106,7 +106,7 @@ void TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { for (size_t i = 0; i != this->adapters_count_; ++i) @@ -114,7 +114,7 @@ TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key, int r = this->adapters_[i]->dispatch (key, request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (r != TAO_Adapter::DS_MISMATCHED_KEY) diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index 599a6921fa3..57f2f70871d 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -41,17 +41,17 @@ public: virtual ~TAO_Adapter (void); /// Initialize the Adapter - virtual void open (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; + virtual void open (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; /// The ORB is shutting down, destroy any resources attached to this /// adapter. virtual void close (int wait_for_completion - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 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 - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; /** * Return the priority assigned to this adapter. @@ -64,7 +64,7 @@ public: virtual int dispatch (TAO_ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; enum { @@ -119,7 +119,7 @@ public: * POA while performing an upcall). */ void close (int wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Verify if the close() call can be invoked in the current @@ -127,11 +127,11 @@ public: * Raise the right exception if not. */ void check_close (int wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Insert a new adapter into the registry. void insert (TAO_Adapter *adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Dispatch the request to all the adapters. @@ -141,7 +141,7 @@ public: void dispatch (TAO_ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Create a collocated object using the given profile and stub. diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 557f76dc8c1..1f02334d573 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -31,10 +31,10 @@ CORBA_Any::type (void) const void CORBA_Any::type (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean equiv = this->type_->equivalent (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (equiv) @@ -279,7 +279,7 @@ CORBA_Any::free_value (void) void CORBA_Any::_tao_encode (TAO_OutputCDR &cdr, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Always append the CDR stream, even when the value_. if (this->cdr_ == 0) @@ -293,12 +293,12 @@ CORBA_Any::_tao_encode (TAO_OutputCDR &cdr, TAO_Marshal_Object::perform_append (this->type_.in (), &in, &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void CORBA_Any::_tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Just read into the CDR stream... @@ -314,7 +314,7 @@ CORBA_Any::_tao_decode (TAO_InputCDR &cdr CORBA::TypeCode::traverse_status status = TAO_Marshal_Object::perform_skip (this->type_.in (), &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -522,12 +522,12 @@ CORBA_Any::operator<<= (CORBA::TypeCode_ptr tc) void CORBA_Any::operator<<= (const CORBA_Exception &exception) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_OutputCDR stream; - exception._tao_encode (stream TAO_ENV_ARG_PARAMETER); + exception._tao_encode (stream ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->_tao_replace (exception._type (), @@ -548,12 +548,12 @@ CORBA_Any::operator<<= (const CORBA_Exception &exception) void CORBA_Any::operator<<= (CORBA_Exception *exception) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_OutputCDR stream; - exception->_tao_encode (stream TAO_ENV_ARG_PARAMETER); + exception->_tao_encode (stream ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->_tao_replace (exception->_type (), @@ -717,13 +717,13 @@ CORBA_Any::operator<<= (from_wstring ws) CORBA::Boolean CORBA_Any::operator>>= (CORBA::Short &s) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_short - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -746,13 +746,13 @@ CORBA_Any::operator>>= (CORBA::Short &s) const CORBA::Boolean CORBA_Any::operator>>= (CORBA::UShort &s) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_ushort - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -778,13 +778,13 @@ CORBA_Any::operator>>= (CORBA::UShort &s) const CORBA::Boolean CORBA_Any::operator>>= (CORBA::Long &l) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -810,13 +810,13 @@ CORBA_Any::operator>>= (CORBA::Long &l) const CORBA::Boolean CORBA_Any::operator>>= (CORBA::ULong &l) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_ulong - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -842,13 +842,13 @@ CORBA_Any::operator>>= (CORBA::ULong &l) const CORBA::Boolean CORBA_Any::operator>>= (CORBA::LongLong &l) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_longlong - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -874,13 +874,13 @@ CORBA_Any::operator>>= (CORBA::LongLong &l) const CORBA::Boolean CORBA_Any::operator>>= (CORBA::ULongLong &l) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_ulonglong - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result) @@ -915,13 +915,13 @@ CORBA_Any::operator>>= (CORBA::ULongLong &l) const CORBA::Boolean CORBA_Any::operator>>= (CORBA::Float &f) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_float - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -947,13 +947,13 @@ CORBA_Any::operator>>= (CORBA::Float &f) const CORBA::Boolean CORBA_Any::operator>>= (CORBA::Double &d) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_double - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -979,13 +979,13 @@ CORBA_Any::operator>>= (CORBA::Double &d) const CORBA::Boolean CORBA_Any::operator>>= (CORBA::LongDouble &ld) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_longdouble - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1011,13 +1011,13 @@ CORBA_Any::operator>>= (CORBA::LongDouble &ld) const CORBA::Boolean CORBA_Any::operator>>= (CORBA::Any &a) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1045,14 +1045,14 @@ CORBA_Any::operator>>= (CORBA::Any &a) const CORBA::Boolean CORBA_Any::operator>>= (const CORBA::Any *&a) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { a = 0; CORBA::Boolean equivalent = this->type_->equivalent (CORBA::_tc_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!equivalent) @@ -1105,7 +1105,7 @@ CORBA_Any::operator>>= (const CORBA::Any *&a) const CORBA::Boolean CORBA_Any::operator>>= (const char *&s) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -1113,7 +1113,7 @@ CORBA_Any::operator>>= (const char *&s) const CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_string - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1172,7 +1172,7 @@ CORBA::Any::_tao_any_wstring_destructor (void *x) CORBA::Boolean CORBA_Any::operator>>= (const CORBA::WChar *&s) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -1180,7 +1180,7 @@ CORBA_Any::operator>>= (const CORBA::WChar *&s) const CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_wstring - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1232,13 +1232,13 @@ CORBA::Any::_tao_any_tc_destructor (void *x) CORBA::Boolean CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_TypeCode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1285,13 +1285,13 @@ CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const CORBA::Boolean CORBA_Any::operator>>= (to_boolean b) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_boolean - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1317,13 +1317,13 @@ CORBA_Any::operator>>= (to_boolean b) const CORBA::Boolean CORBA_Any::operator>>= (to_octet o) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_octet - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1349,13 +1349,13 @@ CORBA_Any::operator>>= (to_octet o) const CORBA::Boolean CORBA_Any::operator>>= (to_char c) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_char - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1381,13 +1381,13 @@ CORBA_Any::operator>>= (to_char c) const CORBA::Boolean CORBA_Any::operator>>= (to_wchar wc) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean result = this->type_->equivalent (CORBA::_tc_wchar - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1413,12 +1413,12 @@ CORBA_Any::operator>>= (to_wchar wc) const CORBA::Boolean CORBA_Any::operator>>= (to_string s) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ULong kind = - this->type_->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var tcvar = @@ -1426,10 +1426,10 @@ CORBA_Any::operator>>= (to_string s) const while (kind == CORBA::tk_alias) { - tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1438,7 +1438,7 @@ CORBA_Any::operator>>= (to_string s) const return 0; } - CORBA::ULong bound = tcvar->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = tcvar->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (s.bound_ != bound) @@ -1483,12 +1483,12 @@ CORBA_Any::operator>>= (to_string s) const CORBA::Boolean CORBA_Any::operator>>= (to_wstring ws) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ULong kind = - this->type_->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var tcvar = @@ -1496,10 +1496,10 @@ CORBA_Any::operator>>= (to_wstring ws) const while (kind == CORBA::tk_alias) { - tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1508,7 +1508,7 @@ CORBA_Any::operator>>= (to_wstring ws) const return 0; } - CORBA::ULong bound = tcvar->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = tcvar->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ws.bound_ != bound) @@ -1553,12 +1553,12 @@ CORBA_Any::operator>>= (to_wstring ws) const CORBA::Boolean CORBA_Any::operator>>= (to_object obj) const { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ULong kind = - this->type_->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var tcvar = @@ -1566,10 +1566,10 @@ CORBA_Any::operator>>= (to_object obj) const while (kind == CORBA::tk_alias) { - tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1664,7 +1664,7 @@ operator<< (TAO_OutputCDR& cdr, TAO_Marshal_Object::perform_append (tc.in (), &input, &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA_Exception, ex) @@ -1698,7 +1698,7 @@ operator>> (TAO_InputCDR &cdr, // Skip over the next aregument. CORBA::TypeCode::traverse_status status = - TAO_Marshal_Object::perform_skip (tc.in (), &cdr TAO_ENV_ARG_PARAMETER); + TAO_Marshal_Object::perform_skip (tc.in (), &cdr ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h index 3d61cb26f42..5f745914290 100644 --- a/TAO/tao/Any.h +++ b/TAO/tao/Any.h @@ -283,7 +283,7 @@ public: /// For use along with <<= of a value of aliased type when the alias must /// be preserved. void type (CORBA::TypeCode_ptr type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Returns 0 if the Any has not been assigned a value, following the @@ -334,11 +334,11 @@ public: /// Encode the contents of the Any into <cdr> void _tao_encode (TAO_OutputCDR &cdr, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Decode the <cdr> using the typecode in the Any object. void _tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 typedef CORBA_Any_ptr _ptr_type; diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp index 13b2c65c7bc..86c77c2bb38 100644 --- a/TAO/tao/Asynch_Invocation.cpp +++ b/TAO/tao/Asynch_Invocation.cpp @@ -55,19 +55,19 @@ TAO_GIOP_Asynch_Invocation::TAO_GIOP_Asynch_Invocation (void) } int -TAO_GIOP_Asynch_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_Asynch_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START); - return this->invoke_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->invoke_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_GIOP_Asynch_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_Asynch_Invocation::start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER); + this->TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->target_spec_.target_specifier (this->profile_->object_key ()); @@ -78,7 +78,7 @@ TAO_GIOP_Asynch_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) int -TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { int retval = 0; @@ -126,7 +126,7 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL) // Just send the request, without trying to wait for the reply. retval = TAO_GIOP_Invocation::invoke (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (retval); if (retval != TAO_INVOKE_OK) diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h index f924ff1d28a..540b27ed5ba 100644 --- a/TAO/tao/Asynch_Invocation.h +++ b/TAO/tao/Asynch_Invocation.h @@ -55,18 +55,18 @@ public: int byte_order = TAO_ENCAP_BYTE_ORDER); /// Send request, without blocking until any reply comes back. - virtual int invoke (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual int invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Establishes a connection to the remote server, initializes /// headers etc. - void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: /// Must be overridden. - virtual int invoke_i (TAO_ENV_SINGLE_ARG_DECL) + virtual int invoke_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; /// Reply dispatcher for the current asynchronous invocation. @@ -104,7 +104,7 @@ protected: /// Implementation of the invoke() methods, handles the basic /// send/reply code and the system exceptions. - virtual int invoke_i (TAO_ENV_SINGLE_ARG_DECL) + virtual int invoke_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Asynch_Reply_Dispatcher.cpp index a0401b63755..9c977ab9a2d 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Asynch_Reply_Dispatcher.cpp @@ -166,7 +166,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply ( reply_handler_skel_ (this->reply_cdr_, this->reply_handler_.in (), reply_error - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -201,7 +201,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) TAO_OutputCDR out_cdr; - comm_failure._tao_encode (out_cdr TAO_ENV_ARG_PARAMETER); + comm_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -213,7 +213,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) this->reply_handler_skel_ (cdr, this->reply_handler_.in (), TAO_AMI_REPLY_SYSTEM_EXCEPTION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -247,7 +247,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) TAO_OutputCDR out_cdr; - timeout_failure._tao_encode (out_cdr TAO_ENV_ARG_PARAMETER); + timeout_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Turn into an output CDR @@ -258,7 +258,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) this->reply_handler_skel_ (cdr, this->reply_handler_.in (), TAO_AMI_REPLY_SYSTEM_EXCEPTION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h index 2e07b15cd30..b36ec7baac9 100644 --- a/TAO/tao/BiDir_Adapter.h +++ b/TAO/tao/BiDir_Adapter.h @@ -43,7 +43,7 @@ public: virtual int activate (CORBA::ORB_ptr, int argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual void load_policy_validators (TAO_Policy_Validator &validator) diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index 34d26bcce19..66639efcef2 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -23,7 +23,7 @@ int TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb, int, char *[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_DEF_GIOP_MINOR >= 2) @@ -45,7 +45,7 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb, bidir_orb_initializer = tmp_orb_initializer; PortableInterceptor::register_orb_initializer (bidir_orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); TAO_ORB_Core *orb_core = diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index 216b91c4bf7..9b0400d70a8 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -47,7 +47,7 @@ public: virtual int activate (CORBA::ORB_ptr, int argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void load_policy_validators (TAO_Policy_Validator &validator) diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp index c5f5bace974..027209d88b8 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp @@ -195,10 +195,10 @@ BiDirPolicy::BidirectionalPolicy_var::tao_nil (void) ::BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::BiDirPolicy::BidirectionalPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -280,15 +280,15 @@ BiDirPolicy::BidirectionalPolicy::~BidirectionalPolicy (void) BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return BidirectionalPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return BidirectionalPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h index 6c5944e6118..09a3f992801 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h @@ -109,7 +109,7 @@ TAO_NAMESPACE BiDirPolicy static BidirectionalPolicy_ptr tao_duplicate (BidirectionalPolicy_ptr); static void tao_release (BidirectionalPolicy_ptr); static BidirectionalPolicy_ptr tao_nil (void); - static BidirectionalPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static BidirectionalPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -164,11 +164,11 @@ class TAO_BiDirGIOP_Export BidirectionalPolicy: public virtual CORBA::Policy static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj); static BidirectionalPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static BidirectionalPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static BidirectionalPolicy_ptr _nil (void) { @@ -176,7 +176,7 @@ class TAO_BiDirGIOP_Export BidirectionalPolicy: public virtual CORBA::Policy } virtual BiDirPolicy::BidirectionalPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i index 9eb9335f312..16eb07b83f2 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i @@ -50,10 +50,10 @@ tao_BiDirPolicy_BidirectionalPolicy_nil ( ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr tao_BiDirPolicy_BidirectionalPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return BiDirPolicy::BidirectionalPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp index f014bc48b0a..de20f8d62f4 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp @@ -13,18 +13,18 @@ TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core) void TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Policy_var policy = policies.get_cached_policy (TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP); BiDirPolicy::BidirectionalPolicy_var srp = BiDirPolicy::BidirectionalPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; BiDirPolicy::BidirectionalPolicyValue val = - srp->value (TAO_ENV_SINGLE_ARG_PARAMETER); + srp->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Set the flag in the ORB_Core @@ -34,7 +34,7 @@ TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies void TAO_BiDirPolicy_Validator::merge_policies_impl (TAO_Policy_Set & /*policies*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return ; } diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h index 74835e15dac..a70b876a829 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h @@ -41,10 +41,10 @@ public: TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core); virtual void validate_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void merge_policies_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type); diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp index e80e938dd88..6c62e7b8c6b 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp @@ -14,7 +14,7 @@ ACE_RCSID (BiDir_GIOP, BiDir_ORBInitializer, "$Id$") void TAO_BiDir_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ -23,18 +23,18 @@ TAO_BiDir_ORBInitializer::pre_init ( void TAO_BiDir_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_BiDir_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { /// Register the BiDir policy factories. PortableInterceptor::PolicyFactory_ptr temp_factory = @@ -62,7 +62,7 @@ TAO_BiDir_ORBInitializer::register_policy_factories ( type = BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h index 97f380ce266..bddb6879859 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h @@ -42,11 +42,11 @@ class TAO_BiDirGIOP_Export TAO_BiDir_ORBInitializer : public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -54,7 +54,7 @@ private: ///< Register Messaging policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp index c50d6828e66..d216a1f2398 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp @@ -15,7 +15,7 @@ CORBA::Policy_ptr TAO_BiDir_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h index 209adf0a954..83af5766780 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h @@ -42,7 +42,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 aaf7015a77a..a263b0920b5 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -28,7 +28,7 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy CORBA::PolicyType -TAO_BidirectionalPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how this minimizes the @@ -48,7 +48,7 @@ TAO_BidirectionalPolicy::clone (void) const } CORBA::Policy_ptr -TAO_BidirectionalPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_BidirectionalPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is @@ -64,7 +64,7 @@ TAO_BidirectionalPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_BidirectionalPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_BidirectionalPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -72,7 +72,7 @@ TAO_BidirectionalPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) BiDirPolicy::BidirectionalPolicyValue TAO_BidirectionalPolicy::value ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 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 97462104694..f0525ea7fab 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -63,19 +63,19 @@ public: /// = The BiDir::BidirectionalPolicy methods virtual BiDirPolicy::BidirectionalPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index b4f95769ba0..2867ef3270d 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -64,7 +64,7 @@ void CORBA_Bounds::_raise () } void CORBA_Bounds::_tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (cdr << *this) return; @@ -72,7 +72,7 @@ void CORBA_Bounds::_tao_encode (TAO_OutputCDR &cdr } void CORBA_Bounds::_tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (cdr >> *this) return; @@ -123,7 +123,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Bounds *&_tao_ele ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equal (CORBA::_tc_Bounds TAO_ENV_ARG_PARAMETER)) return 0; // not equal + if (!type->equal (CORBA::_tc_Bounds ACE_ENV_ARG_PARAMETER)) return 0; // not equal ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h index ee1e47f53a3..a0d1db7bd70 100644 --- a/TAO/tao/BoundsC.h +++ b/TAO/tao/BoundsC.h @@ -54,8 +54,8 @@ virtual void _raise (void); virtual void _tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED) const; - virtual void _tao_decode (TAO_InputCDR &cdr TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED) const; + virtual void _tao_decode (TAO_InputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED); static CORBA_Bounds *_downcast (CORBA::Exception *); static void _tao_any_destructor (void*); diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index f659a1cbbe8..25d3cc8d152 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -24,7 +24,7 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff } CORBA::PolicyType -TAO_Buffering_Constraint_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Buffering_Constraint_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE; @@ -32,7 +32,7 @@ TAO_Buffering_Constraint_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO::BufferingConstraint *buffering_constraint; if ((val >>= buffering_constraint) == 0) @@ -59,14 +59,14 @@ TAO_Buffering_Constraint_Policy::clone (void) const } TAO::BufferingConstraint -TAO_Buffering_Constraint_Policy::buffering_constraint (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Buffering_Constraint_Policy::buffering_constraint (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->buffering_constraint_; } CORBA::Policy_ptr -TAO_Buffering_Constraint_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Buffering_Constraint_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Buffering_Constraint_Policy* servant = 0; @@ -79,7 +79,7 @@ TAO_Buffering_Constraint_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Buffering_Constraint_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Buffering_Constraint_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h index 08a9b59bc26..4817fd448ee 100644 --- a/TAO/tao/Buffering_Constraint_Policy.h +++ b/TAO/tao/Buffering_Constraint_Policy.h @@ -53,24 +53,24 @@ public: /// Helper method for the implementation of CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Returns a copy of <this>. virtual TAO_Buffering_Constraint_Policy *clone (void) const; // = The TAO::Buffering_Constraint_Policy methods - virtual TAO::BufferingConstraint buffering_constraint (TAO_ENV_SINGLE_ARG_DECL) + virtual TAO::BufferingConstraint buffering_constraint (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void get_buffering_constraint (TAO::BufferingConstraint &) const; - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp index 760922e4928..dd8fbd217e3 100644 --- a/TAO/tao/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CDR_Encaps_Codec.cpp @@ -28,12 +28,12 @@ TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void) CORBA::OctetSeq * TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::InvalidTypeForEncoding)) { this->check_type_for_encoding (data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // ---------------------------------------------------------------- @@ -75,7 +75,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data CORBA::Any * TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::FormatMismatch)) { @@ -117,12 +117,12 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data CORBA::OctetSeq * TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::InvalidTypeForEncoding)) { this->check_type_for_encoding (data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // ---------------------------------------------------------------- @@ -138,7 +138,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data TAO_Marshal_Object::perform_append (tc.in (), &input, &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // TAO extension: replace the contents of the octet sequence with @@ -177,7 +177,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::FormatMismatch, IOP::Codec::TypeMismatch)) @@ -215,7 +215,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, // Skip over the next argument. CORBA::TypeCode::traverse_status status = - TAO_Marshal_Object::perform_skip (tc, &cdr TAO_ENV_ARG_PARAMETER); + TAO_Marshal_Object::perform_skip (tc, &cdr ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ Should we throw a // IOP::Codec::TypeMismatch exception // here if this fails? @@ -280,7 +280,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, void TAO_CDR_Encaps_Codec::check_type_for_encoding ( const CORBA::Any & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ TODO: Are there any other conditions we need to check? diff --git a/TAO/tao/CDR_Encaps_Codec.h b/TAO/tao/CDR_Encaps_Codec.h index 71ba100bce8..76d4c11c051 100644 --- a/TAO/tao/CDR_Encaps_Codec.h +++ b/TAO/tao/CDR_Encaps_Codec.h @@ -62,21 +62,21 @@ public: /// Encode the given data, including the TypeCode, into an octet /// sequence. virtual CORBA::OctetSeq * encode (const CORBA::Any & data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::InvalidTypeForEncoding)); @@ -84,7 +84,7 @@ public: /// TypeCode, and place it into an Any. virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, IOP::Codec::FormatMismatch, IOP::Codec::TypeMismatch)); @@ -106,7 +106,7 @@ protected: * Codec. */ void check_type_for_encoding (const CORBA::Any & data - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index 4852a839128..e4b780a43ff 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -321,7 +321,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetCompo CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = type->equivalent (CONV_FRAME::_tc_CodeSetComponent - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -376,7 +376,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSe CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = type->equivalent (CONV_FRAME::_tc_CodeSetComponent - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -456,7 +456,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetCompo CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -511,7 +511,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSe CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -590,7 +590,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetConte { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (CONV_FRAME::_tc_CodeSetContext TAO_ENV_ARG_PARAMETER); + type->equivalent (CONV_FRAME::_tc_CodeSetContext ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -644,7 +644,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSe { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (CONV_FRAME::_tc_CodeSetContext TAO_ENV_ARG_PARAMETER); + type->equivalent (CONV_FRAME::_tc_CodeSetContext ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index fea85958f2b..1a0092b2f35 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -37,7 +37,7 @@ void TAO_CORBALOC_Parser::parse_string_count_helper (const char * s, CORBA::ULong &addr_list_length, CORBA::ULong &addr_count - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { char object_key_delimiter = '/'; @@ -85,7 +85,7 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr, &addr_list_length, CORBA::ORB_ptr orb, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var end_point; @@ -203,7 +203,7 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr, this->parse_string_mprofile_helper (end_point.in (), orb, mprofile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -214,7 +214,7 @@ TAO_CORBALOC_Parser::parse_string_assign_helper ( ACE_CString &cloc_name, CORBA::ORB_ptr orb, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { char *cloc_name_ptr = 0; @@ -235,7 +235,7 @@ TAO_CORBALOC_Parser::parse_string_assign_helper ( addr_list_length, orb, mprofile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Get the next token. @@ -251,7 +251,7 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper ( const char * end_point, CORBA::ORB_ptr orb, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_MProfile jth_mprofile; @@ -260,7 +260,7 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper ( orb->orb_core ()->connector_registry ()->make_mprofile ( end_point, jth_mprofile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (retv != 0) @@ -287,13 +287,13 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper ( CORBA::Object_ptr TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL) + 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); TAO_Stub_Auto_Ptr safe_data (data); @@ -317,7 +317,7 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb, CORBA::Object_ptr TAO_CORBALOC_Parser::parse_string_rir_helper (const char *& corbaloc_name, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -335,7 +335,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char *& corbaloc_name, CORBA::Object_var rir_obj = orb->resolve_initial_references (key_string - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return rir_obj._retn (); @@ -343,7 +343,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char *& corbaloc_name, int TAO_CORBALOC_Parser::check_prefix (const char *end_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -403,7 +403,7 @@ TAO_CORBALOC_Parser::check_prefix (const char *end_point CORBA::Object_ptr TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { /// MProfile which consists of the profiles for each endpoint. @@ -424,7 +424,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, // If the protocol is not "rir:" and also is a valid protocol int check_prefix_result = this->check_prefix (corbaloc_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (check_prefix_result != 0) @@ -434,7 +434,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, this->parse_string_count_helper (corbaloc_name, addr_list_length, count_addr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Convert corbaloc_name to an ACE_CString @@ -458,14 +458,14 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, cloc_name, orb, mprofile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Create the stub for the mprofile and get the object reference // to it which is to be returned to the client application. object = this->make_stub_from_mprofile (orb, mprofile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } else @@ -473,7 +473,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, // RIR case: object = this->parse_string_rir_helper (corbaloc_name, orb - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } return object; diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index fe45acd9e67..91509409996 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -52,14 +52,14 @@ public: /// Parse the ior-string that is passed. virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: /// Checks the prefix to see if it is RIR. virtual int check_prefix (const char *endpoint - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Helps count the length of the <obj_addr_list> and the number of @@ -67,7 +67,7 @@ private: virtual void parse_string_count_helper (const char * corbaloc_name, CORBA::ULong &addr_list_length, CORBA::ULong &count_addr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -79,7 +79,7 @@ private: virtual void parse_string_mprofile_helper (const char * end_point, CORBA::ORB_ptr orb, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -90,14 +90,14 @@ private: virtual CORBA::Object_ptr make_stub_from_mprofile (CORBA::ORB_ptr orb, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Gets the pointer to the key_string when the protocol used is RIR virtual CORBA::Object_ptr parse_string_rir_helper (const char * &corbaloc_name, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Tokenizes the <obj_addr_list> using "," as the seperator. Assigns @@ -107,7 +107,7 @@ private: ACE_CString &cloc_name, CORBA::ORB_ptr orb, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -121,7 +121,7 @@ private: CORBA::ULong &addr_list_length, CORBA::ORB_ptr orb, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 980eedd38e8..a9cbe0039a8 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -29,7 +29,7 @@ CORBA::Object_ptr TAO_CORBANAME_Parser:: parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, ACE_CString &key_string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr _tao_retval = CORBA::Object::_nil (); @@ -50,14 +50,14 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, for (;;) { - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -73,7 +73,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, int _invoke_status = 0; ACE_TRY { - _invoke_status = _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK (CORBA::Object::_nil ()); } ACE_CATCH (CORBA::UNKNOWN, ex) @@ -126,7 +126,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -178,7 +178,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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if the Object reference is nil. @@ -189,7 +189,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::Boolean is_a = name_context->_is_a ("IDL:omg.org/CosNaming/NamingContextExt:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!is_a) @@ -203,7 +203,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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, ex) diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index 816419ee07b..2806f1bbb8d 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -46,14 +46,14 @@ public: virtual int match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: virtual CORBA::Object_ptr parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, ACE_CString &key_string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/ClientInterceptorAdapter.cpp b/TAO/tao/ClientInterceptorAdapter.cpp index a1ccb98465a..26d77f6fa8b 100644 --- a/TAO/tao/ClientInterceptorAdapter.cpp +++ b/TAO/tao/ClientInterceptorAdapter.cpp @@ -22,7 +22,7 @@ TAO_ClientRequestInterceptor_Adapter:: void TAO_ClientRequestInterceptor_Adapter:: send_request (TAO_ClientRequestInfo_i *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method implements one of the "starting" client side // interception point. @@ -41,7 +41,7 @@ send_request (TAO_ClientRequestInfo_i *ri for (size_t i = 0 ; i < this->len_; ++i) { this->interceptors_[i]->send_request (this->info_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The starting interception point completed successfully. @@ -51,7 +51,7 @@ send_request (TAO_ClientRequestInfo_i *ri } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - this->process_forward_request (ri, exc TAO_ENV_ARG_PARAMETER); + this->process_forward_request (ri, exc ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -61,7 +61,7 @@ send_request (TAO_ClientRequestInfo_i *ri void TAO_ClientRequestInterceptor_Adapter:: receive_reply (TAO_ClientRequestInfo_i *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -84,7 +84,7 @@ receive_reply (TAO_ClientRequestInfo_i *ri this->interceptors_[this->stack_size_]->receive_reply ( this->info_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -96,7 +96,7 @@ receive_reply (TAO_ClientRequestInfo_i *ri void TAO_ClientRequestInterceptor_Adapter:: receive_exception (TAO_ClientRequestInfo_i *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -121,13 +121,13 @@ receive_exception (TAO_ClientRequestInfo_i *ri this->interceptors_[this->stack_size_]->receive_exception ( this->info_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - this->process_forward_request (ri, exc TAO_ENV_ARG_PARAMETER); + this->process_forward_request (ri, exc ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -144,11 +144,11 @@ receive_exception (TAO_ClientRequestInfo_i *ri ri->exception (&ACE_ANY_EXCEPTION); - this->receive_exception (ri TAO_ENV_ARG_PARAMETER); + this->receive_exception (ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus status = - ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Only re-throw the exception if it hasn't been transformed by @@ -165,7 +165,7 @@ receive_exception (TAO_ClientRequestInfo_i *ri void TAO_ClientRequestInterceptor_Adapter:: receive_other (TAO_ClientRequestInfo_i *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -190,13 +190,13 @@ receive_other (TAO_ClientRequestInfo_i *ri this->interceptors_[this->stack_size_]->receive_other ( this->info_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - this->process_forward_request (ri, exc TAO_ENV_ARG_PARAMETER); + this->process_forward_request (ri, exc ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -207,18 +207,18 @@ void TAO_ClientRequestInterceptor_Adapter::process_forward_request ( TAO_ClientRequestInfo_i *ri, PortableInterceptor::ForwardRequest &exc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ri->forward_reference (exc); this->invoke_status_ = this->invocation_->location_forward (exc.forward.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // receive_other() is potentially invoked recursively. this->receive_other (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/ClientInterceptorAdapter.h b/TAO/tao/ClientInterceptorAdapter.h index 0fa9cb5f8ec..ee58a271dbb 100644 --- a/TAO/tao/ClientInterceptorAdapter.h +++ b/TAO/tao/ClientInterceptorAdapter.h @@ -74,22 +74,22 @@ public: /// This method implements one of the "starting" client side /// interception points. void send_request (TAO_ClientRequestInfo_i *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method implements one of the "ending" client side /// interception point. void receive_reply (TAO_ClientRequestInfo_i *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method implements one of the "ending" client side /// interception point. void receive_exception (TAO_ClientRequestInfo_i *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method implements one of the "ending" client side /// interception point. void receive_other (TAO_ClientRequestInfo_i *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@} protected: @@ -99,7 +99,7 @@ protected: /// to notifying the Invocation object of the LOCATION_FORWARD. void process_forward_request (TAO_ClientRequestInfo_i *ri, PortableInterceptor::ForwardRequest &exc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp index 08dedac5b24..0ea591e59a7 100644 --- a/TAO/tao/ClientRequestInfo.cpp +++ b/TAO/tao/ClientRequestInfo.cpp @@ -19,262 +19,262 @@ TAO_ClientRequestInfo::TAO_ClientRequestInfo (void) } CORBA::Object_ptr -TAO_ClientRequestInfo::target (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::target (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return this->info_->target (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->target (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -TAO_ClientRequestInfo::effective_target (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::effective_target (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return this->info_->effective_target (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->effective_target (ACE_ENV_SINGLE_ARG_PARAMETER); } IOP::TaggedProfile * -TAO_ClientRequestInfo::effective_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->effective_profile (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->effective_profile (ACE_ENV_SINGLE_ARG_PARAMETER); } // Use at own risk. There is no way currently of extracting an // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO_ClientRequestInfo::received_exception (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); } char * TAO_ClientRequestInfo::received_exception_id ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); } IOP::TaggedComponent * TAO_ClientRequestInfo::get_effective_component ( IOP::ComponentId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->info_->get_effective_component (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::TaggedComponentSeq * TAO_ClientRequestInfo::get_effective_components ( IOP::ComponentId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->info_->get_effective_components (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Policy_ptr TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return this->info_->get_request_policy (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ClientRequestInfo::add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->info_->add_request_service_context (service_context, replace - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::ULong -TAO_ClientRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->request_id (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->request_id (ACE_ENV_SINGLE_ARG_PARAMETER); } char * -TAO_ClientRequestInfo::operation (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->operation (ACE_ENV_SINGLE_ARG_PARAMETER); } Dynamic::ParameterList * -TAO_ClientRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); } Dynamic::ExceptionList * -TAO_ClientRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->exceptions (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->exceptions (ACE_ENV_SINGLE_ARG_PARAMETER); } Dynamic::ContextList * -TAO_ClientRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->contexts (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->contexts (ACE_ENV_SINGLE_ARG_PARAMETER); } Dynamic::RequestContext * -TAO_ClientRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->operation_context (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->operation_context (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Any * -TAO_ClientRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->result (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->result (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_ClientRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); } #if TAO_HAS_CORBA_MESSAGING == 1 CORBA::Short -TAO_ClientRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->info_->sync_scope (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->sync_scope (ACE_ENV_SINGLE_ARG_PARAMETER); } #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ PortableInterceptor::ReplyStatus -TAO_ClientRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableInterceptor::SYSTEM_EXCEPTION); - return this->info_->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -TAO_ClientRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return this->info_->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->info_->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Any * TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->info_->get_slot (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ClientRequestInfo::get_request_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->info_->get_request_service_context (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ClientRequestInfo::get_reply_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->info_->get_reply_service_context (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h index dced994f33d..9246498235a 100644 --- a/TAO/tao/ClientRequestInfo.h +++ b/TAO/tao/ClientRequestInfo.h @@ -70,43 +70,43 @@ 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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the operation name for the current request. virtual char * operation ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of arguments passed to the current operation. virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of exceptions the current operation is capable /// of throwing. virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ContextList * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::RequestContext * operation_context ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns true for a two-way operation, and false otherwise. virtual CORBA::Boolean response_expected ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) ; #if TAO_HAS_CORBA_MESSAGING == 1 @@ -114,7 +114,7 @@ public: /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. virtual CORBA::Short sync_scope ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -123,19 +123,19 @@ public: /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT, /// TRANSPORT_RETRY. virtual PortableInterceptor::ReplyStatus reply_status ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// If the reply status is PortableInterceptor::LOCATION_FORWARD or /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the /// object reference to which the request was forwarded. virtual CORBA::Object_ptr forward_reference ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) ; virtual CORBA::Any * get_slot ( PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); @@ -143,30 +143,30 @@ public: /// from the request service context list. virtual IOP::ServiceContext * get_request_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IOP::TaggedProfile * effective_profile ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return an Any containing the received exception, if any. @@ -175,12 +175,12 @@ public: * @note There is no trivial way to extract the exception from an Any. */ virtual CORBA::Any * received_exception ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the repository ID for the received exception. virtual char * received_exception_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the first IOP::TaggedComponent that matches the given @@ -188,7 +188,7 @@ public: /// target. virtual IOP::TaggedComponent * get_effective_component ( IOP::ComponentId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return all IOP::TaggedComponent(s) that match the given @@ -196,14 +196,14 @@ public: /// target. virtual IOP::TaggedComponentSeq * get_effective_components ( IOP::ComponentId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the IOP::ServiceContext to the request (outgoing) @@ -211,7 +211,7 @@ public: virtual void add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the ClientRequestInfo implementation which this class @@ -226,7 +226,7 @@ private: /// Check if this ClientRequestInfo object is called within the /// context of a request. - void check_validity (TAO_ENV_SINGLE_ARG_DECL); + void check_validity (ACE_ENV_SINGLE_ARG_DECL); private: diff --git a/TAO/tao/ClientRequestInfo.inl b/TAO/tao/ClientRequestInfo.inl index a7748316a4b..7c353070b9c 100644 --- a/TAO/tao/ClientRequestInfo.inl +++ b/TAO/tao/ClientRequestInfo.inl @@ -3,7 +3,7 @@ // $Id$ ACE_INLINE void -TAO_ClientRequestInfo::check_validity (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) { if (this->info_ == 0) ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp index 18c7271208c..1786f73a2cf 100644 --- a/TAO/tao/ClientRequestInfo_i.cpp +++ b/TAO/tao/ClientRequestInfo_i.cpp @@ -31,14 +31,14 @@ TAO_ClientRequestInfo_i::~TAO_ClientRequestInfo_i (void) } CORBA::Object_ptr -TAO_ClientRequestInfo_i::target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ClientRequestInfo_i::target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->target_); } CORBA::Object_ptr -TAO_ClientRequestInfo_i::effective_target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ClientRequestInfo_i::effective_target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD) @@ -53,7 +53,7 @@ TAO_ClientRequestInfo_i::effective_target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } IOP::TaggedProfile * -TAO_ClientRequestInfo_i::effective_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::effective_profile (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::TaggedProfile *tagged_profile = 0; @@ -81,7 +81,7 @@ TAO_ClientRequestInfo_i::effective_profile (TAO_ENV_SINGLE_ARG_DECL) // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO_ClientRequestInfo_i::received_exception (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::received_exception (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION @@ -116,7 +116,7 @@ TAO_ClientRequestInfo_i::received_exception (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ClientRequestInfo_i::received_exception_id ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION @@ -133,7 +133,7 @@ TAO_ClientRequestInfo_i::received_exception_id ( IOP::TaggedComponent * TAO_ClientRequestInfo_i::get_effective_component ( IOP::ComponentId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Tagged_Components &ecs = @@ -178,7 +178,7 @@ TAO_ClientRequestInfo_i::get_effective_component ( IOP::TaggedComponentSeq * TAO_ClientRequestInfo_i::get_effective_components ( IOP::ComponentId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Tagged_Components &ecs = @@ -232,14 +232,14 @@ TAO_ClientRequestInfo_i::get_effective_components ( CORBA::Policy_ptr TAO_ClientRequestInfo_i::get_request_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Do we need to look anywhere else for the request policies? #if TAO_HAS_CORBA_MESSAGING == 1 return this->target_->_get_policy (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_UNUSED_ARG (type); @@ -256,7 +256,7 @@ void TAO_ClientRequestInfo_i::add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the service context from the list @@ -271,7 +271,7 @@ TAO_ClientRequestInfo_i::add_request_service_context ( } CORBA::ULong -TAO_ClientRequestInfo_i::request_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::request_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @todo We may have to worry about AMI once we support interceptors @@ -351,14 +351,14 @@ TAO_ClientRequestInfo_i::request_id (TAO_ENV_SINGLE_ARG_DECL) } char * -TAO_ClientRequestInfo_i::operation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ClientRequestInfo_i::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->invocation_->operation ()); } Dynamic::ParameterList * -TAO_ClientRequestInfo_i::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -367,7 +367,7 @@ TAO_ClientRequestInfo_i::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ClientRequestInfo_i::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -376,7 +376,7 @@ TAO_ClientRequestInfo_i::exceptions (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ContextList * -TAO_ClientRequestInfo_i::contexts (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::contexts (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -385,7 +385,7 @@ TAO_ClientRequestInfo_i::contexts (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::RequestContext * -TAO_ClientRequestInfo_i::operation_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::operation_context (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -394,7 +394,7 @@ TAO_ClientRequestInfo_i::operation_context (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Any * -TAO_ClientRequestInfo_i::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -403,7 +403,7 @@ TAO_ClientRequestInfo_i::result (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Boolean -TAO_ClientRequestInfo_i::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ClientRequestInfo_i::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->response_expected_; @@ -411,7 +411,7 @@ TAO_ClientRequestInfo_i::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) # if TAO_HAS_CORBA_MESSAGING == 1 CORBA::Short -TAO_ClientRequestInfo_i::sync_scope (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::sync_scope (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_GIOP_Oneway_Invocation *inv = @@ -434,7 +434,7 @@ TAO_ClientRequestInfo_i::sync_scope (TAO_ENV_SINGLE_ARG_DECL) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ PortableInterceptor::ReplyStatus -TAO_ClientRequestInfo_i::reply_status (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::reply_status (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ == -1) @@ -447,7 +447,7 @@ TAO_ClientRequestInfo_i::reply_status (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Object_ptr -TAO_ClientRequestInfo_i::forward_reference (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_i::forward_reference (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD) @@ -463,7 +463,7 @@ TAO_ClientRequestInfo_i::forward_reference (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * TAO_ClientRequestInfo_i::get_slot (PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -486,13 +486,13 @@ TAO_ClientRequestInfo_i::get_slot (PortableInterceptor::SlotId id // side. No copying is necessary. return pi_current->get_slot (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ClientRequestInfo_i::get_request_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the service context from the list @@ -501,14 +501,14 @@ TAO_ClientRequestInfo_i::get_request_service_context ( return this->get_service_context_i (service_context_list, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ClientRequestInfo_i::get_reply_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the service context from the list @@ -517,14 +517,14 @@ TAO_ClientRequestInfo_i::get_reply_service_context ( return this->get_service_context_i (service_context_list, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ClientRequestInfo_i::get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create a new service context to be returned. Assume diff --git a/TAO/tao/ClientRequestInfo_i.h b/TAO/tao/ClientRequestInfo_i.h index b1488d2f0f9..43245ee3431 100644 --- a/TAO/tao/ClientRequestInfo_i.h +++ b/TAO/tao/ClientRequestInfo_i.h @@ -53,46 +53,46 @@ public: /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. CORBA::ULong request_id ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the operation name for the current request. char * operation ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of arguments passed to the current operation. - virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL) + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of exceptions the current operation is capable /// of throwing. - virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL) + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); Dynamic::ContextList * contexts ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); Dynamic::RequestContext * operation_context ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns true for a two-way operation, and false otherwise. - CORBA::Boolean response_expected (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Boolean response_expected (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) ; #if TAO_HAS_CORBA_MESSAGING == 1 /// 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. - CORBA::Short sync_scope (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Short sync_scope (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -101,19 +101,19 @@ public: /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT, /// TRANSPORT_RETRY. PortableInterceptor::ReplyStatus reply_status ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// If the reply status is PortableInterceptor::LOCATION_FORWARD or /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the /// object reference to which the request was forwarded. CORBA::Object_ptr forward_reference ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) ; CORBA::Any * get_slot ( PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); @@ -121,30 +121,30 @@ public: /// from the request service context list. IOP::ServiceContext * get_request_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the IOP::ServiceContext with the given IOP::ServiceId /// from the reply service context list. IOP::ServiceContext * get_reply_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the (initial, non-forwarded, or permanently forwarded) /// object reference of the target. CORBA::Object_ptr target ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the object reference for the current target. The target /// may change in the even of a location forward. CORBA::Object_ptr effective_target ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); IOP::TaggedProfile * effective_profile ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return an Any containing the received exception, if any. @@ -153,12 +153,12 @@ public: * @note There is no trivial way to extract the exception from an Any. */ CORBA::Any * received_exception ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the repository ID for the received exception. char * received_exception_id ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the first IOP::TaggedComponent that matches the given @@ -166,7 +166,7 @@ public: /// target. IOP::TaggedComponent * get_effective_component ( IOP::ComponentId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return all IOP::TaggedComponent(s) that match the given @@ -174,14 +174,14 @@ public: /// target. IOP::TaggedComponentSeq * get_effective_components ( IOP::ComponentId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the policy of the given type in effect for the current /// request. CORBA::Policy_ptr get_request_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the IOP::ServiceContext to the request (outgoing) @@ -189,7 +189,7 @@ public: void add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -223,7 +223,7 @@ protected: IOP::ServiceContext *get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp index 29e51369bf3..b1362059ef5 100644 --- a/TAO/tao/CodecFactory.cpp +++ b/TAO/tao/CodecFactory.cpp @@ -15,7 +15,7 @@ TAO_CodecFactory::TAO_CodecFactory (void) IOP::Codec_ptr TAO_CodecFactory::create_codec (const IOP::Encoding & enc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)) { diff --git a/TAO/tao/CodecFactory.h b/TAO/tao/CodecFactory.h index bd2b28fc4cb..fd3801ebce6 100644 --- a/TAO/tao/CodecFactory.h +++ b/TAO/tao/CodecFactory.h @@ -53,7 +53,7 @@ public: /// Create a Coder/Decoder for the given type of encoding. virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)); diff --git a/TAO/tao/CodecFactory_ORBInitializer.cpp b/TAO/tao/CodecFactory_ORBInitializer.cpp index fe134990c9e..bf2634b218d 100644 --- a/TAO/tao/CodecFactory_ORBInitializer.cpp +++ b/TAO/tao/CodecFactory_ORBInitializer.cpp @@ -12,7 +12,7 @@ ACE_RCSID (TAO_CodecFactory, void TAO_CodecFactory_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // The CodecFactory is stateless and reentrant, so share a single @@ -34,14 +34,14 @@ TAO_CodecFactory_ORBInitializer::pre_init ( info->register_initial_reference ("CodecFactory", this->codec_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CodecFactory_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/CodecFactory_ORBInitializer.h b/TAO/tao/CodecFactory_ORBInitializer.h index ac074a0a392..de6bd2e0d39 100644 --- a/TAO/tao/CodecFactory_ORBInitializer.h +++ b/TAO/tao/CodecFactory_ORBInitializer.h @@ -51,11 +51,11 @@ class TAO_Export TAO_CodecFactory_ORBInitializer public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h index b17b58fd185..4a048eac6b8 100644 --- a/TAO/tao/Collocation_Resolver.h +++ b/TAO/tao/Collocation_Resolver.h @@ -39,7 +39,7 @@ public: /// Is <object> collocated? virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object - TAO_ENV_ARG_DECL) const = 0; + ACE_ENV_ARG_DECL) const = 0; }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 62fb33b84ff..c4d5496b556 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -266,7 +266,7 @@ TAO_Connector_Registry::preprocess_preconnects (TAO_ORB_Core *orb_core, int TAO_Connector_Registry::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Endpoint *endpoint = desc->endpoint (); if (endpoint == 0) @@ -281,13 +281,13 @@ TAO_Connector_Registry::connect (TAO_GIOP_Invocation *invocation, return connector->connect (invocation, desc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int TAO_Connector_Registry::make_mprofile (const char *ior, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!ior) // Failure: Null IOR string pointer @@ -309,7 +309,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior, { int mp_result = (*connector)->make_mprofile (ior, mprofile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (mp_result); diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 28710b174be..74e961db243 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -84,13 +84,13 @@ public: */ int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Parse a string containing a URL style IOR and return an /// MProfile. int make_mprofile (const char *ior, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Create a profile based on the contents of <cdr> TAO_Profile* create_profile (TAO_InputCDR& cdr); diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index a59e33592bc..80e915709ed 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -59,10 +59,10 @@ tao_CORBA_Current_nil ( CORBA_Current_ptr tao_CORBA_Current_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -184,10 +184,10 @@ CORBA_Current_var::tao_nil (void) ::CORBA_Current_ptr CORBA_Current_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -268,15 +268,15 @@ CORBA_Current::CORBA_Current (void) CORBA_Current_ptr CORBA_Current::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_Current_ptr CORBA_Current::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index 7ddc4f055e2..be2ac03a544 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -95,7 +95,7 @@ public: static CORBA_Current_ptr tao_nil (void); static CORBA_Current_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -153,12 +153,12 @@ public: static CORBA_Current_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Current_ptr _nil (void) diff --git a/TAO/tao/DLL_ORB.cpp b/TAO/tao/DLL_ORB.cpp index 4c95981bc45..62ed79c9018 100644 --- a/TAO/tao/DLL_ORB.cpp +++ b/TAO/tao/DLL_ORB.cpp @@ -61,7 +61,7 @@ TAO_DLL_ORB::init (int /*argc*/, ACE_TCHAR *argv[]) this->orb_ = CORBA::ORB_init (new_argc, new_argv.argv (), "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->orb_.in ())) @@ -91,7 +91,7 @@ TAO_DLL_ORB::fini (void) { ACE_TRY_NEW_ENV { - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_Singleton_Manager::instance ()->fini () == -1) @@ -115,7 +115,7 @@ TAO_DLL_ORB::svc (void) ACE_TRY_NEW_ENV { // Run the ORB event loop in its own thread. - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index 231cc09084c..3dd8d974f3d 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -30,7 +30,7 @@ TAO_DLL_Parser::match_prefix (const char *ior_string) const CORBA::Object_ptr TAO_DLL_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Skip the prefix, we know it is there because this method in only @@ -52,7 +52,7 @@ TAO_DLL_Parser::parse_string (const char *ior, CORBA::Object::_nil ()); } - return loader->create_object (orb, 0, 0 TAO_ENV_ARG_PARAMETER); + return loader->create_object (orb, 0, 0 ACE_ENV_ARG_PARAMETER); } ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser, diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h index 188528c222b..8858a364797 100644 --- a/TAO/tao/DLL_Parser.h +++ b/TAO/tao/DLL_Parser.h @@ -84,7 +84,7 @@ public: virtual int match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp index ef9c8569db2..fef0836a43e 100644 --- a/TAO/tao/Default_Collocation_Resolver.cpp +++ b/TAO/tao/Default_Collocation_Resolver.cpp @@ -12,7 +12,7 @@ ACE_RCSID(tao, Default_Collocation_Resolver, "$Id$") CORBA::Boolean TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_ENV_ARG_DECL_NOT_USED) const { return object->_is_collocated (); } diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h index 8b35dfbf21e..c38d2be6ab6 100644 --- a/TAO/tao/Default_Collocation_Resolver.h +++ b/TAO/tao/Default_Collocation_Resolver.h @@ -37,7 +37,7 @@ public: /// Is <object> collocated? virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver) diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp index a4a9967d201..784d1ae2aff 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp @@ -20,7 +20,7 @@ TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (v TAO_Invocation_Endpoint_Selector * TAO_Default_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // 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 2f878a7660f..d6b639a3472 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.h +++ b/TAO/tao/Default_Endpoint_Selector_Factory.h @@ -61,7 +61,7 @@ public: /// initialize the endpoint selection state instance. virtual TAO_Invocation_Endpoint_Selector *get_selector ( TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// The possible endpoint selector strategies that can be diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp index cf6bb5600b8..2abb615e29a 100644 --- a/TAO/tao/Default_Protocols_Hooks.cpp +++ b/TAO/tao/Default_Protocols_Hooks.cpp @@ -19,7 +19,7 @@ TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void) void TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -45,7 +45,7 @@ void TAO_Default_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &, CORBA::Policy *, CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -67,14 +67,14 @@ TAO_Default_Protocols_Hooks::get_selector_bands_policy_hook (CORBA::Policy *, int TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } int TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } @@ -82,34 +82,34 @@ 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 & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } int TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } int TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } int -TAO_Default_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Default_Protocols_Hooks::set_default_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } int TAO_Default_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } @@ -118,7 +118,7 @@ void TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *, TAO_Service_Context &, CORBA::Boolean - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h index 86f06e61585..178777669e5 100644 --- a/TAO/tao/Default_Protocols_Hooks.h +++ b/TAO/tao/Default_Protocols_Hooks.h @@ -30,7 +30,7 @@ public: virtual ~TAO_Default_Protocols_Hooks (void); virtual void init_hooks (TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int call_client_protocols_hook (int &send_buffer_size, int &recv_buffer_size, @@ -45,12 +45,12 @@ public: virtual void rt_service_context (TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean restart - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void add_rt_service_context_hook (TAO_Service_Context &service_context, CORBA::Policy *model_policy, CORBA::Short &client_priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean @@ -64,25 +64,25 @@ public: int &in_range); virtual int get_thread_CORBA_priority (CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual int get_thread_native_priority (CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual int get_thread_CORBA_and_native_priority (CORBA::Short &, CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual int set_thread_CORBA_priority (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual int set_thread_native_priority (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); - virtual int set_default_policies (TAO_ENV_SINGLE_ARG_DECL); + virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL); virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index 369ef406ade..21f5988080b 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -13,7 +13,7 @@ TAO_Stub * TAO_Default_Stub_Factory::create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Stub *retval = 0; diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h index ddad28d8717..4e706a64972 100644 --- a/TAO/tao/Default_Stub_Factory.h +++ b/TAO/tao/Default_Stub_Factory.h @@ -46,7 +46,7 @@ public: virtual TAO_Stub *create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Stub_Factory) diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp index 1c7052e675c..f0aa17c40dc 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp @@ -29,11 +29,11 @@ TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Ma } int -TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (TAO_ENV_SINGLE_ARG_DECL) +TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL) { int result = this->lane_resources_->open_acceptor_registry (0 - TAO_ENV_ARG_PARAMETER); + 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 6d6465e56db..8bc2a47f299 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h @@ -44,7 +44,7 @@ public: void finalize (void); /// Open default resources. - int open_default_resources (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int open_default_resources (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown reactor. void shutdown_reactor (void); diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index 3464929b539..9e1d83e7576 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -162,31 +162,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_DomainManager *tao_impl , const CORBA::PolicyType & policy_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Policy_ptr result); @@ -206,7 +206,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_DomainManager *tao_impl, const CORBA::PolicyType & policy_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -214,12 +214,12 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -235,25 +235,25 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -265,7 +265,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (TAO_ENV_SIN char * TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -275,10 +275,10 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived CORBA::Boolean TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -318,17 +318,17 @@ _TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Pro _TAO_CORBA_DomainManager_Proxy_Impl& _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( ::CORBA::DomainManager *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -338,7 +338,7 @@ _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( void _TAO_DomainManager_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -409,7 +409,7 @@ _TAO_DomainManager_ThruPOA_Proxy_Impl::_TAO_DomainManager_ThruPOA_Proxy_Impl (vo CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( CORBA::Object_ptr _collocated_tao_target_, CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -425,7 +425,7 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( _collocated_tao_target_->_object_key (), "get_domain_policy", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -435,7 +435,7 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( ) )->get_domain_policy ( policy_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -463,7 +463,7 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -493,19 +493,19 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( _tao_upcall, _tao_impl, policy_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->get_domain_policy ( policy_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -514,7 +514,7 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -522,12 +522,12 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -554,7 +554,7 @@ void POA_CORBA_DomainManager::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -564,7 +564,7 @@ void POA_CORBA_DomainManager::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -577,11 +577,11 @@ void POA_CORBA_DomainManager::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -594,7 +594,7 @@ void POA_CORBA_DomainManager::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference; @@ -613,7 +613,7 @@ void POA_CORBA_DomainManager::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -640,10 +640,10 @@ void POA_CORBA_DomainManager::_interface_skel ( CORBA::Boolean POA_CORBA_DomainManager::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -665,12 +665,12 @@ void* POA_CORBA_DomainManager::_downcast ( return 0; } -void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } const char* POA_CORBA_DomainManager::_interface_repository_id (void) const @@ -679,9 +679,9 @@ const char* POA_CORBA_DomainManager::_interface_repository_id (void) const } CORBA::DomainManager* -POA_CORBA_DomainManager::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -820,31 +820,31 @@ public: , CORBA::InterfaceDef_ptr object_type, const CORBA::Boolean & constr_policy - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -865,7 +865,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe POA_CORBA_ConstructionPolicy *tao_impl, CORBA::InterfaceDef_ptr object_type, const CORBA::Boolean & constr_policy - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -874,12 +874,12 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -898,25 +898,25 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (T } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -924,7 +924,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_ char * TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -934,10 +934,10 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_ CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -970,17 +970,17 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strat _TAO_CORBA_ConstructionPolicy_Proxy_Impl& _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ConstructionPolicy *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -990,7 +990,7 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( void _TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -1062,7 +1062,7 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( CORBA::Object_ptr _collocated_tao_target_, CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1076,7 +1076,7 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( _collocated_tao_target_->_object_key (), "make_domain_manager", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -1087,7 +1087,7 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( )->make_domain_manager ( object_type, constr_policy - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -1117,7 +1117,7 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1150,12 +1150,12 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( _tao_impl, object_type.in (), constr_policy - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -1163,13 +1163,13 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( _tao_impl->make_domain_manager ( object_type.in (), constr_policy - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1177,12 +1177,12 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1202,7 +1202,7 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1212,7 +1212,7 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1225,11 +1225,11 @@ void POA_CORBA_ConstructionPolicy::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1242,7 +1242,7 @@ void POA_CORBA_ConstructionPolicy::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference; @@ -1261,7 +1261,7 @@ void POA_CORBA_ConstructionPolicy::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1288,10 +1288,10 @@ void POA_CORBA_ConstructionPolicy::_interface_skel ( CORBA::Boolean POA_CORBA_ConstructionPolicy::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -1316,12 +1316,12 @@ void* POA_CORBA_ConstructionPolicy::_downcast ( return 0; } -void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const @@ -1330,9 +1330,9 @@ const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const } CORBA_ConstructionPolicy* -POA_CORBA_ConstructionPolicy::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h index 6ac9df55722..5c039d1da46 100644 --- a/TAO/tao/Domain/DomainS.h +++ b/TAO/tao/Domain/DomainS.h @@ -67,7 +67,7 @@ virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -78,38 +78,38 @@ TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA::DomainManager *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::Policy_ptr get_domain_policy ( CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -119,7 +119,7 @@ TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -139,7 +139,7 @@ virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy ( ::CORBA::DomainManager *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -147,7 +147,7 @@ // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -187,7 +187,7 @@ virtual CORBA::Policy_ptr get_domain_policy ( CORBA::Object_ptr _collocated_tao_target_, CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -219,7 +219,7 @@ virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -230,31 +230,31 @@ TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); CORBA_ConstructionPolicy *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -262,7 +262,7 @@ virtual void make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -272,28 +272,28 @@ TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_policy_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void copy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -313,7 +313,7 @@ virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy ( CORBA_ConstructionPolicy *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -321,7 +321,7 @@ // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -364,7 +364,7 @@ CORBA::Object_ptr _collocated_tao_target_, CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/Domain/DomainS.i b/TAO/tao/Domain/DomainS.i index e02dec11a7e..e3270650796 100644 --- a/TAO/tao/Domain/DomainS.i +++ b/TAO/tao/Domain/DomainS.i @@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_ConstructionPolicy::_get_policy_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; @@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_ConstructionPolicy::_get_policy_type_skel ( req, (POA_CORBA_Policy_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstructionPolicy::copy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; @@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_ConstructionPolicy::copy_skel ( req, (POA_CORBA_Policy_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstructionPolicy::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; @@ -61,6 +61,6 @@ ACE_INLINE void POA_CORBA_ConstructionPolicy::destroy_skel ( req, (POA_CORBA_Policy_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h index 08cacb8d638..438a6e9a4ef 100644 --- a/TAO/tao/Domain/DomainS_T.h +++ b/TAO/tao/Domain/DomainS_T.h @@ -62,11 +62,11 @@ // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Policy_ptr get_domain_policy ( CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -112,33 +112,33 @@ // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); void make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/Domain/DomainS_T.i b/TAO/tao/Domain/DomainS_T.i index a31fb10cbd6..c48f6480cad 100644 --- a/TAO/tao/Domain/DomainS_T.i +++ b/TAO/tao/Domain/DomainS_T.i @@ -90,18 +90,18 @@ 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 (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_DomainManager::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_DomainManager::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy ( CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -109,7 +109,7 @@ CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy ( { return this->ptr_->get_domain_policy ( policy_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -182,19 +182,19 @@ 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 (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ConstructionPolicy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ConstructionPolicy::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ConstructionPolicy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -203,46 +203,46 @@ void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager ( this->ptr_->make_domain_manager ( object_type, constr_policy - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::PolicyType POA_CORBA_ConstructionPolicy_tie<T>::policy_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->policy_type ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Policy_ptr POA_CORBA_ConstructionPolicy_tie<T>::copy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->copy ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ConstructionPolicy_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 9fd320eb250..8adea9e92ab 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -71,10 +71,10 @@ tao_CORBA_DomainManager_nil ( CORBA_DomainManager_ptr tao_CORBA_DomainManager_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_DomainManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -196,10 +196,10 @@ CORBA_DomainManager_var::tao_nil (void) ::CORBA_DomainManager_ptr CORBA_DomainManager_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_DomainManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -278,21 +278,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::PolicyType & policy_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -310,19 +310,19 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestIn TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::PolicyType & policy_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), policy_type_ (policy_type) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -338,12 +338,12 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -351,13 +351,13 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (TAO_ENV CORBA::Any * -TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -390,7 +390,7 @@ _TAO_CORBA_DomainManager_Remote_Proxy_Impl::_TAO_CORBA_DomainManager_Remote_Prox CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ( CORBA::Object_ptr _collocated_tao_target_, CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -434,7 +434,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy &_tao_call, _collocated_tao_target_, policy_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -450,7 +450,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -462,12 +462,12 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -481,7 +481,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -498,7 +498,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -526,7 +526,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -536,12 +536,12 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -552,7 +552,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -607,7 +607,7 @@ _TAO_CORBA_DomainManager_Remote_Proxy_Broker::~_TAO_CORBA_DomainManager_Remote_P _TAO_CORBA_DomainManager_Proxy_Impl& _TAO_CORBA_DomainManager_Remote_Proxy_Broker::select_proxy ( ::CORBA_DomainManager * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -648,24 +648,24 @@ void CORBA_DomainManager::_tao_any_destructor (void *x) CORBA_DomainManager_ptr CORBA_DomainManager::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_DomainManager::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_DomainManager::_nil ()); if (is_a == 0) return CORBA_DomainManager::_nil (); } - return CORBA_DomainManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_DomainManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -734,14 +734,14 @@ CORBA_DomainManager::_duplicate (CORBA_DomainManager_ptr obj) return obj; } -CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type) @@ -767,20 +767,20 @@ const char* CORBA_DomainManager::_interface_repository_id (void) const CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy ( CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_DomainManager_Proxy_Impl &proxy = - this->the_TAO_CORBA_DomainManager_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_DomainManager_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.get_domain_policy ( this, policy_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -849,10 +849,10 @@ tao_CORBA_ConstructionPolicy_nil ( CORBA_ConstructionPolicy_ptr tao_CORBA_ConstructionPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_ConstructionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -974,10 +974,10 @@ CORBA_ConstructionPolicy_var::tao_nil (void) ::CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_ConstructionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1057,21 +1057,21 @@ public: CORBA::Object_ptr _tao_target, CORBA_InterfaceDef_ptr object_type, const CORBA::Boolean & constr_policy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1089,7 +1089,7 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRe CORBA::Object_ptr _tao_target, CORBA_InterfaceDef_ptr object_type, const CORBA::Boolean & constr_policy - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), object_type_ (object_type), @@ -1097,12 +1097,12 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRe {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1129,12 +1129,12 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (T } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1142,13 +1142,13 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions ( CORBA::Any * -TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1172,7 +1172,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( CORBA::Object_ptr _collocated_tao_target_, CORBA_InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1221,7 +1221,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( _collocated_tao_target_, object_type, constr_policy - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -1237,7 +1237,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1249,12 +1249,12 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1268,7 +1268,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1284,7 +1284,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1298,7 +1298,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1308,12 +1308,12 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1324,7 +1324,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1379,7 +1379,7 @@ _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::~_TAO_CORBA_ConstructionPolic _TAO_CORBA_ConstructionPolicy_Proxy_Impl& _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::select_proxy ( ::CORBA_ConstructionPolicy * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -1422,24 +1422,24 @@ void CORBA_ConstructionPolicy::_tao_any_destructor (void *x) CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ConstructionPolicy::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstructionPolicy::_nil ()); if (is_a == 0) return CORBA_ConstructionPolicy::_nil (); } - return CORBA_ConstructionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_ConstructionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1508,7 +1508,7 @@ CORBA_ConstructionPolicy::_duplicate (CORBA_ConstructionPolicy_ptr obj) return obj; } -CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) || @@ -1516,7 +1516,7 @@ CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value TAO_ENV (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type) @@ -1555,21 +1555,21 @@ const char* CORBA_ConstructionPolicy::_interface_repository_id (void) const void CORBA_ConstructionPolicy::make_domain_manager ( CORBA_InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ConstructionPolicy_Proxy_Impl &proxy = - this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.make_domain_manager ( this, object_type, constr_policy - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1681,11 +1681,11 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, target); - *tmp = CORBA_DomainManager::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = CORBA_DomainManager::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1828,7 +1828,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr _tao_elem = CORBA_DomainManager::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManager TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManager ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1889,7 +1889,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy _tao_elem = CORBA_ConstructionPolicy::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (_tc_CORBA_ConstructionPolicy TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (_tc_CORBA_ConstructionPolicy ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1972,7 +1972,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManagerList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManagerList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2041,7 +2041,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_DomainManager::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -2077,7 +2077,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_ConstructionPolicy::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 52f2ee42d37..3638d9e5a59 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -96,7 +96,7 @@ public: static CORBA_DomainManager_ptr tao_nil (void); static CORBA_DomainManager_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -159,11 +159,11 @@ public: static CORBA_DomainManager_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_DomainManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_DomainManager_ptr _nil (void) @@ -175,7 +175,7 @@ public: virtual CORBA::Policy_ptr get_domain_policy ( CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -183,7 +183,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -233,7 +233,7 @@ private: virtual CORBA::Policy_ptr get_domain_policy ( CORBA::Object_ptr _collocated_tao_target_, CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -265,7 +265,7 @@ public: virtual CORBA::Policy_ptr get_domain_policy ( CORBA::Object_ptr _collocated_tao_target_, CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -293,7 +293,7 @@ public: virtual ~_TAO_CORBA_DomainManager_Proxy_Broker (void); virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy ( CORBA_DomainManager *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -320,7 +320,7 @@ public: virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy ( CORBA_DomainManager *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -383,7 +383,7 @@ public: static CORBA_ConstructionPolicy_ptr tao_nil (void); static CORBA_ConstructionPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -446,12 +446,12 @@ public: static CORBA_ConstructionPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ConstructionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ConstructionPolicy_ptr _nil (void) @@ -464,7 +464,7 @@ public: virtual void make_domain_manager ( CORBA_InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -472,7 +472,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -524,7 +524,7 @@ public: CORBA::Object_ptr _collocated_tao_target_, CORBA_InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -557,7 +557,7 @@ public: CORBA::Object_ptr _collocated_tao_target_, CORBA_InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -586,7 +586,7 @@ public: virtual ~_TAO_CORBA_ConstructionPolicy_Proxy_Broker (void); virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy ( CORBA_ConstructionPolicy *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -612,7 +612,7 @@ public: virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy ( CORBA_ConstructionPolicy *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -682,7 +682,7 @@ public: virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp index 1c99f5619a4..58721933e8f 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.cpp +++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp @@ -35,18 +35,18 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void) // to extract the TCKind of possibly aliased types. CORBA::TCKind TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - CORBA::TCKind tck = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); while (tck == CORBA::tk_alias) { - CORBA_TypeCode_var temp = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var temp = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); tck = TAO_DynAnyFactory::unalias (temp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); } @@ -56,18 +56,18 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA_TypeCode_var retval = CORBA::TypeCode::_duplicate (tc); - CORBA::TCKind tck = retval->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); while (tck == CORBA::tk_alias) { - retval = retval->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = retval->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - tck = retval->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } @@ -77,36 +77,36 @@ TAO_DynAnyFactory::strip_alias (CORBA_TypeCode_ptr tc DynamicAny::DynAny_ptr TAO_DynAnyFactory::create_dyn_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAnyFactory::InconsistentTypeCode )) { - return TAO_DynAnyFactory::make_dyn_any (value TAO_ENV_ARG_PARAMETER); + return TAO_DynAnyFactory::make_dyn_any (value ACE_ENV_ARG_PARAMETER); } DynamicAny::DynAny_ptr TAO_DynAnyFactory::create_dyn_any_from_type_code ( CORBA::TypeCode_ptr type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAnyFactory::InconsistentTypeCode )) { - return TAO_DynAnyFactory::make_dyn_any (type TAO_ENV_ARG_PARAMETER); + return TAO_DynAnyFactory::make_dyn_any (type ACE_ENV_ARG_PARAMETER); } DynamicAny::DynAny_ptr TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); switch (kind) @@ -139,7 +139,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p); - p->init (any TAO_ENV_ARG_PARAMETER); + p->init (any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -155,7 +155,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p); - p->init (any TAO_ENV_ARG_PARAMETER); + p->init (any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -170,7 +170,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p); - p->init (any TAO_ENV_ARG_PARAMETER); + p->init (any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -185,7 +185,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p); - p->init (any TAO_ENV_ARG_PARAMETER); + p->init (any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -200,7 +200,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p); - p->init (any TAO_ENV_ARG_PARAMETER); + p->init (any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -215,7 +215,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p); - p->init (any TAO_ENV_ARG_PARAMETER); + p->init (any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -241,10 +241,10 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any DynamicAny::DynAny_ptr TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TCKind kind = - TAO_DynAnyFactory::unalias (tc TAO_ENV_ARG_PARAMETER); + TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); switch (kind) @@ -277,7 +277,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p); - p->init (tc TAO_ENV_ARG_PARAMETER); + p->init (tc ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -293,7 +293,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p); - p->init (tc TAO_ENV_ARG_PARAMETER); + p->init (tc ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -308,7 +308,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p); - p->init (tc TAO_ENV_ARG_PARAMETER); + p->init (tc ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -323,7 +323,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p); - p->init (tc TAO_ENV_ARG_PARAMETER); + p->init (tc ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -338,7 +338,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p); - p->init (tc TAO_ENV_ARG_PARAMETER); + p->init (tc ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); @@ -353,7 +353,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc ACE_CHECK_RETURN (0); ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p); - p->init (tc TAO_ENV_ARG_PARAMETER); + p->init (tc ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return dp.release (); diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h index 147550d503e..7e414a9d273 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.h +++ b/TAO/tao/DynamicAny/DynAnyFactory.h @@ -45,28 +45,28 @@ public: // Constructor. static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Obtain the kind of object, after all aliasing has been removed. static CORBA_TypeCode_ptr strip_alias (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Same as above, but returns type code instead of TCKind. Caller // must release the return value. static DynamicAny::DynAny_ptr make_dyn_any (const CORBA_Any &any - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Create the correct type of DynAny object for <any>. static DynamicAny::DynAny_ptr make_dyn_any (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Create the correct type of DynAny object for <tc> // = The DynamicAnyFactory methods. virtual DynamicAny::DynAny_ptr create_dyn_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -75,7 +75,7 @@ public: virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code ( CORBA::TypeCode_ptr type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index a6226764fb7..dd921bcefcc 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -18,10 +18,10 @@ TAO_DynAny_i::~TAO_DynAny_i (void) void TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Check to see if it's a simple type. - CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc TAO_ENV_ARG_PARAMETER); + CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER); ACE_CHECK; switch (tk) { @@ -52,9 +52,9 @@ TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc void TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc TAO_ENV_ARG_PARAMETER); + CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER); ACE_CHECK; switch (tk) { @@ -149,14 +149,14 @@ TAO_DynAny_i::init_common (void) void TAO_DynAny_i::init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->check_typecode (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->set_to_default_value (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->init_common (); @@ -166,11 +166,11 @@ TAO_DynAny_i::init (CORBA_TypeCode_ptr tc void TAO_DynAny_i::init (const CORBA_Any& any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->type_ = any.type (); this->check_typecode (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->init_common (); @@ -182,7 +182,7 @@ TAO_DynAny_i::init (const CORBA_Any& any TAO_DynAny_i * TAO_DynAny_i::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) { @@ -220,7 +220,7 @@ TAO_DynAny_i::_tao_QueryInterface (ptr_arith_t type) void TAO_DynAny_i::from_any (const CORBA_Any &any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -236,7 +236,7 @@ TAO_DynAny_i::from_any (const CORBA_Any &any CORBA::Boolean equiv = this->type_->equivalent (any_tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!equiv) @@ -252,7 +252,7 @@ TAO_DynAny_i::from_any (const CORBA_Any &any } CORBA::Any_ptr -TAO_DynAny_i::to_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynAny_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -275,7 +275,7 @@ TAO_DynAny_i::to_any (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -287,7 +287,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs } TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (rhs_n == 0) @@ -296,7 +296,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs } CORBA::Boolean equiv = this->type_->equivalent (rhs_n->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equiv) @@ -417,22 +417,22 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs DynamicAny::DynAny_var rhs_dyn = TAO_DynAnyFactory::make_dyn_any (rhs_v - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); DynamicAny::DynAny_var lhs_dyn = TAO_DynAnyFactory::make_dyn_any (lhs_v - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean b = rhs_dyn->equal (lhs_dyn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - rhs_dyn->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + rhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - lhs_dyn->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + lhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return b; @@ -445,7 +445,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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } case CORBA::tk_objref: { @@ -454,16 +454,16 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } case CORBA::tk_string: { CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); const char* rhs_v; @@ -484,10 +484,10 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs { CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::WChar * rhs_v; @@ -506,7 +506,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynAny_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynAny_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -524,7 +524,7 @@ TAO_DynAny_i::destroy (TAO_ENV_SINGLE_ARG_DECL) DynamicAny::DynAny_ptr -TAO_DynAny_i::current_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynAny_i::current_component (ACE_ENV_SINGLE_ARG_DECL) 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 f11e447f0b6..b9158f79cd4 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -52,17 +52,17 @@ public: // Destructor. void init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using just a TypeCode void init (const CORBA_Any& any - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using an Any. // = LocalObject methods. static TAO_DynAny_i *_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -70,7 +70,7 @@ public: virtual void from_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -79,7 +79,7 @@ public: )); virtual CORBA::Any * to_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -87,21 +87,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -111,11 +111,11 @@ public: private: // Check if the typecode is acceptable. void check_typecode (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Used when we are created from a typecode. void set_to_default_value (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL); + 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 721ee0d64a6..6802ad3f5ac 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -30,12 +30,12 @@ TAO_DynArray_i::init_common (void) void TAO_DynArray_i::init (const CORBA_Any & any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_array) @@ -46,7 +46,7 @@ TAO_DynArray_i::init (const CORBA_Any & any this->type_ = tc; CORBA::ULong numfields = this->get_tc_length (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Resize the array. this->da_members_.size (numfields); @@ -60,7 +60,7 @@ TAO_DynArray_i::init (const CORBA_Any & any any._tao_byte_order ()); CORBA::TypeCode_var field_tc = - this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < numfields; i++) @@ -75,23 +75,23 @@ TAO_DynArray_i::init (const CORBA_Any & any // based on the type of field_any. this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (field_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_DynArray_i::init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_array) @@ -102,7 +102,7 @@ TAO_DynArray_i::init (CORBA_TypeCode_ptr tc this->type_ = CORBA::TypeCode::_duplicate (tc); CORBA::ULong numfields = this->get_tc_length (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Resize the array. @@ -110,39 +110,39 @@ TAO_DynArray_i::init (CORBA_TypeCode_ptr tc this->init_common (); - CORBA::TypeCode_var elemtype = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var elemtype = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < numfields; ++i) { // Recursively initialize each element. this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (elemtype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } CORBA::TypeCode_ptr -TAO_DynArray_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL) { 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_TypeCode::_nil ()); while (kind != CORBA::tk_array) { - element_type = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_TypeCode::_nil ()); - kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_TypeCode::_nil ()); } // Return the content type. - CORBA_TypeCode_ptr retval = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_TypeCode::_nil ()); return retval; @@ -151,21 +151,21 @@ TAO_DynArray_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL) // Get the length from the (possibly aliased) typecode. CORBA::ULong TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tctmp = CORBA::TypeCode::_duplicate (tc); - CORBA::TCKind kind = tctmp->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); while (kind == CORBA::tk_alias) { - tctmp = tctmp->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tctmp = tctmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - kind = tctmp->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } - CORBA::ULong retval = tctmp->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong retval = tctmp->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return retval; @@ -175,7 +175,7 @@ TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc TAO_DynArray_i * TAO_DynArray_i::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) { @@ -212,7 +212,7 @@ TAO_DynArray_i::_tao_QueryInterface (ptr_arith_t type) // **************************************************************** DynamicAny::AnySeq * -TAO_DynArray_i::get_elements (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -239,7 +239,7 @@ TAO_DynArray_i::get_elements (TAO_ENV_SINGLE_ARG_DECL) // Initialize each Any. for (CORBA::ULong i = 0; i < length; i++) { - tmp = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); safe_retval[i] = tmp.in (); @@ -250,7 +250,7 @@ TAO_DynArray_i::get_elements (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -270,7 +270,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value } CORBA::TypeCode_var value_tc; - CORBA::TypeCode_var element_type = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var element_type = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < length; i++) @@ -278,17 +278,17 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value // Check each arg element for type match. value_tc = value[i].type (); CORBA::Boolean equivalent = value_tc->equivalent (element_type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (equivalent) { - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (value[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -299,7 +299,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value } DynamicAny::DynAnySeq * -TAO_DynArray_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -325,7 +325,7 @@ TAO_DynArray_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL) // Set the flag so the caller can't destroy. this->set_flag (this->da_members_[i].in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); safe_retval[i] = @@ -339,7 +339,7 @@ TAO_DynArray_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynArray_i::set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -359,7 +359,7 @@ TAO_DynArray_i::set_elements_as_dyn_any ( ACE_THROW (DynamicAny::DynAny::InvalidValue ()); } - CORBA::TypeCode_var element_type = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var element_type = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var val_type; @@ -367,17 +367,17 @@ TAO_DynArray_i::set_elements_as_dyn_any ( for (CORBA::ULong i = 0; i < length; ++i) { - val_type = values[i]->type (TAO_ENV_SINGLE_ARG_PARAMETER); + val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; equivalent = val_type->equivalent (element_type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (equivalent) { - this->da_members_[i] = values[i]->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i] = values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -391,7 +391,7 @@ TAO_DynArray_i::set_elements_as_dyn_any ( void TAO_DynArray_i::from_any (const CORBA_Any& any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -405,7 +405,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any CORBA::TypeCode_var tc = any.type (); CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (equivalent) @@ -417,7 +417,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any CORBA::ULong length = this->da_members_.size (); CORBA::ULong arg_length = this->get_tc_length (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (length != arg_length) @@ -425,7 +425,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); } - CORBA::TypeCode_var field_tc = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < arg_length; ++i) @@ -436,18 +436,18 @@ TAO_DynArray_i::from_any (const CORBA_Any& any cdr.byte_order (), cdr.start ()); - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (field_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -460,7 +460,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any } CORBA::Any_ptr -TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -471,7 +471,7 @@ TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL) 0); } - CORBA_TypeCode_var field_tc = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_OutputCDR out_cdr; @@ -481,7 +481,7 @@ TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < length; ++i) { // Recursive step. - field_any = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + field_any = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_Message_Block* field_mb = field_any->_tao_get_cdr (); @@ -492,7 +492,7 @@ TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (field_tc.in (), &field_cdr, &out_cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -512,7 +512,7 @@ TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -523,11 +523,11 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs 0); } - CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean equivalent = tc->equivalent (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equivalent) @@ -542,15 +542,15 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs { rhs->seek (ACE_static_cast (CORBA::Long, i) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - tmp = rhs->current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Recursive step. member_equal = tmp->equal (this->da_members_[i].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!member_equal) @@ -563,7 +563,7 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynArray_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -580,10 +580,10 @@ TAO_DynArray_i::destroy (TAO_ENV_SINGLE_ARG_DECL) { this->set_flag (da_members_[i].in (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -592,7 +592,7 @@ TAO_DynArray_i::destroy (TAO_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynArray_i::current_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -614,7 +614,7 @@ TAO_DynArray_i::current_component (TAO_ENV_SINGLE_ARG_DECL) this->set_flag (this->da_members_[index].in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); return DynamicAny::DynAny::_duplicate ( diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h index 3f872d7aa00..083320ad336 100644 --- a/TAO/tao/DynamicAny/DynArray_i.h +++ b/TAO/tao/DynamicAny/DynArray_i.h @@ -53,24 +53,24 @@ public: // Destructor. void init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using just a TypeCode. void init (const CORBA_Any& any - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using an Any. // = LocalObject methods static TAO_DynArray_i *_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); // = Functions specific to DynArray. virtual DynamicAny::AnySeq * get_elements ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -78,7 +78,7 @@ public: virtual void set_elements ( const DynamicAny::AnySeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -87,7 +87,7 @@ public: )); virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -95,7 +95,7 @@ public: virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -107,7 +107,7 @@ public: virtual void from_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -116,7 +116,7 @@ public: )); virtual CORBA::Any * to_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -124,21 +124,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -147,11 +147,11 @@ public: private: // Returns the type of elements contained in the array. - CORBA::TypeCode_ptr get_element_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Gets the length of the array from the typecode. CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + 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 7856a20e322..b809c617510 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -25,7 +25,7 @@ TAO_DynCommon::~TAO_DynCommon (void) // ***************************************************************** CORBA::TypeCode_ptr -TAO_DynCommon::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -41,7 +41,7 @@ TAO_DynCommon::type (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -52,20 +52,20 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); } - CORBA_TypeCode_var tc = dyn_any->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (equivalent) { - CORBA_Any_var any = dyn_any->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var any = dyn_any->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->from_any (any.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -76,7 +76,7 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any void TAO_DynCommon::insert_boolean (CORBA::Boolean value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -90,17 +90,17 @@ TAO_DynCommon::insert_boolean (CORBA::Boolean value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_boolean (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_boolean - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= CORBA::Any::from_boolean (value); @@ -109,7 +109,7 @@ TAO_DynCommon::insert_boolean (CORBA::Boolean value void TAO_DynCommon::insert_octet (CORBA::Octet value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -123,17 +123,17 @@ TAO_DynCommon::insert_octet (CORBA::Octet value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_octet (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_octet - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= CORBA::Any::from_octet (value); @@ -142,7 +142,7 @@ TAO_DynCommon::insert_octet (CORBA::Octet value void TAO_DynCommon::insert_char (CORBA::Char value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -156,17 +156,17 @@ TAO_DynCommon::insert_char (CORBA::Char value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_char (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_char - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= CORBA::Any::from_char (value); @@ -175,7 +175,7 @@ TAO_DynCommon::insert_char (CORBA::Char value void TAO_DynCommon::insert_short (CORBA::Short value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -189,17 +189,17 @@ TAO_DynCommon::insert_short (CORBA::Short value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_short (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_short - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -208,7 +208,7 @@ TAO_DynCommon::insert_short (CORBA::Short value void TAO_DynCommon::insert_ushort (CORBA::UShort value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -222,17 +222,17 @@ TAO_DynCommon::insert_ushort (CORBA::UShort value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_ushort (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_ushort - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -241,7 +241,7 @@ TAO_DynCommon::insert_ushort (CORBA::UShort value void TAO_DynCommon::insert_long (CORBA::Long value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -255,17 +255,17 @@ TAO_DynCommon::insert_long (CORBA::Long value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_long (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -274,7 +274,7 @@ TAO_DynCommon::insert_long (CORBA::Long value void TAO_DynCommon::insert_ulong (CORBA::ULong value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -288,17 +288,17 @@ TAO_DynCommon::insert_ulong (CORBA::ULong value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_ulong (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_ulong - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -307,7 +307,7 @@ TAO_DynCommon::insert_ulong (CORBA::ULong value void TAO_DynCommon::insert_float (CORBA::Float value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -321,17 +321,17 @@ TAO_DynCommon::insert_float (CORBA::Float value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_float (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_float - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -340,7 +340,7 @@ TAO_DynCommon::insert_float (CORBA::Float value void TAO_DynCommon::insert_double (CORBA::Double value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -354,17 +354,17 @@ TAO_DynCommon::insert_double (CORBA::Double value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_double (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_double - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -373,7 +373,7 @@ TAO_DynCommon::insert_double (CORBA::Double value void TAO_DynCommon::insert_string (const char * value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -387,21 +387,21 @@ TAO_DynCommon::insert_string (const char * value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_string (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::TCKind kind = unaliased_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_string) @@ -409,7 +409,7 @@ TAO_DynCommon::insert_string (const char * value ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); } - CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (bound > 0 && bound < ACE_OS::strlen (value)) @@ -425,7 +425,7 @@ TAO_DynCommon::insert_string (const char * value void TAO_DynCommon::insert_reference (CORBA::Object_ptr value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -439,18 +439,18 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_reference (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { CORBA::Boolean good_type = 1; CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_objref) @@ -463,13 +463,13 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_id = this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (value_id, my_id) != 0) { good_type = value->_is_a (my_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -492,7 +492,7 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value void TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -506,17 +506,17 @@ TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_typecode (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_TypeCode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -525,7 +525,7 @@ TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value void TAO_DynCommon::insert_longlong (CORBA::LongLong value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -539,17 +539,17 @@ TAO_DynCommon::insert_longlong (CORBA::LongLong value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_longlong (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_longlong - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -558,7 +558,7 @@ TAO_DynCommon::insert_longlong (CORBA::LongLong value void TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -572,17 +572,17 @@ TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_ulonglong (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_ulonglong - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -591,7 +591,7 @@ TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value void TAO_DynCommon::insert_longdouble (CORBA::LongDouble value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -605,17 +605,17 @@ TAO_DynCommon::insert_longdouble (CORBA::LongDouble value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_longdouble (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_longdouble - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -624,7 +624,7 @@ TAO_DynCommon::insert_longdouble (CORBA::LongDouble value void TAO_DynCommon::insert_wchar (CORBA::WChar value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -638,17 +638,17 @@ TAO_DynCommon::insert_wchar (CORBA::WChar value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_wchar (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_wchar - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= CORBA::Any::from_wchar (value); @@ -657,7 +657,7 @@ TAO_DynCommon::insert_wchar (CORBA::WChar value void TAO_DynCommon::insert_wstring (const CORBA::WChar * value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -671,21 +671,21 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_wstring (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { CORBA::TypeCode_var unaliased_tc = this->check_type_and_unalias (CORBA::_tc_wstring - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (bound > 0 && bound < ACE_OS::wslen (value)) @@ -701,7 +701,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value void TAO_DynCommon::insert_any (const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -715,17 +715,17 @@ TAO_DynCommon::insert_any (const CORBA::Any &value if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cc->insert_any (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->check_type (CORBA::_tc_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->any_ <<= value; @@ -736,7 +736,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -748,18 +748,18 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); } - CORBA_Any_var any = value->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->insert_any (any.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } #ifdef TAO_HAS_VALUETYPE void TAO_DynCommon::insert_val (CORBA::ValueBase_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -773,7 +773,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase_ptr // **************************************************************** CORBA::Boolean -TAO_DynCommon::get_boolean (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_boolean (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -788,10 +788,10 @@ TAO_DynCommon::get_boolean (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_boolean (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_boolean (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -808,7 +808,7 @@ TAO_DynCommon::get_boolean (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Octet -TAO_DynCommon::get_octet (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_octet (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -823,10 +823,10 @@ TAO_DynCommon::get_octet (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_octet (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_octet (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -843,7 +843,7 @@ TAO_DynCommon::get_octet (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Char -TAO_DynCommon::get_char (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_char (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -858,10 +858,10 @@ TAO_DynCommon::get_char (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_char (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_char (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -878,7 +878,7 @@ TAO_DynCommon::get_char (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Short -TAO_DynCommon::get_short (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_short (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -893,10 +893,10 @@ TAO_DynCommon::get_short (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_short (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -913,7 +913,7 @@ TAO_DynCommon::get_short (TAO_ENV_SINGLE_ARG_DECL) } CORBA::UShort -TAO_DynCommon::get_ushort (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_ushort (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -928,10 +928,10 @@ TAO_DynCommon::get_ushort (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_ushort (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_ushort (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -948,7 +948,7 @@ TAO_DynCommon::get_ushort (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Long -TAO_DynCommon::get_long (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_long (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -963,10 +963,10 @@ TAO_DynCommon::get_long (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_long (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_long (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -983,7 +983,7 @@ TAO_DynCommon::get_long (TAO_ENV_SINGLE_ARG_DECL) } CORBA::ULong -TAO_DynCommon::get_ulong (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_ulong (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -998,10 +998,10 @@ TAO_DynCommon::get_ulong (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_ulong (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_ulong (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1018,7 +1018,7 @@ TAO_DynCommon::get_ulong (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Float -TAO_DynCommon::get_float (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_float (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1033,10 +1033,10 @@ TAO_DynCommon::get_float (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_float (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_float (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1053,7 +1053,7 @@ TAO_DynCommon::get_float (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Double -TAO_DynCommon::get_double (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_double (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1068,10 +1068,10 @@ TAO_DynCommon::get_double (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_double (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_double (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1088,7 +1088,7 @@ TAO_DynCommon::get_double (TAO_ENV_SINGLE_ARG_DECL) } char * -TAO_DynCommon::get_string (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1103,19 +1103,19 @@ TAO_DynCommon::get_string (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_string (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); } else { CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::TCKind kind = unaliased_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (kind != CORBA::tk_string) @@ -1126,7 +1126,7 @@ TAO_DynCommon::get_string (TAO_ENV_SINGLE_ARG_DECL) char *retval = 0; - CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // We will have caught a type mismatch above, so if this fails, @@ -1142,7 +1142,7 @@ TAO_DynCommon::get_string (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Object_ptr -TAO_DynCommon::get_reference (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_reference (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1157,10 +1157,10 @@ TAO_DynCommon::get_reference (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_reference (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_reference (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1177,7 +1177,7 @@ TAO_DynCommon::get_reference (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_DynCommon::get_typecode (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_typecode (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1192,10 +1192,10 @@ TAO_DynCommon::get_typecode (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1212,7 +1212,7 @@ TAO_DynCommon::get_typecode (TAO_ENV_SINGLE_ARG_DECL) } CORBA::LongLong -TAO_DynCommon::get_longlong (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_longlong (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1229,10 +1229,10 @@ TAO_DynCommon::get_longlong (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (retval); - return cc->get_longlong (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_longlong (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1247,7 +1247,7 @@ TAO_DynCommon::get_longlong (TAO_ENV_SINGLE_ARG_DECL) } CORBA::ULongLong -TAO_DynCommon::get_ulonglong (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_ulonglong (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1264,10 +1264,10 @@ TAO_DynCommon::get_ulonglong (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (retval); - return cc->get_ulonglong (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_ulonglong (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1282,7 +1282,7 @@ TAO_DynCommon::get_ulonglong (TAO_ENV_SINGLE_ARG_DECL) } CORBA::LongDouble -TAO_DynCommon::get_longdouble (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_longdouble (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1299,10 +1299,10 @@ TAO_DynCommon::get_longdouble (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (retval); - return cc->get_longdouble (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_longdouble (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1317,7 +1317,7 @@ TAO_DynCommon::get_longdouble (TAO_ENV_SINGLE_ARG_DECL) } CORBA::WChar -TAO_DynCommon::get_wchar (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_wchar (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1332,10 +1332,10 @@ TAO_DynCommon::get_wchar (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_wchar (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_wchar (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1352,7 +1352,7 @@ TAO_DynCommon::get_wchar (TAO_ENV_SINGLE_ARG_DECL) } CORBA::WChar * -TAO_DynCommon::get_wstring (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1367,10 +1367,10 @@ TAO_DynCommon::get_wstring (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_wstring (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_wstring (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1379,12 +1379,12 @@ TAO_DynCommon::get_wstring (TAO_ENV_SINGLE_ARG_DECL) // BadKind. CORBA::TypeCode_var unaliased_tc = this->check_type_and_unalias (CORBA::_tc_wstring - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::WChar *retval = 0; - CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); (void) (this->any_ >>= CORBA::Any::to_wstring (retval, @@ -1395,7 +1395,7 @@ TAO_DynCommon::get_wstring (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Any_ptr -TAO_DynCommon::get_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1410,10 +1410,10 @@ TAO_DynCommon::get_any (TAO_ENV_SINGLE_ARG_DECL) if (this->has_components_) { - DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return cc->get_any (TAO_ENV_SINGLE_ARG_PARAMETER); + return cc->get_any (ACE_ENV_SINGLE_ARG_PARAMETER); } else { @@ -1439,7 +1439,7 @@ TAO_DynCommon::get_any (TAO_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1452,16 +1452,16 @@ TAO_DynCommon::get_dyn_any (TAO_ENV_SINGLE_ARG_DECL) 0); } - CORBA_Any_var any = this->get_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return TAO_DynAnyFactory::make_dyn_any (any.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } #ifdef TAO_HAS_VALUETYPE CORBA::ValueBase_ptr -TAO_DynCommon::get_val (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1477,7 +1477,7 @@ TAO_DynCommon::get_val (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynCommon::seek (CORBA::Long slot - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -1508,7 +1508,7 @@ TAO_DynCommon::seek (CORBA::Long slot } void -TAO_DynCommon::rewind (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::rewind (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -1519,12 +1519,12 @@ TAO_DynCommon::rewind (TAO_ENV_SINGLE_ARG_DECL) } (void) this->seek (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Boolean -TAO_DynCommon::next (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::next (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -1552,7 +1552,7 @@ TAO_DynCommon::next (TAO_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynCommon::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -1563,19 +1563,19 @@ TAO_DynCommon::copy (TAO_ENV_SINGLE_ARG_DECL) DynamicAny::DynAny::_nil ()); } - CORBA_Any_var any = this->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var any = this->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); DynamicAny::DynAny_ptr retval = TAO_DynAnyFactory::make_dyn_any (any.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); return retval; } CORBA::ULong -TAO_DynCommon::component_count (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::component_count (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -1592,16 +1592,16 @@ TAO_DynCommon::component_count (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, CORBA::Boolean destroying - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA::TypeCode_var tc = component->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = component->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; switch (tk) @@ -1609,7 +1609,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, case CORBA::tk_array: { TAO_DynArray_i *tmp = TAO_DynArray_i::_narrow (component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (destroying) @@ -1627,7 +1627,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, case CORBA::tk_enum: { TAO_DynEnum_i *tmp = TAO_DynEnum_i::_narrow (component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (destroying) @@ -1645,7 +1645,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, case CORBA::tk_sequence: { TAO_DynSequence_i *tmp = TAO_DynSequence_i::_narrow (component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (destroying) @@ -1663,7 +1663,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, case CORBA::tk_struct: { TAO_DynStruct_i *tmp = TAO_DynStruct_i::_narrow (component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (destroying) @@ -1681,7 +1681,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, case CORBA::tk_union: { TAO_DynUnion_i *tmp = TAO_DynUnion_i::_narrow (component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (destroying) @@ -1703,7 +1703,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, default: { TAO_DynAny_i *tmp = TAO_DynAny_i::_narrow (component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (destroying) @@ -1722,7 +1722,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, } DynamicAny::DynAny_ptr -TAO_DynCommon::check_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -1735,14 +1735,14 @@ TAO_DynCommon::check_component (TAO_ENV_SINGLE_ARG_DECL) DynamicAny::DynAny::_nil ()); } - DynamicAny::DynAny_var cc = this->current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = this->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); - CORBA::TypeCode_var tc = cc->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = cc->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); // We are here because we are a component that is the target of @@ -1765,14 +1765,14 @@ TAO_DynCommon::check_component (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch )) { CORBA::Boolean equivalent = this->type_->equivalent (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!equivalent) @@ -1783,17 +1783,17 @@ TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc CORBA::TypeCode_ptr TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch )) { this->check_type (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return TAO_DynAnyFactory::strip_alias (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h index a5dd26af845..eaa75c8c3e9 100644 --- a/TAO/tao/DynamicAny/DynCommon.h +++ b/TAO/tao/DynamicAny/DynCommon.h @@ -50,7 +50,7 @@ public: // = Some functions common to all Dynamic Any types. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -58,7 +58,7 @@ public: virtual void assign ( DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -67,7 +67,7 @@ public: virtual void insert_boolean ( CORBA::Boolean value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -77,7 +77,7 @@ public: virtual void insert_octet ( CORBA::Octet value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -87,7 +87,7 @@ public: virtual void insert_char ( CORBA::Char value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -97,7 +97,7 @@ public: virtual void insert_short ( CORBA::Short value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -107,7 +107,7 @@ public: virtual void insert_ushort ( CORBA::UShort value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -117,7 +117,7 @@ public: virtual void insert_long ( CORBA::Long value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -127,7 +127,7 @@ public: virtual void insert_ulong ( CORBA::ULong value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -137,7 +137,7 @@ public: virtual void insert_float ( CORBA::Float value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -147,7 +147,7 @@ public: virtual void insert_double ( CORBA::Double value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -157,7 +157,7 @@ public: virtual void insert_string ( const char * value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -167,7 +167,7 @@ public: virtual void insert_reference ( CORBA::Object_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -177,7 +177,7 @@ public: virtual void insert_typecode ( CORBA::TypeCode_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -187,7 +187,7 @@ public: virtual void insert_longlong ( CORBA::LongLong value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -197,7 +197,7 @@ public: virtual void insert_ulonglong ( CORBA::ULongLong value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -207,7 +207,7 @@ public: virtual void insert_longdouble ( CORBA::LongDouble value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -217,7 +217,7 @@ public: virtual void insert_wchar ( CORBA::WChar value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -227,7 +227,7 @@ public: virtual void insert_wstring ( const CORBA::WChar * value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -237,7 +237,7 @@ public: virtual void insert_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -247,7 +247,7 @@ public: virtual void insert_dyn_any ( DynamicAny::DynAny_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -258,7 +258,7 @@ public: #ifdef TAO_HAS_VALUETYPE virtual void insert_val ( CORBA::ValueBase_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -268,7 +268,7 @@ public: #endif /* TAO_HAS_VALUETYPE */ virtual CORBA::Boolean get_boolean ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -277,7 +277,7 @@ public: )); virtual CORBA::Octet get_octet ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -286,7 +286,7 @@ public: )); virtual CORBA::Char get_char ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -295,7 +295,7 @@ public: )); virtual CORBA::Short get_short ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -304,7 +304,7 @@ public: )); virtual CORBA::UShort get_ushort ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -313,7 +313,7 @@ public: )); virtual CORBA::Long get_long ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -322,7 +322,7 @@ public: )); virtual CORBA::ULong get_ulong ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -331,7 +331,7 @@ public: )); virtual CORBA::Float get_float ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -340,7 +340,7 @@ public: )); virtual CORBA::Double get_double ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -349,7 +349,7 @@ public: )); virtual char * get_string ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -358,7 +358,7 @@ public: )); virtual CORBA::Object_ptr get_reference ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -367,7 +367,7 @@ public: )); virtual CORBA::TypeCode_ptr get_typecode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -376,7 +376,7 @@ public: )); virtual CORBA::LongLong get_longlong ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -385,7 +385,7 @@ public: )); virtual CORBA::ULongLong get_ulonglong ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -394,7 +394,7 @@ public: )); virtual CORBA::LongDouble get_longdouble ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -403,7 +403,7 @@ public: )); virtual CORBA::WChar get_wchar ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -412,7 +412,7 @@ public: )); virtual CORBA::WChar * get_wstring ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -421,7 +421,7 @@ public: )); virtual CORBA::Any * get_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -430,7 +430,7 @@ public: )); virtual DynamicAny::DynAny_ptr get_dyn_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -440,7 +440,7 @@ public: #ifdef TAO_HAS_VALUETYPE virtual CORBA::ValueBase_ptr get_val ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -451,35 +451,35 @@ public: virtual CORBA::Boolean seek ( CORBA::Long index - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void rewind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean next ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::ULong component_count ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -498,7 +498,7 @@ protected: void set_flag ( DynamicAny::DynAny_ptr component, CORBA::Boolean destroying - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -533,7 +533,7 @@ protected: private: // Utility functions used by insert_* and get_*. - DynamicAny::DynAny_ptr check_component (TAO_ENV_SINGLE_ARG_DECL) + DynamicAny::DynAny_ptr check_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -541,14 +541,14 @@ private: )); void check_type (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch )); CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + 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 b6872777472..b12ddf31c3c 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -29,13 +29,13 @@ TAO_DynEnum_i::init_common (void) void TAO_DynEnum_i::init (const CORBA_Any &any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_enum) @@ -57,10 +57,10 @@ TAO_DynEnum_i::init (const CORBA_Any &any void TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_enum) @@ -79,7 +79,7 @@ TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc TAO_DynEnum_i * TAO_DynEnum_i::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) { @@ -116,13 +116,13 @@ TAO_DynEnum_i::_tao_QueryInterface (ptr_arith_t type) // **************************************************************** char * -TAO_DynEnum_i::get_as_string (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::get_as_string (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { const char *retval = this->type_.in ()->member_name (this->value_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return CORBA::string_dup (retval); @@ -130,13 +130,13 @@ TAO_DynEnum_i::get_as_string (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynEnum_i::set_as_string (const char *value_as_string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue )) { - CORBA::ULong count = this->type_.in ()->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong count = this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong i; @@ -145,7 +145,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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!ACE_OS::strcmp (value_as_string, @@ -166,7 +166,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string } CORBA::ULong -TAO_DynEnum_i::get_as_ulong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_DynEnum_i::get_as_ulong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -176,13 +176,13 @@ TAO_DynEnum_i::get_as_ulong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue )) { - CORBA::ULong max = this->type_.in ()->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong max = this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (value_as_ulong < max) @@ -199,7 +199,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong void TAO_DynEnum_i::from_any (const CORBA_Any& any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -208,7 +208,7 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind == CORBA::tk_enum) @@ -228,7 +228,7 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any } CORBA::Any_ptr -TAO_DynEnum_i::to_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -250,16 +250,16 @@ TAO_DynEnum_i::to_any (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean equivalent = tc->equivalent (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equivalent) @@ -267,7 +267,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs return 0; } - CORBA_Any_var any = rhs->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_Message_Block *mb = any->_tao_get_cdr (); @@ -282,7 +282,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynEnum_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -299,7 +299,7 @@ TAO_DynEnum_i::destroy (TAO_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynEnum_i::current_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::current_component (ACE_ENV_SINGLE_ARG_DECL) 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 44532527608..e22b014d863 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.h +++ b/TAO/tao/DynamicAny/DynEnum_i.h @@ -53,24 +53,24 @@ public: // Destructor. void init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using just a TypeCode. void init (const CORBA_Any& any - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using an Any. // = LocalObject methods. static TAO_DynEnum_i *_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); // = Functions specific to DynEnum. virtual char * get_as_string ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -78,7 +78,7 @@ public: virtual void set_as_string ( const char * value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -86,7 +86,7 @@ public: )); virtual CORBA::ULong get_as_ulong ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -94,7 +94,7 @@ public: virtual void set_as_ulong ( CORBA::ULong value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -105,7 +105,7 @@ public: virtual void from_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -114,7 +114,7 @@ public: )); virtual CORBA::Any * to_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -122,21 +122,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 0e29f33f55f..731e6a98d16 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -30,13 +30,13 @@ TAO_DynSequence_i::init_common (void) void TAO_DynSequence_i::init (const CORBA::Any& any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_sequence) @@ -65,7 +65,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < length; ++i) @@ -80,23 +80,23 @@ TAO_DynSequence_i::init (const CORBA::Any& any // based on the type of field_any. this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (field_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_DynSequence_i::init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_sequence) @@ -116,7 +116,7 @@ TAO_DynSequence_i::init (CORBA_TypeCode_ptr tc TAO_DynSequence_i * TAO_DynSequence_i::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) { @@ -153,26 +153,26 @@ TAO_DynSequence_i::_tao_QueryInterface (ptr_arith_t type) // **************************************************************** CORBA::TypeCode_ptr -TAO_DynSequence_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL) { 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_TypeCode::_nil ()); while (kind != CORBA::tk_sequence) { - element_type = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_TypeCode::_nil ()); - kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_TypeCode::_nil ()); } // Return the content type. - CORBA::TypeCode_ptr retval = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_TypeCode::_nil ()); return retval; @@ -181,7 +181,7 @@ TAO_DynSequence_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL) // = Functions specific to DynSequence. CORBA::ULong -TAO_DynSequence_i::get_length (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::get_length (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -197,7 +197,7 @@ TAO_DynSequence_i::get_length (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynSequence_i::set_length (CORBA::ULong length - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue @@ -211,10 +211,10 @@ TAO_DynSequence_i::set_length (CORBA::ULong length // CORBA::TypeCode::length() does not accept aliased type codes. CORBA::TypeCode_var stripped_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong bound = stripped_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (bound > 0 && length > bound) @@ -254,14 +254,14 @@ TAO_DynSequence_i::set_length (CORBA::ULong length this->da_members_.size (length); CORBA::TypeCode_var elemtype = - stripped_tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + stripped_tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = this->component_count_; i < length; ++i) { this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (elemtype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -270,7 +270,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -282,7 +282,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length } DynamicAny::AnySeq * -TAO_DynSequence_i::get_elements (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -308,7 +308,7 @@ TAO_DynSequence_i::get_elements (TAO_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < length; ++i) { CORBA::Any_var tmp = - this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -320,7 +320,7 @@ TAO_DynSequence_i::get_elements (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -334,11 +334,11 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value CORBA::TypeCode_var stripped_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = value.length (); - CORBA::ULong bound = stripped_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (bound > 0 && length > bound) @@ -363,7 +363,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value } CORBA::TypeCode_var element_type = - this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var value_tc; @@ -374,7 +374,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value value_tc = value[i].type (); CORBA::Boolean equivalent = value_tc->equivalent (element_type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (equivalent) @@ -382,13 +382,13 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value // Destroy any existing members. if (i < this->component_count_) { - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (value[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -400,7 +400,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value // Destroy any dangling members. for (CORBA::ULong j = length; j < this->component_count_; ++j) { - this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -415,7 +415,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value } DynamicAny::DynAnySeq * -TAO_DynSequence_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -441,7 +441,7 @@ TAO_DynSequence_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL) // Set the flag so the caller can't destroy. this->set_flag (this->da_members_[i].in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); safe_retval[i] = @@ -455,7 +455,7 @@ TAO_DynSequence_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynSequence_i::set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -470,11 +470,11 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( CORBA::TypeCode_var stripped_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = values.length (); - CORBA::ULong bound = stripped_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (bound > 0 && length > bound) @@ -488,7 +488,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( this->da_members_.size (length); } - CORBA::TypeCode_var element_type = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var element_type = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var val_type; @@ -496,11 +496,11 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( for (CORBA::ULong i = 0; i < length; ++i) { - val_type = values[i]->type (TAO_ENV_SINGLE_ARG_PARAMETER); + val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; equivalent = val_type->equivalent (element_type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -509,11 +509,11 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( // Destroy any existing members. if (i < this->component_count_) { - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->da_members_[i] = values[i]->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i] = values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -525,7 +525,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( // Destroy any dangling members. for (CORBA::ULong j = length; j < this->component_count_; ++j) { - this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -543,7 +543,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( void TAO_DynSequence_i::from_any (const CORBA::Any & any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -557,7 +557,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any CORBA::TypeCode_var tc = any.type (); CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (equivalent) @@ -581,7 +581,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any } CORBA::TypeCode_var field_tc = - this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < arg_length; ++i) @@ -594,26 +594,26 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any if (i < this->component_count_) { - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (field_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - TAO_ENV_ARG_PARAMETER); + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -635,7 +635,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any } CORBA::Any_ptr -TAO_DynSequence_i::to_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -650,14 +650,14 @@ TAO_DynSequence_i::to_any (TAO_ENV_SINGLE_ARG_DECL) out_cdr.write_ulong (this->component_count_); - CORBA_TypeCode_var field_tc = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); for (CORBA::ULong i = 0; i < this->component_count_; ++i) { // Recursive step CORBA::Any_var field_any = - this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_Message_Block *field_mb = field_any->_tao_get_cdr (); @@ -668,7 +668,7 @@ TAO_DynSequence_i::to_any (TAO_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (field_tc.in (), &field_cdr, &out_cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -688,7 +688,7 @@ TAO_DynSequence_i::to_any (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -699,11 +699,11 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs 0); } - CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean equivalent = tc->equivalent (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equivalent) @@ -718,15 +718,15 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs { rhs->seek (ACE_static_cast (CORBA::Long, i) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - tmp = rhs->current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Recursive step. member_equal = tmp->equal (this->da_members_[i].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!member_equal) @@ -739,7 +739,7 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynSequence_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -756,10 +756,10 @@ TAO_DynSequence_i::destroy (TAO_ENV_SINGLE_ARG_DECL) { this->set_flag (da_members_[i].in (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -768,7 +768,7 @@ TAO_DynSequence_i::destroy (TAO_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynSequence_i::current_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -790,7 +790,7 @@ TAO_DynSequence_i::current_component (TAO_ENV_SINGLE_ARG_DECL) this->set_flag (this->da_members_[index].in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); return DynamicAny::DynAny::_duplicate ( diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h index 6e11f692347..98a2957fb78 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.h +++ b/TAO/tao/DynamicAny/DynSequence_i.h @@ -53,24 +53,24 @@ public: // Destructor. void init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using just a TypeCode. void init (const CORBA_Any& any - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using an Any. // = LocalObject methods. static TAO_DynSequence_i *_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); // = Functions specific to DynSequence. virtual CORBA::ULong get_length ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -78,7 +78,7 @@ public: virtual void set_length ( CORBA::ULong len - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -86,7 +86,7 @@ public: )); virtual DynamicAny::AnySeq * get_elements ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -94,7 +94,7 @@ public: virtual void set_elements ( const DynamicAny::AnySeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -103,7 +103,7 @@ public: )); virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -111,7 +111,7 @@ public: virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -124,7 +124,7 @@ public: virtual void from_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -133,7 +133,7 @@ public: )); virtual CORBA::Any * to_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -141,21 +141,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -164,7 +164,7 @@ public: private: // Utility, turns the type of elements contained in the sequence. - CORBA::TypeCode_ptr get_element_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // 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 bef8529f9f1..c94557da2b7 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -19,10 +19,10 @@ TAO_DynStruct_i::~TAO_DynStruct_i (void) void TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind == CORBA::tk_struct || kind == CORBA::tk_except) @@ -46,17 +46,17 @@ TAO_DynStruct_i::init_common (void) void TAO_DynStruct_i::init (const CORBA_Any& any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tc = any.type (); this->check_typecode (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->type_ = tc; // Member_count works with aliased type codes. - CORBA::ULong numfields = this->type_->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong numfields = this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Resize the array. @@ -72,7 +72,7 @@ TAO_DynStruct_i::init (const CORBA_Any& any // If we have an exception type, unmarshal the repository ID. CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind == CORBA::tk_except) @@ -84,14 +84,14 @@ TAO_DynStruct_i::init (const CORBA_Any& any // member_type() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < numfields; i++) { CORBA::TypeCode_var field_tc = unaliased_tc->member_type (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This Any constructor is a TAO extension. @@ -104,28 +104,28 @@ TAO_DynStruct_i::init (const CORBA_Any& any // based on the type of field_any. this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (field_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->check_typecode (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->type_ = CORBA::TypeCode::_duplicate (tc); - CORBA::ULong numfields = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong numfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Resize the array. @@ -138,12 +138,12 @@ TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc for (CORBA::ULong i = 0; i < numfields; i++) { mtype = tc->member_type (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Recursively initialize each member. this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (mtype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -152,7 +152,7 @@ TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc TAO_DynStruct_i * TAO_DynStruct_i::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) { @@ -189,7 +189,7 @@ TAO_DynStruct_i::_tao_QueryInterface (ptr_arith_t type) // **************************************************************** DynamicAny::FieldName -TAO_DynStruct_i::current_member_name (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::current_member_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -218,7 +218,7 @@ TAO_DynStruct_i::current_member_name (TAO_ENV_SINGLE_ARG_DECL) // Member_name works with aliased type codes. const char *name = this->type_->member_name (this->current_position_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return CORBA::string_dup (name); @@ -226,7 +226,7 @@ TAO_DynStruct_i::current_member_name (TAO_ENV_SINGLE_ARG_DECL) // Returns the unaliased TCKind. CORBA::TCKind -TAO_DynStruct_i::current_member_kind (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::current_member_kind (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -254,18 +254,18 @@ TAO_DynStruct_i::current_member_kind (TAO_ENV_SINGLE_ARG_DECL) CORBA::TypeCode_var tc = this->type_.in ()->member_type (this->current_position_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); return retval; } DynamicAny::NameValuePairSeq * -TAO_DynStruct_i::get_members (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -294,7 +294,7 @@ TAO_DynStruct_i::get_members (TAO_ENV_SINGLE_ARG_DECL) safe_retval[i].id = CORBA::string_dup (this->type_.in ()->member_name (i)); - temp = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + temp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); safe_retval[i].value = temp.in (); @@ -305,7 +305,7 @@ TAO_DynStruct_i::get_members (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -332,20 +332,20 @@ 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 () - TAO_ENV_ARG_PARAMETER); + 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; value_tc = values[i].value.type (); equivalent = my_tc->equivalent (value_tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!equivalent) @@ -353,12 +353,12 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); } - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (values[i].value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -366,7 +366,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values } DynamicAny::NameDynAnyPairSeq * -TAO_DynStruct_i::get_members_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -398,7 +398,7 @@ TAO_DynStruct_i::get_members_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL) // Set the flag so the caller can't destroy. this->set_flag (this->da_members_[i].in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); safe_retval[i].value = @@ -412,7 +412,7 @@ TAO_DynStruct_i::get_members_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynStruct_i::set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -440,21 +440,21 @@ 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 () - TAO_ENV_ARG_PARAMETER); + 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - value_tc = values[i].value->type (TAO_ENV_SINGLE_ARG_PARAMETER); + value_tc = values[i].value->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; equivalent = my_tc->equivalent (value_tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!equivalent) @@ -462,10 +462,10 @@ TAO_DynStruct_i::set_members_as_dyn_any ( ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); } - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->da_members_[i] = values[i].value->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i] = values[i].value->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -476,7 +476,7 @@ TAO_DynStruct_i::set_members_as_dyn_any ( void TAO_DynStruct_i::from_any (const CORBA_Any & any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -490,7 +490,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any CORBA::TypeCode_var tc = any.type (); CORBA::Boolean equivalent = this->type_->equivalent (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (equivalent) @@ -502,7 +502,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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind == CORBA::tk_except) @@ -516,7 +516,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any for (CORBA::ULong i = 0; i < this->component_count_; ++i) { field_tc = this->type_.in ()->member_type (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This Any constructor is a TAO extension. @@ -525,18 +525,18 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any cdr.byte_order (), cdr.start ()); - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (field_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -549,7 +549,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any } CORBA::Any_ptr -TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -564,7 +564,7 @@ TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL) // If we have an exception type, marshal the repository ID. CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (kind == CORBA::tk_except) @@ -574,11 +574,11 @@ TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < this->component_count_; ++i) { - CORBA_TypeCode_var field_tc = this->da_members_[i]->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var field_tc = this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Recursive step. - CORBA_Any_var field_any = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var field_any = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_Message_Block *field_mb = field_any->_tao_get_cdr (); @@ -589,7 +589,7 @@ TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (field_tc.in (), &field_cdr, &out_cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -609,7 +609,7 @@ TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -620,11 +620,11 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs 0); } - CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean equivalent = tc->equivalent (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equivalent) @@ -639,15 +639,15 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs { rhs->seek (ACE_static_cast (CORBA::Long, i) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - tmp = rhs->current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Recursive step. member_equal = tmp->equal (this->da_members_[i].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!member_equal) @@ -660,7 +660,7 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynStruct_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -677,10 +677,10 @@ TAO_DynStruct_i::destroy (TAO_ENV_SINGLE_ARG_DECL) { this->set_flag (da_members_[i].in (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -689,7 +689,7 @@ TAO_DynStruct_i::destroy (TAO_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynStruct_i::current_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -718,7 +718,7 @@ TAO_DynStruct_i::current_component (TAO_ENV_SINGLE_ARG_DECL) this->set_flag (this->da_members_[index].in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); return DynamicAny::DynAny::_duplicate ( diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h index 8eec9567baa..d5354beb633 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.h +++ b/TAO/tao/DynamicAny/DynStruct_i.h @@ -53,24 +53,24 @@ public: // Destructor. void init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using just a TypeCode. void init (const CORBA_Any& any - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize using an Any. // = LocalObject methods. static TAO_DynStruct_i *_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); // = Functions specific to DynStruct. virtual DynamicAny::FieldName current_member_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -79,7 +79,7 @@ public: )); virtual CORBA::TCKind current_member_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -88,7 +88,7 @@ public: )); virtual DynamicAny::NameValuePairSeq *get_members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -96,7 +96,7 @@ public: virtual void set_members ( const DynamicAny::NameValuePairSeq& value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -105,7 +105,7 @@ public: )); virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -113,7 +113,7 @@ public: virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -125,7 +125,7 @@ public: virtual void from_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -134,7 +134,7 @@ public: )); virtual CORBA::Any * to_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -142,21 +142,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -166,7 +166,7 @@ public: private: // Check if the typecode is acceptable. void check_typecode (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL); + 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 7a5136e585f..f4983081d25 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -31,12 +31,12 @@ TAO_DynUnion_i::init_common (void) void TAO_DynUnion_i::init (const CORBA_Any& any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_union) @@ -53,16 +53,16 @@ TAO_DynUnion_i::init (const CORBA_Any& any // InconsistentTypeCode. this->set_from_any (any, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_union) @@ -76,22 +76,22 @@ TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc this->init_common (); CORBA::Any_var first_label = tc->member_label (this->current_position_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Initialize the discriminator to the label value of the first member. this->discriminator_ = TAO_DynAnyFactory::make_dyn_any (first_label.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var first_type = tc->member_type (this->current_position_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Recursively initialize the member to its default value. this->member_ = TAO_DynAnyFactory::make_dyn_any (first_type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -99,7 +99,7 @@ TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc TAO_DynUnion_i * TAO_DynUnion_i::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) { @@ -138,7 +138,7 @@ TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type) void TAO_DynUnion_i::set_from_any (const CORBA_Any & any, CORBA::Boolean from_factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -153,7 +153,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any, CORBA::TypeCode_var tc = any.type (); - CORBA_TypeCode_var disc_tc = tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var disc_tc = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA_Any disc_any (disc_tc.in (), @@ -164,22 +164,22 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } // Set the discriminator. this->discriminator_ = TAO_DynAnyFactory::make_dyn_any (disc_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Move to the next field in the CDR stream. (void) TAO_Marshal_Object::perform_skip (disc_tc.in (), &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean match = 0; @@ -189,12 +189,12 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; match = this->label_match (label_any.in (), disc_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (match) @@ -206,14 +206,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (match) { CORBA::TypeCode_var member_tc = tc->member_type (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA_Any member_any (member_tc.in (), @@ -223,7 +223,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any, this->member_ = TAO_DynAnyFactory::make_dyn_any (member_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->member_slot_ = i; @@ -236,10 +236,10 @@ 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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long default_index = unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (default_index == -1) @@ -259,7 +259,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any, default_index); CORBA::TypeCode_var default_tc = tc->member_type (index - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA_Any default_any (default_tc.in (), @@ -269,7 +269,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any, this->member_ = TAO_DynAnyFactory::make_dyn_any (default_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->member_slot_ = index; @@ -280,7 +280,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any, // **************************************************************** DynamicAny::DynAny_ptr -TAO_DynUnion_i::get_discriminator (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::get_discriminator (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -295,14 +295,14 @@ TAO_DynUnion_i::get_discriminator (TAO_ENV_SINGLE_ARG_DECL) // Set the flag so the caller can't destroy. this->set_flag (this->discriminator_.in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return DynamicAny::DynAny::_duplicate (this->discriminator_.in ()); } void TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -313,14 +313,14 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); } - CORBA::TypeCode_var tc = value->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = value->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::TypeCode_var disc_tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean equivalent = disc_tc->equivalent (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!equivalent) @@ -328,10 +328,10 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value ACE_THROW (DynamicAny::DynAny::TypeMismatch ()); } - CORBA_Any_var value_any = value->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong length = this->type_->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA_Any_var label_any; @@ -340,7 +340,7 @@ 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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean match = 0; @@ -348,12 +348,12 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value for (i = 0; i < length; ++i) { label_any = unaliased_tc->member_label (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; match = this->label_match (label_any.in (), value_any.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (match) @@ -373,21 +373,21 @@ 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 () - TAO_ENV_ARG_PARAMETER); + 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Initialize member to default value. this->member_ = TAO_DynAnyFactory::make_dyn_any (member_tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Named active member (CORBA 2.3.1). @@ -401,23 +401,23 @@ 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 () - TAO_ENV_ARG_PARAMETER); + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long default_index = unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->set_to_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else { - this->set_to_default_member (TAO_ENV_SINGLE_ARG_PARAMETER); + this->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->member_slot_ = ACE_static_cast (CORBA::ULong, @@ -427,15 +427,15 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->discriminator_ = value->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->discriminator_ = value->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -TAO_DynUnion_i::set_to_default_member (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -449,10 +449,10 @@ TAO_DynUnion_i::set_to_default_member (TAO_ENV_SINGLE_ARG_DECL) // default_index() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long default_index = unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (default_index == -1) @@ -467,14 +467,14 @@ TAO_DynUnion_i::set_to_default_member (TAO_ENV_SINGLE_ARG_DECL) CORBA::TypeCode_var default_tc = unaliased_tc->member_type (index - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->member_ = TAO_DynAnyFactory::make_dyn_any (default_tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Default member active (CORBA 2.3.1). @@ -486,7 +486,7 @@ TAO_DynUnion_i::set_to_default_member (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_DynUnion_i::set_to_no_active_member (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -500,10 +500,10 @@ TAO_DynUnion_i::set_to_no_active_member (TAO_ENV_SINGLE_ARG_DECL) // default_index() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = TAO_DynAnyFactory::strip_alias (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long default_index = unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Throw an exception is there is an explicit default case or if all @@ -514,19 +514,19 @@ TAO_DynUnion_i::set_to_no_active_member (TAO_ENV_SINGLE_ARG_DECL) } else { - CORBA::TypeCode_var disc_tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TCKind kind = TAO_DynAnyFactory::unalias (disc_tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind == CORBA::tk_enum) { - CORBA::ULong member_count = this->type_->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong member_count = this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong label_count = disc_tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong label_count = disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (member_count == label_count) @@ -542,7 +542,7 @@ TAO_DynUnion_i::set_to_no_active_member (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Boolean -TAO_DynUnion_i::has_no_active_member (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::has_no_active_member (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -559,7 +559,7 @@ TAO_DynUnion_i::has_no_active_member (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TCKind -TAO_DynUnion_i::discriminator_kind (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -570,18 +570,18 @@ TAO_DynUnion_i::discriminator_kind (TAO_ENV_SINGLE_ARG_DECL) CORBA::tk_null); } - CORBA_TypeCode_var tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); return retval; } DynamicAny::DynAny_ptr -TAO_DynUnion_i::member (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::member (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue @@ -594,7 +594,7 @@ TAO_DynUnion_i::member (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Boolean has_no_active_member = - this->has_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER); + this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); if (has_no_active_member) @@ -607,14 +607,14 @@ TAO_DynUnion_i::member (TAO_ENV_SINGLE_ARG_DECL) // Set the flag so the caller can't destroy. this->set_flag (this->member_.in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); return DynamicAny::DynAny::_duplicate (this->member_.in ()); } char * -TAO_DynUnion_i::member_name (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::member_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue @@ -627,7 +627,7 @@ TAO_DynUnion_i::member_name (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Boolean has_no_active_member = - this->has_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER); + this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (has_no_active_member) @@ -637,14 +637,14 @@ TAO_DynUnion_i::member_name (TAO_ENV_SINGLE_ARG_DECL) } const char *retval = this->type_->member_name (this->member_slot_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return CORBA::string_dup (retval); } CORBA::TCKind -TAO_DynUnion_i::member_kind (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue @@ -657,7 +657,7 @@ TAO_DynUnion_i::member_kind (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Boolean has_no_active_member = - this->has_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER); + this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); if (has_no_active_member) @@ -666,11 +666,11 @@ TAO_DynUnion_i::member_kind (TAO_ENV_SINGLE_ARG_DECL) CORBA::tk_null); } - CORBA_TypeCode_var tc = this->member_->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::tk_null); return retval; @@ -680,7 +680,7 @@ TAO_DynUnion_i::member_kind (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynUnion_i::from_any (const CORBA_Any& any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -694,7 +694,7 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any CORBA::TypeCode_var tc = any.type (); CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (equivalent) @@ -709,7 +709,7 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any // TypeMismatch. this->set_from_any (any, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -719,7 +719,7 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any } CORBA::Any_ptr -TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -734,10 +734,10 @@ TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL) // Add the discriminator to the CDR stream. - CORBA_TypeCode_var disc_tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA_Any_var disc_any = this->discriminator_->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var disc_any = this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_Message_Block *disc_mb = disc_any->_tao_get_cdr (); @@ -748,15 +748,15 @@ TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (disc_tc.in (), &disc_cdr, &out_cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Add the member to the CDR stream. - CORBA_TypeCode_var member_tc = this->member_->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_TypeCode_var member_tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA_Any_var member_any = this->member_->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var member_any = this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_Message_Block *member_mb = member_any->_tao_get_cdr (); @@ -767,7 +767,7 @@ TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL) (void) TAO_Marshal_Object::perform_append (member_tc.in (), &member_cdr, &out_cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Make the Any. @@ -787,7 +787,7 @@ TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -799,7 +799,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs } TAO_DynUnion_i *impl = TAO_DynUnion_i::_narrow (rhs - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (impl == 0) @@ -808,7 +808,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs } CORBA::Boolean equivalent = this->type_->equivalent (impl->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equivalent) @@ -817,12 +817,12 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs } CORBA::Boolean member_equal = this->member_->equal (impl->member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean disc_equal = this->discriminator_->equal (impl->discriminator_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); impl->_remove_ref (); @@ -831,7 +831,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynUnion_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -847,18 +847,18 @@ TAO_DynUnion_i::destroy (TAO_ENV_SINGLE_ARG_DECL) this->set_flag (this->member_.in (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->set_flag (this->discriminator_.in (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->discriminator_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->destroyed_ = 1; @@ -866,7 +866,7 @@ TAO_DynUnion_i::destroy (TAO_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynUnion_i::current_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -882,7 +882,7 @@ TAO_DynUnion_i::current_component (TAO_ENV_SINGLE_ARG_DECL) { this->set_flag (this->member_.in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); return DynamicAny::DynAny::_duplicate (this->member_.in ()); @@ -891,7 +891,7 @@ TAO_DynUnion_i::current_component (TAO_ENV_SINGLE_ARG_DECL) { this->set_flag (this->discriminator_.in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ()); return DynamicAny::DynAny::_duplicate (this->discriminator_.in ()); @@ -903,7 +903,7 @@ TAO_DynUnion_i::current_component (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynUnion_i::label_match (const CORBA_Any &my_any, const CORBA_Any &other_any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -914,7 +914,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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // No need to do any type checking - it was done before this diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h index 71824e6ce71..b5f5e412fd4 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.h +++ b/TAO/tao/DynamicAny/DynUnion_i.h @@ -50,23 +50,23 @@ public: ~TAO_DynUnion_i (void); // Destructor. - void init (const CORBA_Any& any TAO_ENV_ARG_DECL); + void init (const CORBA_Any& any ACE_ENV_ARG_DECL); // Constructor taking an Any argument. - void init (CORBA_TypeCode_ptr tc TAO_ENV_ARG_DECL); + void init (CORBA_TypeCode_ptr tc ACE_ENV_ARG_DECL); // Constructor taking a typecode argument. // = LocalObject methods. static TAO_DynUnion_i *_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); // = Functions specific to DynUnion. virtual DynamicAny::DynAny_ptr get_discriminator ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -74,7 +74,7 @@ public: virtual void set_discriminator ( DynamicAny::DynAny_ptr d - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -82,7 +82,7 @@ public: )); virtual void set_to_default_member ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -90,7 +90,7 @@ public: )); virtual void set_to_no_active_member ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -98,21 +98,21 @@ public: )); virtual CORBA::Boolean has_no_active_member ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::TCKind discriminator_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr member ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -120,7 +120,7 @@ public: )); virtual char * member_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -128,7 +128,7 @@ public: )); virtual CORBA::TCKind member_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -139,7 +139,7 @@ public: virtual void from_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -148,7 +148,7 @@ public: )); virtual CORBA::Any * to_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -156,21 +156,21 @@ public: virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -182,7 +182,7 @@ private: // function from_any(). void set_from_any (const CORBA_Any &any, CORBA::Boolean from_factory - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -195,7 +195,7 @@ private: // Iterative check for label value match. CORBA::Boolean label_match (const CORBA_Any &my_any, const CORBA_Any &other_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp index 64713cc43a9..076f39a2992 100644 --- a/TAO/tao/DynamicAny/DynamicAny.cpp +++ b/TAO/tao/DynamicAny/DynamicAny.cpp @@ -27,7 +27,7 @@ CORBA::Object_ptr TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr, int, char *[] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h index 9c6075c1211..44f32355ecb 100644 --- a/TAO/tao/DynamicAny/DynamicAny.h +++ b/TAO/tao/DynamicAny/DynamicAny.h @@ -36,7 +36,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv [] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Creates a DynamicAny factory and returns it. diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index c30a98feecd..9f70f76273f 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -140,10 +140,10 @@ DynamicAny::DynAny_var::tao_nil (void) ::DynamicAny::DynAny_ptr DynamicAny::DynAny_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::DynamicAny::DynAny::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::DynamicAny::DynAny::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -225,15 +225,15 @@ DynamicAny::DynAny::~DynAny (void) DynamicAny::DynAny_ptr DynamicAny::DynAny::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynAny::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return DynAny::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } DynamicAny::DynAny_ptr DynamicAny::DynAny::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -328,7 +328,7 @@ void DynamicAny::DynAny::InvalidValue::_raise () void DynamicAny::DynAny::InvalidValue::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -336,7 +336,7 @@ void DynamicAny::DynAny::InvalidValue::_tao_encode ( void DynamicAny::DynAny::InvalidValue::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -396,7 +396,7 @@ void DynamicAny::DynAny::TypeMismatch::_raise () void DynamicAny::DynAny::TypeMismatch::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -404,7 +404,7 @@ void DynamicAny::DynAny::TypeMismatch::_tao_encode ( void DynamicAny::DynAny::TypeMismatch::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -529,10 +529,10 @@ DynamicAny::DynFixed_var::tao_nil (void) ::DynamicAny::DynFixed_ptr DynamicAny::DynFixed_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::DynamicAny::DynFixed::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::DynamicAny::DynFixed::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -614,15 +614,15 @@ DynamicAny::DynFixed::~DynFixed (void) DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynFixed::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return DynFixed::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -794,10 +794,10 @@ DynamicAny::DynEnum_var::tao_nil (void) ::DynamicAny::DynEnum_ptr DynamicAny::DynEnum_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::DynamicAny::DynEnum::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::DynamicAny::DynEnum::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -879,15 +879,15 @@ DynamicAny::DynEnum::~DynEnum (void) DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynEnum::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return DynEnum::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1435,10 +1435,10 @@ DynamicAny::DynStruct_var::tao_nil (void) ::DynamicAny::DynStruct_ptr DynamicAny::DynStruct_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::DynamicAny::DynStruct::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::DynamicAny::DynStruct::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1520,15 +1520,15 @@ DynamicAny::DynStruct::~DynStruct (void) DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynStruct::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return DynStruct::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1700,10 +1700,10 @@ DynamicAny::DynUnion_var::tao_nil (void) ::DynamicAny::DynUnion_ptr DynamicAny::DynUnion_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::DynamicAny::DynUnion::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::DynamicAny::DynUnion::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1785,15 +1785,15 @@ DynamicAny::DynUnion::~DynUnion (void) DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynUnion::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return DynUnion::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2060,11 +2060,11 @@ TAO_NAMESPACE_END DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, target); - *tmp = DynamicAny::DynAny::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = DynamicAny::DynAny::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -2238,10 +2238,10 @@ DynamicAny::DynSequence_var::tao_nil (void) ::DynamicAny::DynSequence_ptr DynamicAny::DynSequence_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::DynamicAny::DynSequence::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::DynamicAny::DynSequence::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2323,15 +2323,15 @@ DynamicAny::DynSequence::~DynSequence (void) DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynSequence::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return DynSequence::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2503,10 +2503,10 @@ DynamicAny::DynArray_var::tao_nil (void) ::DynamicAny::DynArray_ptr DynamicAny::DynArray_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::DynamicAny::DynArray::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::DynamicAny::DynArray::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2588,15 +2588,15 @@ DynamicAny::DynArray::~DynArray (void) DynamicAny::DynArray_ptr DynamicAny::DynArray::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynArray::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return DynArray::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } DynamicAny::DynArray_ptr DynamicAny::DynArray::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2768,10 +2768,10 @@ DynamicAny::DynValue_var::tao_nil (void) ::DynamicAny::DynValue_ptr DynamicAny::DynValue_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::DynamicAny::DynValue::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::DynamicAny::DynValue::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2853,15 +2853,15 @@ DynamicAny::DynValue::~DynValue (void) DynamicAny::DynValue_ptr DynamicAny::DynValue::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynValue::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return DynValue::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } DynamicAny::DynValue_ptr DynamicAny::DynValue::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3033,10 +3033,10 @@ DynamicAny::DynAnyFactory_var::tao_nil (void) ::DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::DynamicAny::DynAnyFactory::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::DynamicAny::DynAnyFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3118,15 +3118,15 @@ DynamicAny::DynAnyFactory::~DynAnyFactory (void) DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynAnyFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return DynAnyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3221,7 +3221,7 @@ void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise () void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -3229,7 +3229,7 @@ void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_encode ( void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -3301,7 +3301,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -3392,7 +3392,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -3497,7 +3497,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::AnySeq { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index 22ddf3456b7..e7ced264d57 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -99,7 +99,7 @@ TAO_NAMESPACE DynamicAny static DynAny_ptr tao_duplicate (DynAny_ptr); static void tao_release (DynAny_ptr); static DynAny_ptr tao_nil (void); - static DynAny_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static DynAny_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -154,11 +154,11 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object static DynAny_ptr _duplicate (DynAny_ptr obj); static DynAny_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynAny_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynAny_ptr _nil (void) { @@ -188,12 +188,12 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static InvalidValue *_downcast (CORBA::Exception *); @@ -229,12 +229,12 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static TypeMismatch *_downcast (CORBA::Exception *); @@ -248,7 +248,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object #endif /* end #if !defined */ virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -256,7 +256,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void assign ( DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -265,7 +265,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void from_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -274,7 +274,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Any * to_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -282,21 +282,21 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual DynamicAny::DynAny_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -304,7 +304,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_boolean ( CORBA::Boolean value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -314,7 +314,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_octet ( CORBA::Octet value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -324,7 +324,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_char ( CORBA::Char value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -334,7 +334,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_short ( CORBA::Short value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -344,7 +344,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_ushort ( CORBA::UShort value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -354,7 +354,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_long ( CORBA::Long value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -364,7 +364,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_ulong ( CORBA::ULong value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -374,7 +374,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_float ( CORBA::Float value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -384,7 +384,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_double ( CORBA::Double value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -394,7 +394,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_string ( const char * value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -404,7 +404,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_reference ( CORBA::Object_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -414,7 +414,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_typecode ( CORBA::TypeCode_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -424,7 +424,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_longlong ( CORBA::LongLong value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -434,7 +434,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_ulonglong ( CORBA::ULongLong value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -444,7 +444,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_longdouble ( CORBA::LongDouble value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -454,7 +454,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_wchar ( CORBA::WChar value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -464,7 +464,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_wstring ( const CORBA::WChar * value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -474,7 +474,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -484,7 +484,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_dyn_any ( DynamicAny::DynAny_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -494,7 +494,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual void insert_val ( CORBA::ValueBase_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -503,7 +503,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Boolean get_boolean ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -512,7 +512,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Octet get_octet ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -521,7 +521,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Char get_char ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -530,7 +530,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Short get_short ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -539,7 +539,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::UShort get_ushort ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -548,7 +548,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Long get_long ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -557,7 +557,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::ULong get_ulong ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -566,7 +566,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Float get_float ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -575,7 +575,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Double get_double ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -584,7 +584,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual char * get_string ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -593,7 +593,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Object_ptr get_reference ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -602,7 +602,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::TypeCode_ptr get_typecode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -611,7 +611,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::LongLong get_longlong ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -620,7 +620,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::ULongLong get_ulonglong ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -629,7 +629,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::LongDouble get_longdouble ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -638,7 +638,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::WChar get_wchar ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -647,7 +647,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::WChar * get_wstring ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -656,7 +656,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::Any * get_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -665,7 +665,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual DynamicAny::DynAny_ptr get_dyn_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -674,7 +674,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object )) = 0; virtual CORBA::ValueBase_ptr get_val ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -684,35 +684,35 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object virtual CORBA::Boolean seek ( CORBA::Long index - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void rewind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Boolean next ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::ULong component_count ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual DynamicAny::DynAny_ptr current_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -774,7 +774,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object static DynFixed_ptr tao_duplicate (DynFixed_ptr); static void tao_release (DynFixed_ptr); static DynFixed_ptr tao_nil (void); - static DynFixed_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static DynFixed_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -829,11 +829,11 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny static DynFixed_ptr _duplicate (DynFixed_ptr obj); static DynFixed_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynFixed_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynFixed_ptr _nil (void) { @@ -841,7 +841,7 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny } virtual char * get_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -849,7 +849,7 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny virtual CORBA::Boolean set_value ( const char * val - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -912,7 +912,7 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny static DynEnum_ptr tao_duplicate (DynEnum_ptr); static void tao_release (DynEnum_ptr); static DynEnum_ptr tao_nil (void); - static DynEnum_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static DynEnum_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -967,11 +967,11 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny static DynEnum_ptr _duplicate (DynEnum_ptr obj); static DynEnum_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynEnum_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynEnum_ptr _nil (void) { @@ -979,7 +979,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny } virtual char * get_as_string ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -987,7 +987,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny virtual void set_as_string ( const char * value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -995,7 +995,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny )) = 0; virtual CORBA::ULong get_as_ulong ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1003,7 +1003,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny virtual void set_as_ulong ( CORBA::ULong value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1498,7 +1498,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny static DynStruct_ptr tao_duplicate (DynStruct_ptr); static void tao_release (DynStruct_ptr); static DynStruct_ptr tao_nil (void); - static DynStruct_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static DynStruct_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1553,11 +1553,11 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny static DynStruct_ptr _duplicate (DynStruct_ptr obj); static DynStruct_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynStruct_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynStruct_ptr _nil (void) { @@ -1565,7 +1565,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny } virtual char * current_member_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1574,7 +1574,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny )) = 0; virtual CORBA::TCKind current_member_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1583,7 +1583,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny )) = 0; virtual DynamicAny::NameValuePairSeq * get_members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1591,7 +1591,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny virtual void set_members ( const DynamicAny::NameValuePairSeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1600,7 +1600,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny )) = 0; virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1608,7 +1608,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1671,7 +1671,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny static DynUnion_ptr tao_duplicate (DynUnion_ptr); static void tao_release (DynUnion_ptr); static DynUnion_ptr tao_nil (void); - static DynUnion_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static DynUnion_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1726,11 +1726,11 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny static DynUnion_ptr _duplicate (DynUnion_ptr obj); static DynUnion_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynUnion_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynUnion_ptr _nil (void) { @@ -1738,7 +1738,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny } virtual DynamicAny::DynAny_ptr get_discriminator ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1746,7 +1746,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny virtual void set_discriminator ( DynamicAny::DynAny_ptr d - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1754,7 +1754,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny )) = 0; virtual void set_to_default_member ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1762,7 +1762,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny )) = 0; virtual void set_to_no_active_member ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1770,21 +1770,21 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny )) = 0; virtual CORBA::Boolean has_no_active_member ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TCKind discriminator_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual DynamicAny::DynAny_ptr member ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1792,7 +1792,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny )) = 0; virtual char * member_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1800,7 +1800,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny )) = 0; virtual CORBA::TCKind member_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2007,7 +2007,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; @@ -2163,7 +2163,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny static DynSequence_ptr tao_duplicate (DynSequence_ptr); static void tao_release (DynSequence_ptr); static DynSequence_ptr tao_nil (void); - static DynSequence_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static DynSequence_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -2218,11 +2218,11 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny static DynSequence_ptr _duplicate (DynSequence_ptr obj); static DynSequence_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynSequence_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynSequence_ptr _nil (void) { @@ -2230,7 +2230,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny } virtual CORBA::ULong get_length ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2238,7 +2238,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny virtual void set_length ( CORBA::ULong len - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2246,7 +2246,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny )) = 0; virtual DynamicAny::AnySeq * get_elements ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2254,7 +2254,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny virtual void set_elements ( const DynamicAny::AnySeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2263,7 +2263,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny )) = 0; virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2271,7 +2271,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2334,7 +2334,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny static DynArray_ptr tao_duplicate (DynArray_ptr); static void tao_release (DynArray_ptr); static DynArray_ptr tao_nil (void); - static DynArray_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static DynArray_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -2389,11 +2389,11 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny static DynArray_ptr _duplicate (DynArray_ptr obj); static DynArray_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynArray_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynArray_ptr _nil (void) { @@ -2401,7 +2401,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny } virtual DynamicAny::AnySeq * get_elements ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2409,7 +2409,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny virtual void set_elements ( const DynamicAny::AnySeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2418,7 +2418,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny )) = 0; virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2426,7 +2426,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2489,7 +2489,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny static DynValue_ptr tao_duplicate (DynValue_ptr); static void tao_release (DynValue_ptr); static DynValue_ptr tao_nil (void); - static DynValue_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static DynValue_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -2544,11 +2544,11 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny static DynValue_ptr _duplicate (DynValue_ptr obj); static DynValue_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynValue_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynValue_ptr _nil (void) { @@ -2556,7 +2556,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny } virtual char * current_member_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2565,7 +2565,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny )) = 0; virtual CORBA::TCKind current_member_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2574,7 +2574,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny )) = 0; virtual DynamicAny::NameValuePairSeq * get_members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2582,7 +2582,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny virtual void set_members ( const DynamicAny::NameValuePairSeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2591,7 +2591,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny )) = 0; virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2599,7 +2599,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2662,7 +2662,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny static DynAnyFactory_ptr tao_duplicate (DynAnyFactory_ptr); static void tao_release (DynAnyFactory_ptr); static DynAnyFactory_ptr tao_nil (void); - static DynAnyFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static DynAnyFactory_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -2717,11 +2717,11 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object static DynAnyFactory_ptr _duplicate (DynAnyFactory_ptr obj); static DynAnyFactory_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynAnyFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static DynAnyFactory_ptr _nil (void) { @@ -2751,12 +2751,12 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static InconsistentTypeCode *_downcast (CORBA::Exception *); @@ -2771,7 +2771,7 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object virtual DynamicAny::DynAny_ptr create_dyn_any ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2780,7 +2780,7 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code ( CORBA::TypeCode_ptr type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i index 240bb96c9c9..7451357d1e2 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.i +++ b/TAO/tao/DynamicAny/DynamicAnyC.i @@ -58,10 +58,10 @@ tao_DynamicAny_DynAny_nil ( ACE_INLINE DynamicAny::DynAny_ptr tao_DynamicAny_DynAny_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynamicAny::DynAny::_narrow (p TAO_ENV_ARG_PARAMETER); + return DynamicAny::DynAny::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -108,10 +108,10 @@ tao_DynamicAny_DynFixed_nil ( ACE_INLINE DynamicAny::DynFixed_ptr tao_DynamicAny_DynFixed_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynamicAny::DynFixed::_narrow (p TAO_ENV_ARG_PARAMETER); + return DynamicAny::DynFixed::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -158,10 +158,10 @@ tao_DynamicAny_DynEnum_nil ( ACE_INLINE DynamicAny::DynEnum_ptr tao_DynamicAny_DynEnum_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynamicAny::DynEnum::_narrow (p TAO_ENV_ARG_PARAMETER); + return DynamicAny::DynEnum::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1382,10 +1382,10 @@ tao_DynamicAny_DynStruct_nil ( ACE_INLINE DynamicAny::DynStruct_ptr tao_DynamicAny_DynStruct_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynamicAny::DynStruct::_narrow (p TAO_ENV_ARG_PARAMETER); + return DynamicAny::DynStruct::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1432,10 +1432,10 @@ tao_DynamicAny_DynUnion_nil ( ACE_INLINE DynamicAny::DynUnion_ptr tao_DynamicAny_DynUnion_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynamicAny::DynUnion::_narrow (p TAO_ENV_ARG_PARAMETER); + return DynamicAny::DynUnion::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -2250,10 +2250,10 @@ tao_DynamicAny_DynSequence_nil ( ACE_INLINE DynamicAny::DynSequence_ptr tao_DynamicAny_DynSequence_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynamicAny::DynSequence::_narrow (p TAO_ENV_ARG_PARAMETER); + return DynamicAny::DynSequence::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -2300,10 +2300,10 @@ tao_DynamicAny_DynArray_nil ( ACE_INLINE DynamicAny::DynArray_ptr tao_DynamicAny_DynArray_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynamicAny::DynArray::_narrow (p TAO_ENV_ARG_PARAMETER); + return DynamicAny::DynArray::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -2350,10 +2350,10 @@ tao_DynamicAny_DynValue_nil ( ACE_INLINE DynamicAny::DynValue_ptr tao_DynamicAny_DynValue_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynamicAny::DynValue::_narrow (p TAO_ENV_ARG_PARAMETER); + return DynamicAny::DynValue::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -2404,10 +2404,10 @@ tao_DynamicAny_DynAnyFactory_nil ( ACE_INLINE DynamicAny::DynAnyFactory_ptr tao_DynamicAny_DynAnyFactory_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return DynamicAny::DynAnyFactory::_narrow (p TAO_ENV_ARG_PARAMETER); + return DynamicAny::DynAnyFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp index aa1d1a9fc86..81ff11e648d 100644 --- a/TAO/tao/DynamicC.cpp +++ b/TAO/tao/DynamicC.cpp @@ -658,7 +658,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Parameter { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (Dynamic::_tc_Parameter TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (Dynamic::_tc_Parameter ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -749,7 +749,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Parameter { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (Dynamic::_tc_ParameterList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (Dynamic::_tc_ParameterList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -840,7 +840,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Exception { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (Dynamic::_tc_ExceptionList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (Dynamic::_tc_ExceptionList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 6a30a7ff6bb..2b84e02b54c 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -55,7 +55,7 @@ CORBA_Context::_decr_refcnt (void) } const char * -CORBA_Context::context_name (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_Context::context_name (ACE_ENV_SINGLE_ARG_DECL) const { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), @@ -63,7 +63,7 @@ CORBA_Context::context_name (TAO_ENV_SINGLE_ARG_DECL) const } CORBA_Context_ptr -CORBA_Context::parent (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_Context::parent (ACE_ENV_SINGLE_ARG_DECL) const { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), @@ -73,7 +73,7 @@ CORBA_Context::parent (TAO_ENV_SINGLE_ARG_DECL) const void CORBA_Context::create_child (const char * /* child_ctx_name */, CORBA_Context_out /* child_ctx */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); @@ -82,7 +82,7 @@ CORBA_Context::create_child (const char * /* child_ctx_name */, void CORBA_Context::set_one_value (const char * /* propname */, const CORBA_Any & /* propvalue */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); @@ -90,7 +90,7 @@ CORBA_Context::set_one_value (const char * /* propname */, void CORBA_Context::set_values (CORBA::NVList_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); @@ -98,7 +98,7 @@ CORBA_Context::set_values (CORBA::NVList_ptr void CORBA_Context::delete_values (const char * /* propname */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); @@ -109,7 +109,7 @@ CORBA_Context::get_values (const char * /* start_scope */, CORBA::Flags /* op_flags */, const char * /* pattern */, CORBA::NVList_ptr & /* values */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); @@ -154,7 +154,7 @@ CORBA_ContextList::add_consume (char *ctx) char * CORBA_ContextList::item (CORBA::ULong slot - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { char **ctx = 0; @@ -171,7 +171,7 @@ CORBA_ContextList::item (CORBA::ULong slot void CORBA_ContextList::remove (CORBA::ULong - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT ()); } diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index d91e03553f9..30420007698 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -63,29 +63,29 @@ public: // = All the spec-required functions below will just throw a // CORBA::NO_IMPLEMENT exception and do nothing else. - const char *context_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + const char *context_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; - CORBA_Context_ptr parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA_Context_ptr parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; void create_child (const char *child_ctx_name, CORBA_Context_out child_ctx - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void set_one_value (const char *propname, const CORBA_Any &propvalue - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void set_values (CORBA::NVList_ptr values - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void delete_values (const char *propname - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void get_values (const char *start_scope, CORBA::Flags op_flags, const char *pattern, CORBA::NVList_ptr &values - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 typedef CORBA_Context_ptr _ptr_type; @@ -206,11 +206,11 @@ public: // Add and consume a string to the list. char *item (CORBA::ULong slot - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Return the typecode at slot i. Raises the "Bounds" exception. void remove (CORBA::ULong slot - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Remove the typecode at slot i. Raises the "Bounds" exception. void _incr_refcnt (void); diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index ef3981b31a3..24aa5a7b225 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -17,11 +17,11 @@ ACE_RCSID(DynamicInterface, DII_Invocation, "$Id$") int TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UnknownUserException)) { int retval = this->invoke_i (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (retval); // A TAO_INVOKE_EXCEPTION status, but no exception raised means that @@ -52,10 +52,10 @@ TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions i++) { CORBA::TypeCode_ptr tcp = exceptions->item (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); - const char *xid = tcp->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *xid = tcp->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); if (ACE_OS::strcmp (buf.in (), xid) != 0) @@ -95,15 +95,15 @@ TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions //*************************************************************************** int -TAO_GIOP_DII_Deferred_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_DII_Deferred_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->invoke_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->invoke_i (ACE_ENV_SINGLE_ARG_PARAMETER); } int -TAO_GIOP_DII_Deferred_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_DII_Deferred_Invocation::invoke_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Register a reply dispatcher for this Asynch_Invocation. Use the @@ -123,7 +123,7 @@ TAO_GIOP_DII_Deferred_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL) // Just send the request, without trying to wait for the reply. retval = TAO_GIOP_Invocation::invoke (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (retval); if (retval != TAO_INVOKE_OK) diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h index e1eb48df110..28deb8f2c8f 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.h +++ b/TAO/tao/DynamicInterface/DII_Invocation.h @@ -55,7 +55,7 @@ public: // Constructor. int invoke (CORBA::ExceptionList_ptr exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException)); // Send request, block until any reply comes back, and unmarshal // reply parameters as appropriate. @@ -84,13 +84,13 @@ public: int byte_order = TAO_ENCAP_BYTE_ORDER); // Constructor. - int invoke (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + int invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Send request, block until any reply comes back, and unmarshal // reply parameters as appropriate. private: - int invoke_i (TAO_ENV_SINGLE_ARG_DECL) + int invoke_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Implementation of the invoke() methods, handles the basic // send/reply code and the system exceptions. diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index c04d152b3aa..c2fc76d9ff8 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -85,7 +85,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( // Call the Request back and send the reply data. this->req_->handle_response (this->reply_cdr_, this->reply_status_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -117,7 +117,7 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) TAO_OutputCDR out_cdr; comm_failure._tao_encode (out_cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Turn into an output CDR @@ -125,7 +125,7 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) this->req_->handle_response (cdr, TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index 9259196a33e..1b787582d7f 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -28,7 +28,7 @@ TAO_Dynamic_Adapter_Impl::create_request ( CORBA::ExceptionList_ptr exceptions, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_NEW_THROW_EX (request, @@ -39,7 +39,7 @@ TAO_Dynamic_Adapter_Impl::create_request ( result, req_flags, exceptions - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ( CORBA_SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, @@ -53,14 +53,14 @@ CORBA::Request_ptr TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const char *operation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Request_ptr req = CORBA::Request::_nil (); ACE_NEW_THROW_EX (req, CORBA::Request (obj, orb, operation - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ( CORBA_SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, @@ -121,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 - TAO_ENV_ARG_DECL + 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 f391374ba95..b0c00db0c16 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h @@ -56,12 +56,12 @@ public: CORBA::ExceptionList_ptr exceptions, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA::Request_ptr request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const char *op - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest. @@ -80,7 +80,7 @@ public: // CORBA::ORB::create_exception_list. virtual void create_exception_list (CORBA::ExceptionList_ptr &list - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // 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 4d0781d9804..72c13e14d15 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -11,13 +11,13 @@ ACE_RCSID(DynamicInterface, Dynamic_Implementation, "$Id$") #include "tao/PortableServer/Collocated_Object.h" CORBA::Object_ptr -TAO_DynamicImplementation::_this (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynamicImplementation::_this (ACE_ENV_SINGLE_ARG_DECL) { // 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Create a object. @@ -48,7 +48,7 @@ TAO_DynamicImplementation::_downcast (const char *repository_id) } TAO_Stub * -TAO_DynamicImplementation::_create_stub (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL) { // If DynamicImplementation::_this() is invoked outside of the // context of a request invocation on a target object being served @@ -65,30 +65,30 @@ TAO_DynamicImplementation::_create_stub (TAO_ENV_SINGLE_ARG_DECL) 0); } - PortableServer::POA_var poa = poa_current_impl->get_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = poa_current_impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::RepositoryId pinterface = this->_primary_interface (poa_current_impl->object_id (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::PolicyList_var client_exposed_policies = poa_current_impl->poa ()->client_exposed_policies - (poa_current_impl->priority () TAO_ENV_ARG_PARAMETER); + (poa_current_impl->priority () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return poa_current_impl->poa ()->key_to_stub (poa_current_impl->object_key (), pinterface, poa_current_impl->priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, void * /* context */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // No need to do any of this if the client isn't waiting. if (request.response_expected ()) @@ -121,13 +121,13 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, { // Delegate to user. this->invoke (dsi_request - TAO_ENV_ARG_PARAMETER); + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + dsi_request->dsi_marshal (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index 751aedc1da3..a9199f2e455 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -42,7 +42,7 @@ class TAO_DynamicInterface_Export TAO_DynamicImplementation // circumstances may lead to unpredictable results. public: virtual void invoke (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; // The invoke() method receives requests issued to any CORBA object // incarnated by the DSI servant and performs the processing // necessary to execute the request. @@ -50,13 +50,13 @@ public: virtual CORBA::RepositoryId _primary_interface ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; // The _primary_interface() method receives an ObjectId value and a // POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. - CORBA::Object_ptr _this (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::Object_ptr _this (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Returns a CORBA::Object_ptr for the target object. protected: @@ -67,12 +67,12 @@ protected: virtual void *_downcast (const char *repository_id); // Simply returns "this" - virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // This is an auxiliary method for _this() and _narrow(). virtual void _dispatch (TAO_ServerRequest &request, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Turns around and calls invoke. }; diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index d399a022e06..7167280aafd 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -50,7 +50,7 @@ CORBA_ExceptionList::add_consume (CORBA::TypeCode_ptr tc) CORBA::TypeCode_ptr CORBA_ExceptionList::item (CORBA::ULong slot - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_ptr *tc = 0; @@ -67,7 +67,7 @@ CORBA_ExceptionList::item (CORBA::ULong slot void CORBA_ExceptionList::remove (CORBA::ULong - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT ()); } diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 9ec372f2b31..90cc3d737a2 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -76,11 +76,11 @@ public: // Add and consume a TypeCode to the list. CORBA::TypeCode_ptr item (CORBA::ULong slot - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Return the typecode at slot i. Raises the "Bounds" exception. void remove (CORBA::ULong slot - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Remove the typecode at slot i. Raises the "Bounds" exception. void _incr_refcnt (void); diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 4f4c740b39a..0060fa8fe11 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -65,7 +65,7 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj, CORBA::NamedValue_ptr result, CORBA::Flags flags, CORBA::ExceptionList_ptr exceptions - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) : orb_ (CORBA::ORB::_duplicate (orb)), args_ (CORBA::NVList::_duplicate (args)), result_ (CORBA::NamedValue::_duplicate (result)), @@ -95,7 +95,7 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj, CORBA_Request::CORBA_Request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const CORBA::Char *op - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) : orb_ (CORBA::ORB::_duplicate (orb)), flags_ (0), // env_ (env), @@ -141,7 +141,7 @@ CORBA_Request::~CORBA_Request (void) // flow in some exotic situations. void -CORBA_Request::invoke (TAO_ENV_SINGLE_ARG_DECL) +CORBA_Request::invoke (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean argument_flag = this->args_->_lazy_has_arguments (); @@ -156,25 +156,25 @@ CORBA_Request::invoke (TAO_ENV_SINGLE_ARG_DECL) // Loop as needed for forwarding. for (;;) { - call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + call.start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; call.prepare_header (ACE_static_cast (CORBA::Octet, flag) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->args_->_tao_encode (call.out_stream (), this->orb_->orb_core (), CORBA::ARG_IN | CORBA::ARG_INOUT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Make the call ... blocking for the response. int status = call.invoke (this->exceptions_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (status == TAO_INVOKE_RESTART) @@ -217,18 +217,18 @@ CORBA_Request::invoke (TAO_ENV_SINGLE_ARG_DECL) if (this->result_ != 0) { this->result_->value ()->_tao_decode (call.inp_stream () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } this->args_->_tao_incoming_cdr (call.inp_stream (), CORBA::ARG_OUT | CORBA::ARG_INOUT, this->lazy_evaluation_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void -CORBA_Request::send_oneway (TAO_ENV_SINGLE_ARG_DECL) +CORBA_Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean argument_flag = this->args_->_lazy_has_arguments (); @@ -242,23 +242,23 @@ CORBA_Request::send_oneway (TAO_ENV_SINGLE_ARG_DECL) // Loop as needed for forwarding. for (;;) { - call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + call.start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Octet response_flag = ACE_static_cast (CORBA::Octet, call.sync_scope ()); call.prepare_header (response_flag - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->args_->_tao_encode (call.out_stream (), this->orb_->orb_core (), CORBA::ARG_IN | CORBA::ARG_INOUT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - int status = call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + int status = call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (status == TAO_INVOKE_RESTART) @@ -288,7 +288,7 @@ CORBA_Request::send_oneway (TAO_ENV_SINGLE_ARG_DECL) } void -CORBA_Request::send_deferred (TAO_ENV_SINGLE_ARG_DECL) +CORBA_Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL) { { ACE_GUARD (TAO_SYNCH_MUTEX, @@ -309,23 +309,23 @@ CORBA_Request::send_deferred (TAO_ENV_SINGLE_ARG_DECL) // Loop as needed for forwarding. for (;;) { - call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + call.start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; call.prepare_header (ACE_static_cast (CORBA::Octet, flag) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->args_->_tao_encode (call.out_stream (), this->orb_->orb_core (), CORBA::ARG_IN | CORBA::ARG_INOUT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Make the call without blocking. - CORBA::ULong status = call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong status = call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (status == TAO_INVOKE_RESTART) @@ -349,7 +349,7 @@ CORBA_Request::send_deferred (TAO_ENV_SINGLE_ARG_DECL) } void -CORBA_Request::get_response (TAO_ENV_SINGLE_ARG_DECL) +CORBA_Request::get_response (ACE_ENV_SINGLE_ARG_DECL) { while (!this->response_received_) { @@ -358,13 +358,13 @@ CORBA_Request::get_response (TAO_ENV_SINGLE_ARG_DECL) if (this->lazy_evaluation_) { - this->args_->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->args_->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } CORBA::Boolean -CORBA_Request::poll_response (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA_Request::poll_response (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, @@ -377,7 +377,7 @@ CORBA_Request::poll_response (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void CORBA_Request::handle_response (TAO_InputCDR &incoming, CORBA::ULong reply_status - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If this request was created by a gateway, then result_ // and/or args_ are shared by a CORBA::ServerRequest, whose @@ -391,14 +391,14 @@ CORBA_Request::handle_response (TAO_InputCDR &incoming, if (this->result_ != 0) { this->result_->value ()->_tao_decode (incoming - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } this->args_->_tao_incoming_cdr (incoming, CORBA::ARG_OUT | CORBA::ARG_INOUT, this->lazy_evaluation_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; { diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 444a4504224..f6f2142fcb7 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -99,7 +99,7 @@ public: CORBA_Any &return_value (void); // Returns reference to Any for extraction using >>=. - void invoke (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Perform method resolution and invoke an appropriate method. If // the method returns successfully, its result is placed in the // result argument specified on <create_request>. The behavior is @@ -109,20 +109,20 @@ public: // A default argument is set, but please note that this not recommended // as the user may not be able to propagate the exceptions - void send_oneway (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void send_oneway (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Send a oneway request. // A default argument is set, but please note that this not recommended // as the user may not be able to propagate the exceptions. // The 'deferred synchronous' methods. - void send_deferred (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - void get_response (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - CORBA::Boolean poll_response (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + 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); // Callback method for deferred synchronous requests. void handle_response (TAO_InputCDR &incoming, CORBA::ULong reply_status - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Pseudo object methods. static CORBA_Request* _duplicate (CORBA_Request*); @@ -166,12 +166,12 @@ private: CORBA::NamedValue_ptr result, CORBA::Flags flags, CORBA::ExceptionList_ptr exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA_Request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const CORBA::Char *op - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); ~CORBA_Request (void); diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index d1bf04b3716..ad34953722a 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -66,42 +66,42 @@ ACE_INLINE CORBA_Any & CORBA_Request::add_in_arg (void) { ACE_DECLARE_NEW_CORBA_ENV; - return this->args_->add_element (CORBA::ARG_IN TAO_ENV_ARG_PARAMETER)->any_; + return this->args_->add_element (CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->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 TAO_ENV_ARG_PARAMETER)->any_; + return this->args_->add_item (name, CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->any_; } ACE_INLINE CORBA_Any & CORBA_Request::add_inout_arg (void) { ACE_DECLARE_NEW_CORBA_ENV; - return this->args_->add_element (CORBA::ARG_INOUT TAO_ENV_ARG_PARAMETER)->any_; + return this->args_->add_element (CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->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 TAO_ENV_ARG_PARAMETER)->any_; + return this->args_->add_item (name, CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->any_; } ACE_INLINE CORBA_Any & CORBA_Request::add_out_arg (void) { ACE_DECLARE_NEW_CORBA_ENV; - return this->args_->add_element (CORBA::ARG_OUT TAO_ENV_ARG_PARAMETER)->any_; + return this->args_->add_element (CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->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 TAO_ENV_ARG_PARAMETER)->any_; + return this->args_->add_item (name, CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->any_; } ACE_INLINE void diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index d214ee8e150..914ad1ad6cc 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -78,7 +78,7 @@ CORBA_ServerRequest::~CORBA_ServerRequest (void) // inout/out/return values later on. void CORBA_ServerRequest::arguments (CORBA::NVList_ptr &list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // arguments() must be called before either of these. if (this->params_ != 0 || this->exception_ != 0) @@ -92,7 +92,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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Pass this alignment back to the TAO_ServerRequest. this->orb_server_request_.dsi_nvlist_align ( @@ -105,7 +105,7 @@ 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 - TAO_ENV_ARG_DECL) + 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. @@ -120,7 +120,7 @@ CORBA_ServerRequest::set_result (const CORBA::Any &value ACE_CHECK; } - // NOTE: if "TAO_ENV_SINGLE_ARG_PARAMETER" is set, there has been a system exception, + // NOTE: if "ACE_ENV_SINGLE_ARG_PARAMETER" 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. @@ -130,7 +130,7 @@ CORBA_ServerRequest::set_result (const CORBA::Any &value // Store the exception value. void CORBA_ServerRequest::set_exception (const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tc = value.type (); @@ -152,7 +152,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 (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ServerRequest::dsi_marshal (ACE_ENV_SINGLE_ARG_DECL) { // There was a user exception, no need to marshal any parameters. if (this->sent_gateway_exception_) @@ -176,7 +176,7 @@ CORBA_ServerRequest::dsi_marshal (TAO_ENV_SINGLE_ARG_DECL) this->retval_->_tao_encode ( this->orb_server_request_.outgoing (), this->orb_server_request_.orb_core () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; } @@ -188,7 +188,7 @@ CORBA_ServerRequest::dsi_marshal (TAO_ENV_SINGLE_ARG_DECL) this->orb_server_request_.outgoing (), this->orb_server_request_.orb_core (), CORBA::ARG_INOUT | CORBA::ARG_OUT - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; } @@ -204,7 +204,7 @@ CORBA_ServerRequest::dsi_marshal (TAO_ENV_SINGLE_ARG_DECL) this->exception_->_tao_encode ( this->orb_server_request_.outgoing (), this->orb_server_request_.orb_core () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; } diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index a356d8abc15..41baee8661a 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -53,13 +53,13 @@ public: // Destructor. void arguments (CORBA::NVList_ptr &list - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Implementation uses this to provide the ORB with the operation's // parameter list ... on return, their values are available; the // list fed in has typecodes and (perhap) memory assigned. void set_result (const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Implementation uses this to provide the operation result // ... illegal if exception() was called or params() was not called. // @@ -67,7 +67,7 @@ public: // sent when this returns, and reclaim memory it allocated. void set_exception (const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Implementation uses this to provide the exception value which is // the only result of this particular invocation. // @@ -83,7 +83,7 @@ public: // this stuff is a catastrophic error since this is all part of the // basic CORBA Object Model. - void dsi_marshal (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void dsi_marshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Marshal outgoing parameters. 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 ddbb5fbec54..7ba4063eb33 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -69,7 +69,7 @@ CORBA_UnknownUserException::_raise (void) void CORBA_UnknownUserException::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -77,7 +77,7 @@ CORBA_UnknownUserException::_tao_encode ( void CORBA_UnknownUserException::_tao_decode (TAO_InputCDR & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::MARSHAL ()); } diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index dd9585ba144..8d2a8cd7c0f 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -74,9 +74,9 @@ public: virtual void _raise (void); virtual void _tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; virtual void _tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Narrow to an UnknowUserException. static CORBA_UnknownUserException *_downcast (CORBA_Exception *ex); diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp index b7840508950..41fc84598b1 100644 --- a/TAO/tao/Dynamic_Adapter.cpp +++ b/TAO/tao/Dynamic_Adapter.cpp @@ -22,7 +22,7 @@ TAO_Dynamic_Adapter::create_request ( CORBA::ExceptionList_ptr /* exceptions */, CORBA::Request_ptr & /* request */, CORBA::Flags /* req_flags */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) { } @@ -31,7 +31,7 @@ CORBA::Request_ptr TAO_Dynamic_Adapter::request (CORBA::Object_ptr /* obj */, CORBA::ORB_ptr /* orb */, const char * /* op */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) { return 0; } @@ -71,7 +71,7 @@ TAO_Dynamic_Adapter::server_request_release (CORBA::ServerRequest_ptr) void TAO_Dynamic_Adapter::create_exception_list (CORBA::ExceptionList_ptr & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h index 957a46aa579..d8a61b93d2f 100644 --- a/TAO/tao/Dynamic_Adapter.h +++ b/TAO/tao/Dynamic_Adapter.h @@ -50,12 +50,12 @@ public: CORBA::ExceptionList_ptr exceptions, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA::Request_ptr request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const char *op - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest. @@ -73,7 +73,7 @@ public: // CORBA::ORB::create_exception_list. virtual void create_exception_list (CORBA::ExceptionList_ptr & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; #include "ace/post.h" diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h index 933b87bc233..c25f2585e3d 100644 --- a/TAO/tao/Endpoint_Selector_Factory.h +++ b/TAO/tao/Endpoint_Selector_Factory.h @@ -58,7 +58,7 @@ public: /// initialize the endpoint selection state instance. virtual TAO_Invocation_Endpoint_Selector *get_selector ( TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; #include "ace/post.h" diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index d347c310b45..902a399b26f 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -286,7 +286,7 @@ CORBA_SystemException::_downcast (CORBA_Exception* exception) void CORBA_SystemException::_tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (cdr.write_string (this->_id ()) && cdr.write_ulong (this->minor ()) @@ -297,7 +297,7 @@ CORBA_SystemException::_tao_encode (TAO_OutputCDR &cdr void CORBA_SystemException::_tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The string is read by the caller, to determine the exact type of // the exception. We just decode the fields... @@ -826,7 +826,7 @@ CORBA_SystemException::_tao_get_omg_exception_description ( void TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Create the TypeCode for the CORBA_UnknownUserException. @@ -882,7 +882,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, const char *name, char *buffer, size_t buflen - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This function must only be called ONCE, and with a global lock // held! The <CORBA::ORB_init> method is responsible for ensuring @@ -1032,7 +1032,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, #undef TAO_TC_BUF_LEN void -TAO_Exceptions::init (TAO_ENV_SINGLE_ARG_DECL) +TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL) { // This routine should only be called once. @@ -1052,18 +1052,18 @@ TAO_Exceptions::init (TAO_ENV_SINGLE_ARG_DECL) #name, \ (char*)tc_buf_##name, \ sizeof(tc_buf_##name) \ - TAO_ENV_ARG_PARAMETER); \ + ACE_ENV_ARG_PARAMETER); \ ACE_CHECK; STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_SystemException * TAO_Exceptions::create_system_exception (const char *id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { #define TAO_SYSTEM_EXCEPTION(name) \ { \ @@ -1159,11 +1159,11 @@ tao_insert_for_insertion_system_exception (CORBA::Any &any, const CORBA::SystemException &ex, const char *msg) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_OutputCDR stream; - ex._tao_encode (stream TAO_ENV_ARG_PARAMETER); + ex._tao_encode (stream ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; any._tao_replace (ex._type (), TAO_ENCAP_BYTE_ORDER, @@ -1195,11 +1195,11 @@ tao_insert_system_exception (CORBA::Any &any, CORBA::Any::_tao_destructor destructor, const char *msg) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_OutputCDR stream; - ex->_tao_encode (stream TAO_ENV_ARG_PARAMETER); + ex->_tao_encode (stream ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; any._tao_replace (ex->_type (), TAO_ENCAP_BYTE_ORDER, @@ -1249,12 +1249,12 @@ tao_insert_in_extractor_system_exception ( const char *compare_IR_Id, const char *msg) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::TypeCode_var type = any.type (); CORBA::Boolean equiv = - type->equivalent (tc_name TAO_ENV_ARG_PARAMETER); + type->equivalent (tc_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!equiv) return 0; @@ -1276,7 +1276,7 @@ tao_insert_in_extractor_system_exception ( compare_IR_Id)) return 0; CORBA::SystemException *tmp = allocator (); - tmp->_tao_decode (stream TAO_ENV_ARG_PARAMETER); + tmp->_tao_decode (stream ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ((CORBA::Any *)&any)->_tao_replace ( tc_name, diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 4e243bba2cb..3dce5909d54 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -93,9 +93,9 @@ public: virtual ACE_CString _info (void) const = 0; virtual void _tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED) const = 0; + ACE_ENV_ARG_DECL_NOT_USED) const = 0; virtual void _tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; /// Used in the non-copying Any insertion operator. static void _tao_any_destructor (void *); @@ -227,9 +227,9 @@ public: virtual ACE_CString _info (void) const; virtual void _tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED) const; + ACE_ENV_ARG_DECL_NOT_USED) const; virtual void _tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Helper to create a minor status value. static CORBA::ULong _tao_minor_code (u_int location, @@ -343,16 +343,16 @@ public: const char *name, char *buf, size_t buflen - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Make the TypeCode for the CORBA::UnknownUserException standard /// exception. static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Runtime initialization of all standard exception typecodes. /// Called from <CORBA::ORB_init>. - static void init (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + static void init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Runtime finalization of all standard exception typecodes. static void fini (void); @@ -360,7 +360,7 @@ public: /// Create a CORBA::SystemException given the interface repository ID. static CORBA_SystemException *create_system_exception ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index 8ddad3a1661..c4f5a9ecc13 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -31,7 +31,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Skip the prefix, we know it is there because this method in only @@ -54,7 +54,7 @@ TAO_FILE_Parser::parse_string (const char *ior, CORBA::Object_ptr object = CORBA::Object::_nil (); ACE_TRY { - object = orb->string_to_object (string TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object (string ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; reader.alloc ()->free (string); diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h index 17729ceca1b..1eefc4d865f 100644 --- a/TAO/tao/FILE_Parser.h +++ b/TAO/tao/FILE_Parser.h @@ -45,7 +45,7 @@ public: virtual int match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index 99d04588f7c..73dbf1111fa 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -402,7 +402,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, GIOP::IORAddressingInfo { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (GIOP::_tc_IORAddressingInfo TAO_ENV_ARG_PARAMETER); + type->equivalent (GIOP::_tc_IORAddressingInfo ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -506,7 +506,7 @@ CORBA::Boolean operator>>= ( { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (GIOP::_tc_TargetAddress TAO_ENV_ARG_PARAMETER); + type->equivalent (GIOP::_tc_TargetAddress ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 33348b40e39..589f8f80633 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -133,14 +133,14 @@ TAO_GIOP_Message_Base::generate_reply_header ( -1); } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Now call the implementation for the rest of the header int result = this->generator_parser_->write_reply_header (cdr, params - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -700,14 +700,14 @@ TAO_GIOP_Message_Base::generate_exception_reply ( { // A new try/catch block, but if something goes wrong now we have no // hope, just abort. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Make the GIOP & reply header. this->generate_reply_header (cdr, params); - x._tao_encode (cdr TAO_ENV_ARG_PARAMETER); + x._tao_encode (cdr ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA_Exception, ex) @@ -780,7 +780,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, int parse_error = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { parse_error = @@ -801,7 +801,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, this->orb_core_, request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (forward_to.in ())) @@ -967,7 +967,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, CORBA::Boolean response_required = 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { int parse_error = @@ -1014,7 +1014,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, this->orb_core_, server_request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (forward_to.in ())) diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index c7c814d18a9..56112d3c178 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -68,7 +68,7 @@ public: virtual int write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; /// Writes the locate _reply message in to the <output> diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index b822e7751ab..8a9d0e3e67c 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -117,14 +117,14 @@ int TAO_GIOP_Message_Generator_Parser_10::write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - TAO_ENV_ARG_DECL + 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 (); - TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #else if (reply.is_dsi_ == 0) { @@ -321,7 +321,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header ( // the reference count on the CDR message block, because this key // will not outlive the request (or the message block). - hdr_status = + hdr_status = hdr_status && request.profile ().unmarshall_object_key (input); if (input.char_translator () == 0) @@ -397,7 +397,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_locate_header ( request.request_id (req_id); // Get the object key - hdr_status = + hdr_status = hdr_status && request.profile ().unmarshall_object_key (msg); return hdr_status ? 0 : -1; diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index d762c6de367..ba384b63a53 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -59,7 +59,7 @@ public: virtual int write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - TAO_ENV_ARG_DECL + 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 cad821c58b6..6408411efc7 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -131,7 +131,7 @@ int TAO_GIOP_Message_Generator_Parser_12::write_reply_header ( TAO_OutputCDR & output, TAO_Pluggable_Reply_Params_Base &reply - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -288,7 +288,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( input.skip_bytes (3); // Unmarshal the target address field. - hdr_status = + hdr_status = hdr_status && request.profile ().unmarshall_target_address(input); if (input.char_translator () == 0) @@ -371,7 +371,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_locate_header ( request.request_id (req_id); // Unmarshal the target address field. - hdr_status = + hdr_status = hdr_status && request.profile ().unmarshall_target_address(msg); // Reset the pointer to an 8-byte bouns]dary diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index 9795ae822d4..75ac2479121 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -61,7 +61,7 @@ public: virtual int write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - TAO_ENV_ARG_DECL + 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 c2f0875b45a..e16f1a8632e 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -627,14 +627,14 @@ TAO_GIOP_Message_Lite::generate_exception_reply ( { // A new try/catch block, but if something goes wrong now we have no // hope, just abort. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Make the GIOP & reply header. They are version specific. this->write_reply_header (cdr, params); - x._tao_encode (cdr TAO_ENV_ARG_PARAMETER); + x._tao_encode (cdr ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA_Exception, ex) @@ -701,7 +701,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, int parse_error = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { parse_error = @@ -721,7 +721,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, this->orb_core_->adapter_registry ()->dispatch (request.object_key (), request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (forward_to.in ())) @@ -886,7 +886,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, CORBA::Boolean response_required = 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { int parse_error = @@ -939,7 +939,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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (forward_to.in ())) @@ -1120,7 +1120,7 @@ int TAO_GIOP_Message_Lite::write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1407,7 +1407,7 @@ TAO_GIOP_Message_Lite::send_reply_exception ( // A new try/catch block, but if something goes wrong now we have no // hope, just abort. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -1424,7 +1424,7 @@ TAO_GIOP_Message_Lite::send_reply_exception ( reply_params); - x->_tao_encode (output TAO_ENV_ARG_PARAMETER); + x->_tao_encode (output ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA_Exception, ex) diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index 4bab59806be..601f899822e 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -214,7 +214,7 @@ private: int write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index 569302e85fa..c9f3c876a99 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -64,10 +64,10 @@ tao_CORBA_IRObject_nil ( CORBA_IRObject_ptr tao_CORBA_IRObject_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_IRObject::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_IRObject::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -191,10 +191,10 @@ CORBA_IRObject_var::tao_nil (void) ::CORBA_IRObject_ptr CORBA_IRObject_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_IRObject::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_IRObject::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -272,21 +272,21 @@ public: TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -302,30 +302,30 @@ private: TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -333,13 +333,13 @@ TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -361,21 +361,21 @@ public: TAO_ClientRequestInfo_CORBA_IRObject_destroy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -389,30 +389,30 @@ private: TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -420,13 +420,13 @@ TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (TAO_ENV_SINGLE_ARG_DEC CORBA::Any * -TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -448,7 +448,7 @@ _TAO_CORBA_IRObject_Remote_Proxy_Impl::_TAO_CORBA_IRObject_Remote_Proxy_Impl (vo CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -490,7 +490,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind ( TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -506,7 +506,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -518,17 +518,17 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -545,7 +545,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -572,7 +572,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -582,12 +582,12 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -598,7 +598,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -614,7 +614,7 @@ return _tao_retval; void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -656,7 +656,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy ( TAO_ClientRequestInfo_CORBA_IRObject_destroy ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -672,7 +672,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -684,17 +684,17 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -710,7 +710,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -724,7 +724,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -734,12 +734,12 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -750,7 +750,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -805,7 +805,7 @@ _TAO_CORBA_IRObject_Remote_Proxy_Broker::~_TAO_CORBA_IRObject_Remote_Proxy_Broke _TAO_CORBA_IRObject_Proxy_Impl& _TAO_CORBA_IRObject_Remote_Proxy_Broker::select_proxy ( ::CORBA_IRObject * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -846,24 +846,24 @@ void CORBA_IRObject::_tao_any_destructor (void *_tao_void_pointer) CORBA_IRObject_ptr CORBA_IRObject::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_IRObject::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IRObject::_nil ()); if (is_a == 0) return CORBA_IRObject::_nil (); } - return CORBA_IRObject::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_IRObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_IRObject_ptr CORBA_IRObject::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -918,14 +918,14 @@ CORBA_IRObject::_duplicate (CORBA_IRObject_ptr obj) return obj; } -CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_IRObject::_tao_QueryInterface (ptr_arith_t type) @@ -950,36 +950,36 @@ const char* CORBA_IRObject::_interface_repository_id (void) const } CORBA::DefinitionKind CORBA_IRObject::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_IRObject_Proxy_Impl &proxy = - this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ((CORBA::DefinitionKind)0); return proxy.def_kind ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_IRObject::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_IRObject_Proxy_Impl &proxy = - this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.destroy ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1010,10 +1010,10 @@ tao_CORBA_Contained_nil ( CORBA_Contained_ptr tao_CORBA_Contained_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_Contained::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_Contained::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1137,10 +1137,10 @@ CORBA_Contained_var::tao_nil (void) ::CORBA_Contained_ptr CORBA_Contained_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_Contained::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_Contained::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1218,21 +1218,21 @@ public: TAO_ClientRequestInfo_CORBA_Contained_id_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1248,30 +1248,30 @@ private: TAO_ClientRequestInfo_CORBA_Contained_id_get::TAO_ClientRequestInfo_CORBA_Contained_id_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_id_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_id_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_id_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_id_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1279,13 +1279,13 @@ TAO_ClientRequestInfo_CORBA_Contained_id_get::exceptions (TAO_ENV_SINGLE_ARG_DEC CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_id_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1308,21 +1308,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1338,19 +1338,19 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::TAO_ClientRequestInfo_CORBA_Contai TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_id_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1366,12 +1366,12 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_id_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_id_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1379,13 +1379,13 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::exceptions (TAO_ENV_SINGLE_ARG_DEC CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_id_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1397,21 +1397,21 @@ public: TAO_ClientRequestInfo_CORBA_Contained_name_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1427,30 +1427,30 @@ private: TAO_ClientRequestInfo_CORBA_Contained_name_get::TAO_ClientRequestInfo_CORBA_Contained_name_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1458,13 +1458,13 @@ TAO_ClientRequestInfo_CORBA_Contained_name_get::exceptions (TAO_ENV_SINGLE_ARG_D CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_name_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1487,21 +1487,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1517,19 +1517,19 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::TAO_ClientRequestInfo_CORBA_Cont TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * name - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), name_ (name) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_name_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1545,12 +1545,12 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_name_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_name_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1558,13 +1558,13 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::exceptions (TAO_ENV_SINGLE_ARG_D CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_name_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1576,21 +1576,21 @@ public: TAO_ClientRequestInfo_CORBA_Contained_version_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1606,30 +1606,30 @@ private: TAO_ClientRequestInfo_CORBA_Contained_version_get::TAO_ClientRequestInfo_CORBA_Contained_version_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_version_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_version_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_version_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_version_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1637,13 +1637,13 @@ TAO_ClientRequestInfo_CORBA_Contained_version_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_version_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1666,21 +1666,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1696,19 +1696,19 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::TAO_ClientRequestInfo_CORBA_C TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), version_ (version) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_version_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1724,12 +1724,12 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_version_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_version_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1737,13 +1737,13 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_version_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1755,21 +1755,21 @@ public: TAO_ClientRequestInfo_CORBA_Contained_defined_in_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1785,30 +1785,30 @@ private: TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::TAO_ClientRequestInfo_CORBA_Contained_defined_in_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1816,13 +1816,13 @@ TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::exceptions (TAO_ENV_SINGLE CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1844,21 +1844,21 @@ public: TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1874,30 +1874,30 @@ private: TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1905,13 +1905,13 @@ TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1933,21 +1933,21 @@ public: TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1963,30 +1963,30 @@ private: TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1994,13 +1994,13 @@ TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::exceptions (TAO CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2022,21 +2022,21 @@ public: TAO_ClientRequestInfo_CORBA_Contained_describe ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2052,30 +2052,30 @@ private: TAO_ClientRequestInfo_CORBA_Contained_describe::TAO_ClientRequestInfo_CORBA_Contained_describe ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_describe::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_describe::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_describe::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_describe::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2083,13 +2083,13 @@ TAO_ClientRequestInfo_CORBA_Contained_describe::exceptions (TAO_ENV_SINGLE_ARG_D CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_describe::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2114,21 +2114,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2148,7 +2148,7 @@ TAO_ClientRequestInfo_CORBA_Contained_move::TAO_ClientRequestInfo_CORBA_Containe CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), new_container_ (new_container), @@ -2157,12 +2157,12 @@ TAO_ClientRequestInfo_CORBA_Contained_move::TAO_ClientRequestInfo_CORBA_Containe {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_move::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2184,12 +2184,12 @@ TAO_ClientRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Contained_move::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_move::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2197,13 +2197,13 @@ TAO_ClientRequestInfo_CORBA_Contained_move::exceptions (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * -TAO_ClientRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2225,7 +2225,7 @@ _TAO_CORBA_Contained_Remote_Proxy_Impl::_TAO_CORBA_Contained_Remote_Proxy_Impl ( char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2267,7 +2267,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( TAO_ClientRequestInfo_CORBA_Contained_id_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2283,7 +2283,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2295,17 +2295,17 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2322,7 +2322,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2350,7 +2350,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2360,12 +2360,12 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2376,7 +2376,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2393,7 +2393,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2436,7 +2436,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( &_tao_call, _collocated_tao_target_, id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -2452,7 +2452,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2464,12 +2464,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2482,7 +2482,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2498,7 +2498,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2512,7 +2512,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2522,12 +2522,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2538,7 +2538,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2554,7 +2554,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id ( char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2596,7 +2596,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( TAO_ClientRequestInfo_CORBA_Contained_name_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2612,7 +2612,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2624,17 +2624,17 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2651,7 +2651,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2679,7 +2679,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2689,12 +2689,12 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2705,7 +2705,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2722,7 +2722,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( CORBA_Object *_collocated_tao_target_, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2765,7 +2765,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( &_tao_call, _collocated_tao_target_, name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -2781,7 +2781,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2793,12 +2793,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2811,7 +2811,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2827,7 +2827,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2841,7 +2841,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2851,12 +2851,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2867,7 +2867,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2883,7 +2883,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name ( char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2925,7 +2925,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( TAO_ClientRequestInfo_CORBA_Contained_version_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2941,7 +2941,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2953,17 +2953,17 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2980,7 +2980,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3008,7 +3008,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3018,12 +3018,12 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3034,7 +3034,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3051,7 +3051,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( CORBA_Object *_collocated_tao_target_, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3094,7 +3094,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( &_tao_call, _collocated_tao_target_, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3110,7 +3110,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3122,12 +3122,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3140,7 +3140,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3156,7 +3156,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3170,7 +3170,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3180,12 +3180,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3196,7 +3196,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3212,7 +3212,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version ( CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3255,7 +3255,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in ( TAO_ClientRequestInfo_CORBA_Contained_defined_in_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -3271,7 +3271,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3283,17 +3283,17 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3310,7 +3310,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3338,7 +3338,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3348,12 +3348,12 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3364,7 +3364,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3380,7 +3380,7 @@ return _tao_safe_retval._retn (); char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3422,7 +3422,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name ( TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -3438,7 +3438,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3450,17 +3450,17 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3477,7 +3477,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3505,7 +3505,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3515,12 +3515,12 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3531,7 +3531,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3547,7 +3547,7 @@ return _tao_safe_retval._retn (); CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_repository ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3590,7 +3590,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -3606,7 +3606,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3618,17 +3618,17 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3645,7 +3645,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3673,7 +3673,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3683,12 +3683,12 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3699,7 +3699,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3715,7 +3715,7 @@ return _tao_safe_retval._retn (); CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3758,7 +3758,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe TAO_ClientRequestInfo_CORBA_Contained_describe ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -3774,7 +3774,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3786,17 +3786,17 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3813,7 +3813,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3841,7 +3841,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3851,12 +3851,12 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3867,7 +3867,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3886,7 +3886,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3931,7 +3931,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3947,7 +3947,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3959,12 +3959,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3979,7 +3979,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3995,7 +3995,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4009,7 +4009,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4019,12 +4019,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4035,7 +4035,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4090,7 +4090,7 @@ _TAO_CORBA_Contained_Remote_Proxy_Broker::~_TAO_CORBA_Contained_Remote_Proxy_Bro _TAO_CORBA_Contained_Proxy_Impl& _TAO_CORBA_Contained_Remote_Proxy_Broker::select_proxy ( ::CORBA_Contained * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -4133,24 +4133,24 @@ void CORBA_Contained::_tao_any_destructor (void *_tao_void_pointer) CORBA_Contained_ptr CORBA_Contained::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_Contained::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Contained::_nil ()); if (is_a == 0) return CORBA_Contained::_nil (); } - return CORBA_Contained::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_Contained::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_Contained_ptr CORBA_Contained::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4205,7 +4205,7 @@ CORBA_Contained::_duplicate (CORBA_Contained_ptr obj) return obj; } -CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -4213,7 +4213,7 @@ CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_Contained::_tao_QueryInterface (ptr_arith_t type) @@ -4250,161 +4250,161 @@ const char* CORBA_Contained::_interface_repository_id (void) const } char * CORBA_Contained::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.id ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_Contained::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.id ( this, id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } char * CORBA_Contained::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.name ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_Contained::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.name ( this, name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } char * CORBA_Contained::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.version ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_Contained::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.version ( this, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_Container_ptr CORBA_Contained::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.defined_in ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } char * CORBA_Contained::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.absolute_name ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_Repository_ptr CORBA_Contained::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.containing_repository ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4590,19 +4590,19 @@ void CORBA_Contained::Description::_tao_any_destructor (void *_tao_void_pointer) } CORBA_Contained::Description * CORBA_Contained::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.describe ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4610,14 +4610,14 @@ void CORBA_Contained::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Contained_Proxy_Impl &proxy = - this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.move ( @@ -4625,7 +4625,7 @@ void CORBA_Contained::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4702,11 +4702,11 @@ void _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA_Contained **tmp = ACE_static_cast (CORBA_Contained**, target); - *tmp = CORBA_Contained::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = CORBA_Contained::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -4842,11 +4842,11 @@ void _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA_InterfaceDef **tmp = ACE_static_cast (CORBA_InterfaceDef**, target); - *tmp = tao_CORBA_InterfaceDef_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = tao_CORBA_InterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -4981,11 +4981,11 @@ void _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA_ValueDef **tmp = ACE_static_cast (CORBA_ValueDef**, target); - *tmp = tao_CORBA_ValueDef_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = tao_CORBA_ValueDef_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -5120,11 +5120,11 @@ void _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA_AbstractInterfaceDef **tmp = ACE_static_cast (CORBA_AbstractInterfaceDef**, target); - *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -5259,11 +5259,11 @@ void _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA_LocalInterfaceDef **tmp = ACE_static_cast (CORBA_LocalInterfaceDef**, target); - *tmp = tao_CORBA_LocalInterfaceDef_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = tao_CORBA_LocalInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -5706,10 +5706,10 @@ tao_CORBA_Container_nil ( CORBA_Container_ptr tao_CORBA_Container_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_Container::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_Container::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5833,10 +5833,10 @@ CORBA_Container_var::tao_nil (void) ::CORBA_Container_ptr CORBA_Container_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_Container::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_Container::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5915,21 +5915,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5947,19 +5947,19 @@ TAO_ClientRequestInfo_CORBA_Container_lookup::TAO_ClientRequestInfo_CORBA_Contai TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * search_name - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), search_name_ (search_name) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5975,12 +5975,12 @@ TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_lookup::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_lookup::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5988,13 +5988,13 @@ TAO_ClientRequestInfo_CORBA_Container_lookup::exceptions (TAO_ENV_SINGLE_ARG_DEC CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_lookup::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6018,21 +6018,21 @@ public: CORBA::Object_ptr _tao_target, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6052,7 +6052,7 @@ TAO_ClientRequestInfo_CORBA_Container_contents::TAO_ClientRequestInfo_CORBA_Cont CORBA::Object_ptr _tao_target, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), limit_type_ (limit_type), @@ -6060,12 +6060,12 @@ TAO_ClientRequestInfo_CORBA_Container_contents::TAO_ClientRequestInfo_CORBA_Cont {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_contents::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6084,12 +6084,12 @@ TAO_ClientRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6097,13 +6097,13 @@ TAO_ClientRequestInfo_CORBA_Container_contents::exceptions (TAO_ENV_SINGLE_ARG_D CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_contents::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6129,21 +6129,21 @@ public: const CORBA::Long & levels_to_search, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6167,7 +6167,7 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::TAO_ClientRequestInfo_CORBA_C const CORBA::Long & levels_to_search, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), search_name_ (search_name), @@ -6177,12 +6177,12 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::TAO_ClientRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6207,12 +6207,12 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_lookup_name::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_lookup_name::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6220,13 +6220,13 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6251,21 +6251,21 @@ public: CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, const CORBA::Long & max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6287,7 +6287,7 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::TAO_ClientRequestInfo_C CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, const CORBA::Long & max_returned_objs - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), limit_type_ (limit_type), @@ -6296,12 +6296,12 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::TAO_ClientRequestInfo_C {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6323,12 +6323,12 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_describe_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_describe_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6336,13 +6336,13 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6367,21 +6367,21 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6403,7 +6403,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::TAO_ClientRequestInfo_CORBA const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -6412,12 +6412,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::TAO_ClientRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6439,12 +6439,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_module::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_module::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6452,13 +6452,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_module::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6485,21 +6485,21 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6525,7 +6525,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::TAO_ClientRequestInfo_COR const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -6536,12 +6536,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::TAO_ClientRequestInfo_COR {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6569,12 +6569,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_constant::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_constant::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6582,13 +6582,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_constant::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6614,21 +6614,21 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6652,7 +6652,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::TAO_ClientRequestInfo_CORBA const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -6662,12 +6662,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::TAO_ClientRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6692,12 +6692,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_struct::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_struct::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6705,13 +6705,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_struct::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6738,21 +6738,21 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6778,7 +6778,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::TAO_ClientRequestInfo_CORBA_ const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -6789,12 +6789,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::TAO_ClientRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6822,12 +6822,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_union::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_union::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6835,13 +6835,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::exceptions (TAO_ENV_SINGLE_A CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_union::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6867,21 +6867,21 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6905,7 +6905,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::TAO_ClientRequestInfo_CORBA_C const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -6915,12 +6915,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::TAO_ClientRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6945,12 +6945,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_enum::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_enum::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6958,13 +6958,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_enum::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6990,21 +6990,21 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7028,7 +7028,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::TAO_ClientRequestInfo_CORBA_ const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -7038,12 +7038,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::TAO_ClientRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7068,12 +7068,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_alias::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_alias::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -7081,13 +7081,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::exceptions (TAO_ENV_SINGLE_A CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_alias::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7113,21 +7113,21 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7151,7 +7151,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_CO const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -7161,12 +7161,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_CO {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7191,12 +7191,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -7204,13 +7204,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (TAO_ENV_SING CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7242,21 +7242,21 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7292,7 +7292,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_CORBA_ const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -7308,12 +7308,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7356,12 +7356,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -7369,13 +7369,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (TAO_ENV_SINGLE_A CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_value::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7401,21 +7401,21 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7439,7 +7439,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::TAO_ClientRequestInfo_CO const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -7449,12 +7449,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::TAO_ClientRequestInfo_CO {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7479,12 +7479,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_value_box::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_value_box::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -7492,13 +7492,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::exceptions (TAO_ENV_SING CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7524,21 +7524,21 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7562,7 +7562,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::TAO_ClientRequestInfo_CO const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -7572,12 +7572,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::TAO_ClientRequestInfo_CO {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7602,12 +7602,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_exception::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_exception::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -7615,13 +7615,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::exceptions (TAO_ENV_SING CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_exception::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7646,21 +7646,21 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7682,7 +7682,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::TAO_ClientRequestInfo_CORBA const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -7691,12 +7691,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::TAO_ClientRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7718,12 +7718,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_native::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_native::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -7731,13 +7731,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_native::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7763,21 +7763,21 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7801,7 +7801,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientReque const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -7811,12 +7811,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientReque {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7841,12 +7841,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -7854,13 +7854,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (TAO CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7886,21 +7886,21 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7924,7 +7924,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestI const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -7934,12 +7934,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestI {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7964,12 +7964,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -7977,13 +7977,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (TAO_EN CORBA::Any * -TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -8016,7 +8016,7 @@ _TAO_CORBA_Container_Remote_Proxy_Impl::_TAO_CORBA_Container_Remote_Proxy_Impl ( CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup ( CORBA_Object *_collocated_tao_target_, const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8060,7 +8060,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup ( &_tao_call, _collocated_tao_target_, search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8076,7 +8076,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8088,12 +8088,12 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8107,7 +8107,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8124,7 +8124,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8152,7 +8152,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8162,12 +8162,12 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8178,7 +8178,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8196,7 +8196,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents ( CORBA_Object *_collocated_tao_target_, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8242,7 +8242,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents ( _collocated_tao_target_, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8258,7 +8258,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8270,12 +8270,12 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8290,7 +8290,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8307,7 +8307,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8335,7 +8335,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8345,12 +8345,12 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8361,7 +8361,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8381,7 +8381,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8429,7 +8429,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name ( levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8445,7 +8445,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8457,12 +8457,12 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8479,7 +8479,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8496,7 +8496,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8524,7 +8524,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8534,12 +8534,12 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8550,7 +8550,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8569,7 +8569,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8616,7 +8616,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8632,7 +8632,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8644,12 +8644,12 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8665,7 +8665,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8682,7 +8682,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8710,7 +8710,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8720,12 +8720,12 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8736,7 +8736,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8755,7 +8755,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8801,7 +8801,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8817,7 +8817,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8829,12 +8829,12 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8850,7 +8850,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8867,7 +8867,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8895,7 +8895,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8905,12 +8905,12 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8921,7 +8921,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8942,7 +8942,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8990,7 +8990,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant ( version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -9006,7 +9006,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9018,12 +9018,12 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -9041,7 +9041,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -9058,7 +9058,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -9086,7 +9086,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9096,12 +9096,12 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9112,7 +9112,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -9132,7 +9132,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9179,7 +9179,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct ( name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -9195,7 +9195,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9207,12 +9207,12 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -9229,7 +9229,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -9246,7 +9246,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -9274,7 +9274,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9284,12 +9284,12 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9300,7 +9300,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -9321,7 +9321,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9369,7 +9369,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union ( version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -9385,7 +9385,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9397,12 +9397,12 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -9420,7 +9420,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -9437,7 +9437,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -9465,7 +9465,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9475,12 +9475,12 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9491,7 +9491,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -9511,7 +9511,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9558,7 +9558,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum ( name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -9574,7 +9574,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9586,12 +9586,12 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -9608,7 +9608,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -9625,7 +9625,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -9653,7 +9653,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9663,12 +9663,12 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9679,7 +9679,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -9699,7 +9699,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9746,7 +9746,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias ( name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -9762,7 +9762,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9774,12 +9774,12 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -9796,7 +9796,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -9813,7 +9813,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -9841,7 +9841,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9851,12 +9851,12 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9867,7 +9867,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -9887,7 +9887,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9934,7 +9934,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -9950,7 +9950,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9962,12 +9962,12 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -9984,7 +9984,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10001,7 +10001,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10029,7 +10029,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10039,12 +10039,12 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10055,7 +10055,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -10081,7 +10081,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10134,7 +10134,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value ( abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -10150,7 +10150,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10162,12 +10162,12 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -10190,7 +10190,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10207,7 +10207,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10235,7 +10235,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10245,12 +10245,12 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10261,7 +10261,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -10281,7 +10281,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10328,7 +10328,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box ( name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -10344,7 +10344,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10356,12 +10356,12 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -10378,7 +10378,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10395,7 +10395,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10423,7 +10423,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10433,12 +10433,12 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10449,7 +10449,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -10469,7 +10469,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10516,7 +10516,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -10532,7 +10532,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10544,12 +10544,12 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -10566,7 +10566,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10583,7 +10583,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10611,7 +10611,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10621,12 +10621,12 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10637,7 +10637,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -10656,7 +10656,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10702,7 +10702,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -10718,7 +10718,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10730,12 +10730,12 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -10751,7 +10751,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10768,7 +10768,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10796,7 +10796,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10806,12 +10806,12 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10822,7 +10822,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -10842,7 +10842,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10889,7 +10889,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -10905,7 +10905,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10917,12 +10917,12 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -10939,7 +10939,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10956,7 +10956,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10984,7 +10984,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10994,12 +10994,12 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11010,7 +11010,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11030,7 +11030,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11077,7 +11077,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -11093,7 +11093,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11105,12 +11105,12 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -11127,7 +11127,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11144,7 +11144,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11172,7 +11172,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11182,12 +11182,12 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11198,7 +11198,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11253,7 +11253,7 @@ _TAO_CORBA_Container_Remote_Proxy_Broker::~_TAO_CORBA_Container_Remote_Proxy_Bro _TAO_CORBA_Container_Proxy_Impl& _TAO_CORBA_Container_Remote_Proxy_Broker::select_proxy ( ::CORBA_Container * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -11296,24 +11296,24 @@ void CORBA_Container::_tao_any_destructor (void *_tao_void_pointer) CORBA_Container_ptr CORBA_Container::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_Container::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Container::_nil ()); if (is_a == 0) return CORBA_Container::_nil (); } - return CORBA_Container::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_Container::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_Container_ptr CORBA_Container::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -11368,7 +11368,7 @@ CORBA_Container::_duplicate (CORBA_Container_ptr obj) return obj; } -CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || @@ -11376,7 +11376,7 @@ CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_Container::_tao_QueryInterface (ptr_arith_t type) @@ -11414,41 +11414,41 @@ const char* CORBA_Container::_interface_repository_id (void) const CORBA_Contained_ptr CORBA_Container::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.lookup ( this, search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ContainedSeq * CORBA_Container::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.contents ( this, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -11457,14 +11457,14 @@ CORBA_ContainedSeq * CORBA_Container::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.lookup_name ( @@ -11473,7 +11473,7 @@ CORBA_ContainedSeq * CORBA_Container::lookup_name ( levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12006,14 +12006,14 @@ CORBA_Container::DescriptionSeq * CORBA_Container::describe_contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.describe_contents ( @@ -12021,7 +12021,7 @@ CORBA_Container::DescriptionSeq * CORBA_Container::describe_contents ( limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12029,14 +12029,14 @@ CORBA_ModuleDef_ptr CORBA_Container::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_module ( @@ -12044,7 +12044,7 @@ CORBA_ModuleDef_ptr CORBA_Container::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12054,14 +12054,14 @@ CORBA_ConstantDef_ptr CORBA_Container::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_constant ( @@ -12071,7 +12071,7 @@ CORBA_ConstantDef_ptr CORBA_Container::create_constant ( version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12080,14 +12080,14 @@ CORBA_StructDef_ptr CORBA_Container::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_struct ( @@ -12096,7 +12096,7 @@ CORBA_StructDef_ptr CORBA_Container::create_struct ( name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12106,14 +12106,14 @@ CORBA_UnionDef_ptr CORBA_Container::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_union ( @@ -12123,7 +12123,7 @@ CORBA_UnionDef_ptr CORBA_Container::create_union ( version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12132,14 +12132,14 @@ CORBA_EnumDef_ptr CORBA_Container::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_enum ( @@ -12148,7 +12148,7 @@ CORBA_EnumDef_ptr CORBA_Container::create_enum ( name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12157,14 +12157,14 @@ CORBA_AliasDef_ptr CORBA_Container::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_alias ( @@ -12173,7 +12173,7 @@ CORBA_AliasDef_ptr CORBA_Container::create_alias ( name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12182,14 +12182,14 @@ CORBA_InterfaceDef_ptr CORBA_Container::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_interface ( @@ -12198,7 +12198,7 @@ CORBA_InterfaceDef_ptr CORBA_Container::create_interface ( name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12213,14 +12213,14 @@ CORBA_ValueDef_ptr CORBA_Container::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_value ( @@ -12235,7 +12235,7 @@ CORBA_ValueDef_ptr CORBA_Container::create_value ( abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12244,14 +12244,14 @@ CORBA_ValueBoxDef_ptr CORBA_Container::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_value_box ( @@ -12260,7 +12260,7 @@ CORBA_ValueBoxDef_ptr CORBA_Container::create_value_box ( name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12269,14 +12269,14 @@ CORBA_ExceptionDef_ptr CORBA_Container::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_exception ( @@ -12285,7 +12285,7 @@ CORBA_ExceptionDef_ptr CORBA_Container::create_exception ( name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12293,14 +12293,14 @@ CORBA_NativeDef_ptr CORBA_Container::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_native ( @@ -12308,7 +12308,7 @@ CORBA_NativeDef_ptr CORBA_Container::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12317,14 +12317,14 @@ CORBA_AbstractInterfaceDef_ptr CORBA_Container::create_abstract_interface ( const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_abstract_interface ( @@ -12333,7 +12333,7 @@ CORBA_AbstractInterfaceDef_ptr CORBA_Container::create_abstract_interface ( name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12342,14 +12342,14 @@ CORBA_LocalInterfaceDef_ptr CORBA_Container::create_local_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Container_Proxy_Impl &proxy = - this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_local_interface ( @@ -12358,7 +12358,7 @@ CORBA_LocalInterfaceDef_ptr CORBA_Container::create_local_interface ( name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12389,10 +12389,10 @@ tao_CORBA_IDLType_nil ( CORBA_IDLType_ptr tao_CORBA_IDLType_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_IDLType::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_IDLType::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -12516,10 +12516,10 @@ CORBA_IDLType_var::tao_nil (void) ::CORBA_IDLType_ptr CORBA_IDLType_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_IDLType::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_IDLType::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -12597,21 +12597,21 @@ public: TAO_ClientRequestInfo_CORBA_IDLType_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -12627,30 +12627,30 @@ private: TAO_ClientRequestInfo_CORBA_IDLType_type_get::TAO_ClientRequestInfo_CORBA_IDLType_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_IDLType_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_IDLType_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_IDLType_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_IDLType_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -12658,13 +12658,13 @@ TAO_ClientRequestInfo_CORBA_IDLType_type_get::exceptions (TAO_ENV_SINGLE_ARG_DEC CORBA::Any * -TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12696,7 +12696,7 @@ _TAO_CORBA_IDLType_Remote_Proxy_Impl::_TAO_CORBA_IDLType_Remote_Proxy_Impl (void CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12739,7 +12739,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type ( TAO_ClientRequestInfo_CORBA_IDLType_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -12755,7 +12755,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12767,17 +12767,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -12794,7 +12794,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -12822,7 +12822,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12832,12 +12832,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -12848,7 +12848,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -12903,7 +12903,7 @@ _TAO_CORBA_IDLType_Remote_Proxy_Broker::~_TAO_CORBA_IDLType_Remote_Proxy_Broker _TAO_CORBA_IDLType_Proxy_Impl& _TAO_CORBA_IDLType_Remote_Proxy_Broker::select_proxy ( ::CORBA_IDLType * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -12946,24 +12946,24 @@ void CORBA_IDLType::_tao_any_destructor (void *_tao_void_pointer) CORBA_IDLType_ptr CORBA_IDLType::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_IDLType::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); if (is_a == 0) return CORBA_IDLType::_nil (); } - return CORBA_IDLType::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_IDLType::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_IDLType_ptr CORBA_IDLType::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -13018,7 +13018,7 @@ CORBA_IDLType::_duplicate (CORBA_IDLType_ptr obj) return obj; } -CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -13026,7 +13026,7 @@ CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_IDLType::_tao_QueryInterface (ptr_arith_t type) @@ -13063,19 +13063,19 @@ const char* CORBA_IDLType::_interface_repository_id (void) const } CORBA::TypeCode_ptr CORBA_IDLType::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_IDLType_Proxy_Impl &proxy = - this->the_TAO_CORBA_IDLType_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_IDLType_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -13106,10 +13106,10 @@ tao_CORBA_TypedefDef_nil ( CORBA_TypedefDef_ptr tao_CORBA_TypedefDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_TypedefDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -13233,10 +13233,10 @@ CORBA_TypedefDef_var::tao_nil (void) ::CORBA_TypedefDef_ptr CORBA_TypedefDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_TypedefDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -13363,7 +13363,7 @@ _TAO_CORBA_TypedefDef_Remote_Proxy_Broker::~_TAO_CORBA_TypedefDef_Remote_Proxy_B _TAO_CORBA_TypedefDef_Proxy_Impl& _TAO_CORBA_TypedefDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_TypedefDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -13408,24 +13408,24 @@ void CORBA_TypedefDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_TypedefDef_ptr CORBA_TypedefDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_TypedefDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_TypedefDef::_nil ()); if (is_a == 0) return CORBA_TypedefDef::_nil (); } - return CORBA_TypedefDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_TypedefDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_TypedefDef_ptr CORBA_TypedefDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -13480,7 +13480,7 @@ CORBA_TypedefDef::_duplicate (CORBA_TypedefDef_ptr obj) return obj; } -CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || @@ -13490,7 +13490,7 @@ CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_TypedefDef::_tao_QueryInterface (ptr_arith_t type) @@ -13573,7 +13573,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DefinitionKind &_ { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_DefinitionKind TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_DefinitionKind ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -13619,7 +13619,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IRObject_ptr &_tao _tao_elem = CORBA_IRObject::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -13680,7 +13680,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Contained_ptr &_ta _tao_elem = CORBA_Contained::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_Contained TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_Contained ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -13755,7 +13755,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Contained::D { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA_Contained::_tc_Description TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA_Contained::_tc_Description ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -13846,7 +13846,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ContainedSeq { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ContainedSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ContainedSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -13937,7 +13937,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDef { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14028,7 +14028,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDefSeq { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14119,7 +14119,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AbstractInte { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14210,7 +14210,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_LocalInterfa { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14293,7 +14293,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StructMember { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMember TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMember ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14384,7 +14384,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StructMember { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMemberSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMemberSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14467,7 +14467,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Initializer { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_Initializer TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_Initializer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14558,7 +14558,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InitializerS { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_InitializerSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_InitializerSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14641,7 +14641,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_UnionMember { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMember TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMember ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14732,7 +14732,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_UnionMemberS { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMemberSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMemberSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14823,7 +14823,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_EnumMemberSe { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumMemberSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumMemberSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14892,7 +14892,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Container_ptr &_ta _tao_elem = CORBA_Container::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_Container TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_Container ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -14967,7 +14967,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Container::D { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_Description TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_Description ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -15058,7 +15058,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Container::D { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_DescriptionSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_DescriptionSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -15127,7 +15127,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IDLType_ptr &_tao_ _tao_elem = CORBA_IDLType::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_IDLType TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_IDLType ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -15188,7 +15188,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_TypedefDef_ptr &_t _tao_elem = CORBA_TypedefDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_TypedefDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_TypedefDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -15263,7 +15263,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_TypeDescript { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_TypeDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_TypeDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -15332,7 +15332,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_IRObject::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -15368,7 +15368,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_Contained::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -15824,7 +15824,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_Container::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -15860,7 +15860,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_IDLType::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -15896,7 +15896,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_TypedefDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h index 2520f156782..7b59a5a133b 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.h +++ b/TAO/tao/IFR_Client/IFR_BaseC.h @@ -94,7 +94,7 @@ public: static CORBA_IRObject_ptr tao_nil (void); static CORBA_IRObject_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -158,12 +158,12 @@ public: static CORBA_IRObject_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_IRObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_IRObject_ptr _nil (void) @@ -174,14 +174,14 @@ public: static void _tao_any_destructor (void*); virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -189,7 +189,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -239,7 +239,7 @@ public: virtual ~_TAO_CORBA_IRObject_Proxy_Impl (void) { } virtual CORBA::DefinitionKind def_kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -247,7 +247,7 @@ public: virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -277,7 +277,7 @@ public: virtual ~_TAO_CORBA_IRObject_Remote_Proxy_Impl (void) { } virtual CORBA::DefinitionKind def_kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -285,7 +285,7 @@ public: virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -314,7 +314,7 @@ public: virtual ~_TAO_CORBA_IRObject_Proxy_Broker (void); virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy ( CORBA_IRObject *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -341,7 +341,7 @@ public: virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy ( CORBA_IRObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -394,7 +394,7 @@ public: static CORBA_Repository_ptr tao_nil (void); static CORBA_Repository_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -473,7 +473,7 @@ public: static CORBA_Container_ptr tao_nil (void); static CORBA_Container_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -552,7 +552,7 @@ public: static CORBA_Contained_ptr tao_nil (void); static CORBA_Contained_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -616,12 +616,12 @@ public: static CORBA_Contained_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Contained_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Contained_ptr _nil (void) @@ -632,7 +632,7 @@ public: static void _tao_any_destructor (void*); virtual char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -640,14 +640,14 @@ public: virtual void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -655,14 +655,14 @@ public: virtual void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -670,28 +670,28 @@ public: virtual void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -765,7 +765,7 @@ public: static CORBA::TypeCode_ptr _tc_Description; virtual CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -775,7 +775,7 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -783,7 +783,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -833,7 +833,7 @@ public: virtual ~_TAO_CORBA_Contained_Proxy_Impl (void) { } virtual char * id ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -842,7 +842,7 @@ public: virtual void id ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -850,7 +850,7 @@ public: virtual char * name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -859,7 +859,7 @@ public: virtual void name ( CORBA_Object *_collocated_tao_target_, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -867,7 +867,7 @@ public: virtual char * version ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -876,7 +876,7 @@ public: virtual void version ( CORBA_Object *_collocated_tao_target_, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -884,7 +884,7 @@ public: virtual CORBA_Container_ptr defined_in ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -892,7 +892,7 @@ public: virtual char * absolute_name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -900,7 +900,7 @@ public: virtual CORBA_Repository_ptr containing_repository ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -908,7 +908,7 @@ public: virtual CORBA_Contained::Description * describe ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -919,7 +919,7 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -950,7 +950,7 @@ public: virtual ~_TAO_CORBA_Contained_Remote_Proxy_Impl (void) { } virtual char * id ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -959,7 +959,7 @@ public: virtual void id ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -967,7 +967,7 @@ public: virtual char * name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -976,7 +976,7 @@ public: virtual void name ( CORBA_Object *_collocated_tao_target_, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -984,7 +984,7 @@ public: virtual char * version ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -993,7 +993,7 @@ public: virtual void version ( CORBA_Object *_collocated_tao_target_, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1001,7 +1001,7 @@ public: virtual CORBA_Container_ptr defined_in ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1009,7 +1009,7 @@ public: virtual char * absolute_name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1017,7 +1017,7 @@ public: virtual CORBA_Repository_ptr containing_repository ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1025,7 +1025,7 @@ public: virtual CORBA_Contained::Description * describe ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1036,7 +1036,7 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1065,7 +1065,7 @@ public: virtual ~_TAO_CORBA_Contained_Proxy_Broker (void); virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy ( CORBA_Contained *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -1092,7 +1092,7 @@ public: virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy ( CORBA_Contained *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1159,7 +1159,7 @@ public: virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -1317,7 +1317,7 @@ public: static CORBA_ModuleDef_ptr tao_nil (void); static CORBA_ModuleDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1396,7 +1396,7 @@ public: static CORBA_ConstantDef_ptr tao_nil (void); static CORBA_ConstantDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1475,7 +1475,7 @@ public: static CORBA_IDLType_ptr tao_nil (void); static CORBA_IDLType_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1554,7 +1554,7 @@ public: static CORBA_StructDef_ptr tao_nil (void); static CORBA_StructDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1633,7 +1633,7 @@ public: static CORBA_UnionDef_ptr tao_nil (void); static CORBA_UnionDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1712,7 +1712,7 @@ public: static CORBA_EnumDef_ptr tao_nil (void); static CORBA_EnumDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1791,7 +1791,7 @@ public: static CORBA_AliasDef_ptr tao_nil (void); static CORBA_AliasDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1870,7 +1870,7 @@ public: static CORBA_InterfaceDef_ptr tao_nil (void); static CORBA_InterfaceDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1955,7 +1955,7 @@ public: virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -2113,7 +2113,7 @@ public: static CORBA_ExceptionDef_ptr tao_nil (void); static CORBA_ExceptionDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2192,7 +2192,7 @@ public: static CORBA_NativeDef_ptr tao_nil (void); static CORBA_NativeDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2271,7 +2271,7 @@ public: static CORBA_ValueDef_ptr tao_nil (void); static CORBA_ValueDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2356,7 +2356,7 @@ public: virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -2514,7 +2514,7 @@ public: static CORBA_ValueBoxDef_ptr tao_nil (void); static CORBA_ValueBoxDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2593,7 +2593,7 @@ public: static CORBA_AbstractInterfaceDef_ptr tao_nil (void); static CORBA_AbstractInterfaceDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2678,7 +2678,7 @@ public: virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -2836,7 +2836,7 @@ public: static CORBA_LocalInterfaceDef_ptr tao_nil (void); static CORBA_LocalInterfaceDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2921,7 +2921,7 @@ public: virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -3853,12 +3853,12 @@ public: static CORBA_Container_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Container_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Container_ptr _nil (void) @@ -3870,7 +3870,7 @@ public: virtual CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3879,7 +3879,7 @@ public: virtual CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3890,7 +3890,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4131,7 +4131,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4141,7 +4141,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4153,7 +4153,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4164,7 +4164,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4176,7 +4176,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4187,7 +4187,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4198,7 +4198,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4209,7 +4209,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4226,7 +4226,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4237,7 +4237,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4248,7 +4248,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4258,7 +4258,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4269,7 +4269,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4280,7 +4280,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4288,7 +4288,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -4339,7 +4339,7 @@ public: virtual CORBA_Contained_ptr lookup ( CORBA_Object *_collocated_tao_target_, const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4349,7 +4349,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4361,7 +4361,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4372,7 +4372,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4383,7 +4383,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4396,7 +4396,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4408,7 +4408,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4421,7 +4421,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4433,7 +4433,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4445,7 +4445,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4457,7 +4457,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4475,7 +4475,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4487,7 +4487,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4499,7 +4499,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4510,7 +4510,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4522,7 +4522,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4534,7 +4534,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4566,7 +4566,7 @@ public: virtual CORBA_Contained_ptr lookup ( CORBA_Object *_collocated_tao_target_, const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4576,7 +4576,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4588,7 +4588,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4599,7 +4599,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4610,7 +4610,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4623,7 +4623,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4635,7 +4635,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4648,7 +4648,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4660,7 +4660,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4672,7 +4672,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4684,7 +4684,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4702,7 +4702,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4714,7 +4714,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4726,7 +4726,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4737,7 +4737,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4749,7 +4749,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4761,7 +4761,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4790,7 +4790,7 @@ public: virtual ~_TAO_CORBA_Container_Proxy_Broker (void); virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy ( CORBA_Container *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -4817,7 +4817,7 @@ public: virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy ( CORBA_Container *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4862,12 +4862,12 @@ public: static CORBA_IDLType_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_IDLType_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_IDLType_ptr _nil (void) @@ -4878,7 +4878,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4886,7 +4886,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -4936,7 +4936,7 @@ public: virtual ~_TAO_CORBA_IDLType_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4967,7 +4967,7 @@ public: virtual ~_TAO_CORBA_IDLType_Remote_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4996,7 +4996,7 @@ public: virtual ~_TAO_CORBA_IDLType_Proxy_Broker (void); virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy ( CORBA_IDLType *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -5023,7 +5023,7 @@ public: virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy ( CORBA_IDLType *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5084,7 +5084,7 @@ public: static CORBA_TypedefDef_ptr tao_nil (void); static CORBA_TypedefDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -5149,12 +5149,12 @@ public: static CORBA_TypedefDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_TypedefDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_TypedefDef_ptr _nil (void) @@ -5166,7 +5166,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -5262,7 +5262,7 @@ public: virtual ~_TAO_CORBA_TypedefDef_Proxy_Broker (void); virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy ( CORBA_TypedefDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -5289,7 +5289,7 @@ public: virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy ( CORBA_TypedefDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5430,7 +5430,7 @@ public: CORBA_Repository_ptr tao_CORBA_Repository_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5459,7 +5459,7 @@ public: CORBA_ModuleDef_ptr tao_CORBA_ModuleDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5488,7 +5488,7 @@ public: CORBA_ConstantDef_ptr tao_CORBA_ConstantDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5517,7 +5517,7 @@ public: CORBA_StructDef_ptr tao_CORBA_StructDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5546,7 +5546,7 @@ public: CORBA_UnionDef_ptr tao_CORBA_UnionDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5575,7 +5575,7 @@ public: CORBA_EnumDef_ptr tao_CORBA_EnumDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5604,7 +5604,7 @@ public: CORBA_AliasDef_ptr tao_CORBA_AliasDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5633,7 +5633,7 @@ public: CORBA_InterfaceDef_ptr tao_CORBA_InterfaceDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5662,7 +5662,7 @@ public: CORBA_ExceptionDef_ptr tao_CORBA_ExceptionDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5691,7 +5691,7 @@ public: CORBA_NativeDef_ptr tao_CORBA_NativeDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5720,7 +5720,7 @@ public: CORBA_ValueDef_ptr tao_CORBA_ValueDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5749,7 +5749,7 @@ public: CORBA_ValueBoxDef_ptr tao_CORBA_ValueBoxDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5778,7 +5778,7 @@ public: CORBA_AbstractInterfaceDef_ptr tao_CORBA_AbstractInterfaceDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * @@ -5807,7 +5807,7 @@ public: CORBA_LocalInterfaceDef_ptr tao_CORBA_LocalInterfaceDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp index 07df25f5cd4..3170fa9995a 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.cpp +++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp @@ -67,10 +67,10 @@ tao_CORBA_Repository_nil ( CORBA_Repository_ptr tao_CORBA_Repository_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_Repository::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_Repository::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -194,10 +194,10 @@ CORBA_Repository_var::tao_nil (void) ::CORBA_Repository_ptr CORBA_Repository_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_Repository::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_Repository::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -276,21 +276,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -308,19 +308,19 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::TAO_ClientRequestInfo_CORBA_Re TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * search_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), search_id_ (search_id) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -336,12 +336,12 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -349,13 +349,13 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (TAO_ENV_SINGLE_ARG CORBA::Any * -TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -378,21 +378,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -410,19 +410,19 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ClientRequest TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), tc_ (tc) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -438,12 +438,12 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -451,13 +451,13 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (TAO_E CORBA::Any * -TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -480,21 +480,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA::PrimitiveKind & kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -512,19 +512,19 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::TAO_ClientRequestInfo_CORB TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA::PrimitiveKind & kind - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), kind_ (kind) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -540,12 +540,12 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -553,13 +553,13 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (TAO_ENV_SINGLE CORBA::Any * -TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -582,21 +582,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -614,19 +614,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::TAO_ClientRequestInfo_CORB TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), bound_ (bound) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -642,12 +642,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -655,13 +655,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (TAO_ENV_SINGLE CORBA::Any * -TAO_ClientRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_string::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -684,21 +684,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -716,19 +716,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::TAO_ClientRequestInfo_COR TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), bound_ (bound) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -744,12 +744,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -757,13 +757,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -787,21 +787,21 @@ public: CORBA::Object_ptr _tao_target, const CORBA::ULong & bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -821,7 +821,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::TAO_ClientRequestInfo_CO CORBA::Object_ptr _tao_target, const CORBA::ULong & bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), bound_ (bound), @@ -829,12 +829,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::TAO_ClientRequestInfo_CO {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -853,12 +853,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -866,13 +866,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (TAO_ENV_SING CORBA::Any * -TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -896,21 +896,21 @@ public: CORBA::Object_ptr _tao_target, const CORBA::ULong & length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -930,7 +930,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::TAO_ClientRequestInfo_CORBA CORBA::Object_ptr _tao_target, const CORBA::ULong & length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), length_ (length), @@ -938,12 +938,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::TAO_ClientRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -962,12 +962,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -975,13 +975,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_array::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1005,21 +1005,21 @@ public: CORBA::Object_ptr _tao_target, const CORBA::UShort & digits, const CORBA::Short & scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1039,7 +1039,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::TAO_ClientRequestInfo_CORBA CORBA::Object_ptr _tao_target, const CORBA::UShort & digits, const CORBA::Short & scale - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), digits_ (digits), @@ -1047,12 +1047,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::TAO_ClientRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1071,12 +1071,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1084,13 +1084,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1123,7 +1123,7 @@ _TAO_CORBA_Repository_Remote_Proxy_Impl::_TAO_CORBA_Repository_Remote_Proxy_Impl CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id ( CORBA_Object *_collocated_tao_target_, const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1167,7 +1167,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id ( &_tao_call, _collocated_tao_target_, search_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -1183,7 +1183,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1195,12 +1195,12 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -1214,7 +1214,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1231,7 +1231,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1259,7 +1259,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1269,12 +1269,12 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1285,7 +1285,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1302,7 +1302,7 @@ return _tao_safe_retval._retn (); CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typecode ( CORBA_Object *_collocated_tao_target_, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1346,7 +1346,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec &_tao_call, _collocated_tao_target_, tc - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -1362,7 +1362,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1374,12 +1374,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -1393,7 +1393,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1410,7 +1410,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1438,7 +1438,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1448,12 +1448,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1464,7 +1464,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1481,7 +1481,7 @@ return _tao_safe_retval._retn (); CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive ( CORBA_Object *_collocated_tao_target_, CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1525,7 +1525,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive ( &_tao_call, _collocated_tao_target_, kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -1541,7 +1541,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1553,12 +1553,12 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -1572,7 +1572,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1589,7 +1589,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1617,7 +1617,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1627,12 +1627,12 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1643,7 +1643,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1660,7 +1660,7 @@ return _tao_safe_retval._retn (); CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1704,7 +1704,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string ( &_tao_call, _collocated_tao_target_, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -1720,7 +1720,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1732,12 +1732,12 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -1751,7 +1751,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1768,7 +1768,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1796,7 +1796,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1806,12 +1806,12 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1822,7 +1822,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1839,7 +1839,7 @@ return _tao_safe_retval._retn (); CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1883,7 +1883,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring ( &_tao_call, _collocated_tao_target_, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -1899,7 +1899,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1911,12 +1911,12 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -1930,7 +1930,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1947,7 +1947,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1975,7 +1975,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1985,12 +1985,12 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2001,7 +2001,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2019,7 +2019,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2064,7 +2064,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence ( _collocated_tao_target_, bound, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2080,7 +2080,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2092,12 +2092,12 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -2112,7 +2112,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2129,7 +2129,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2157,7 +2157,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2167,12 +2167,12 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2183,7 +2183,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2201,7 +2201,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2246,7 +2246,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array ( _collocated_tao_target_, length, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2262,7 +2262,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2274,12 +2274,12 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -2294,7 +2294,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2311,7 +2311,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2339,7 +2339,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2349,12 +2349,12 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2365,7 +2365,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2383,7 +2383,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2428,7 +2428,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed ( _collocated_tao_target_, digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2444,7 +2444,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2456,12 +2456,12 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -2476,7 +2476,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2493,7 +2493,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2521,7 +2521,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2531,12 +2531,12 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2547,7 +2547,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2602,7 +2602,7 @@ _TAO_CORBA_Repository_Remote_Proxy_Broker::~_TAO_CORBA_Repository_Remote_Proxy_B _TAO_CORBA_Repository_Proxy_Impl& _TAO_CORBA_Repository_Remote_Proxy_Broker::select_proxy ( ::CORBA_Repository * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -2645,24 +2645,24 @@ void CORBA_Repository::_tao_any_destructor (void *_tao_void_pointer) CORBA_Repository_ptr CORBA_Repository::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_Repository::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Repository:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Repository:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Repository::_nil ()); if (is_a == 0) return CORBA_Repository::_nil (); } - return CORBA_Repository::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_Repository::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_Repository_ptr CORBA_Repository::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2717,7 +2717,7 @@ CORBA_Repository::_duplicate (CORBA_Repository_ptr obj) return obj; } -CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) || @@ -2726,7 +2726,7 @@ CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_Repository::_tao_QueryInterface (ptr_arith_t type) @@ -2776,159 +2776,159 @@ const char* CORBA_Repository::_interface_repository_id (void) const CORBA_Contained_ptr CORBA_Repository::lookup_id ( const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Repository_Proxy_Impl &proxy = - this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.lookup_id ( this, search_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::TypeCode_ptr CORBA_Repository::get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Repository_Proxy_Impl &proxy = - this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.get_canonical_typecode ( this, tc - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_PrimitiveDef_ptr CORBA_Repository::get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Repository_Proxy_Impl &proxy = - this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.get_primitive ( this, kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_StringDef_ptr CORBA_Repository::create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Repository_Proxy_Impl &proxy = - this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_string ( this, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_WstringDef_ptr CORBA_Repository::create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Repository_Proxy_Impl &proxy = - this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_wstring ( this, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_SequenceDef_ptr CORBA_Repository::create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Repository_Proxy_Impl &proxy = - this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_sequence ( this, bound, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ArrayDef_ptr CORBA_Repository::create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Repository_Proxy_Impl &proxy = - this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_array ( this, length, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_FixedDef_ptr CORBA_Repository::create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_Repository_Proxy_Impl &proxy = - this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_fixed ( this, digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2959,10 +2959,10 @@ tao_CORBA_ModuleDef_nil ( CORBA_ModuleDef_ptr tao_CORBA_ModuleDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_ModuleDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3086,10 +3086,10 @@ CORBA_ModuleDef_var::tao_nil (void) ::CORBA_ModuleDef_ptr CORBA_ModuleDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_ModuleDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3216,7 +3216,7 @@ _TAO_CORBA_ModuleDef_Remote_Proxy_Broker::~_TAO_CORBA_ModuleDef_Remote_Proxy_Bro _TAO_CORBA_ModuleDef_Proxy_Impl& _TAO_CORBA_ModuleDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_ModuleDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -3261,24 +3261,24 @@ void CORBA_ModuleDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_ModuleDef_ptr CORBA_ModuleDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ModuleDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ModuleDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ModuleDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); if (is_a == 0) return CORBA_ModuleDef::_nil (); } - return CORBA_ModuleDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_ModuleDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_ModuleDef_ptr CORBA_ModuleDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3333,7 +3333,7 @@ CORBA_ModuleDef::_duplicate (CORBA_ModuleDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) || @@ -3343,7 +3343,7 @@ CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_ModuleDef::_tao_QueryInterface (ptr_arith_t type) @@ -3436,10 +3436,10 @@ tao_CORBA_ConstantDef_nil ( CORBA_ConstantDef_ptr tao_CORBA_ConstantDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_ConstantDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_ConstantDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3563,10 +3563,10 @@ CORBA_ConstantDef_var::tao_nil (void) ::CORBA_ConstantDef_ptr CORBA_ConstantDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_ConstantDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_ConstantDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3644,21 +3644,21 @@ public: TAO_ClientRequestInfo_CORBA_ConstantDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3674,30 +3674,30 @@ private: TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -3705,13 +3705,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (TAO_ENV_SINGLE_ARG CORBA::Any * -TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3733,21 +3733,21 @@ public: TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3763,30 +3763,30 @@ private: TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -3794,13 +3794,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (TAO_ENV_SINGLE CORBA::Any * -TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3823,21 +3823,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3853,19 +3853,19 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ClientRequestInfo_CORB TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), type_def_ (type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3881,12 +3881,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -3894,13 +3894,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (TAO_ENV_SINGLE CORBA::Any * -TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3912,21 +3912,21 @@ public: TAO_ClientRequestInfo_CORBA_ConstantDef_value_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3942,30 +3942,30 @@ private: TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::TAO_ClientRequestInfo_CORBA_ConstantDef_value_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -3973,13 +3973,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4002,21 +4002,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4032,19 +4032,19 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::TAO_ClientRequestInfo_CORBA_C TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Any & value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), value_ (value) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4060,12 +4060,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4073,13 +4073,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4101,7 +4101,7 @@ _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::_TAO_CORBA_ConstantDef_Remote_Proxy_Im CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4144,7 +4144,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type ( TAO_ClientRequestInfo_CORBA_ConstantDef_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -4160,7 +4160,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4172,17 +4172,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4199,7 +4199,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4227,7 +4227,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4237,12 +4237,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4253,7 +4253,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4269,7 +4269,7 @@ return _tao_safe_retval._retn (); CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4312,7 +4312,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -4328,7 +4328,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4340,17 +4340,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4367,7 +4367,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4395,7 +4395,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4405,12 +4405,12 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4421,7 +4421,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4438,7 +4438,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4481,7 +4481,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( &_tao_call, _collocated_tao_target_, type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -4497,7 +4497,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4509,12 +4509,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4527,7 +4527,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4543,7 +4543,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4557,7 +4557,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4567,12 +4567,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4583,7 +4583,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4599,7 +4599,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def ( CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4643,7 +4643,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( TAO_ClientRequestInfo_CORBA_ConstantDef_value_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -4659,7 +4659,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4671,17 +4671,17 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4698,7 +4698,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4726,7 +4726,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4736,12 +4736,12 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4752,7 +4752,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4769,7 +4769,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( CORBA_Object *_collocated_tao_target_, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4812,7 +4812,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( &_tao_call, _collocated_tao_target_, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -4828,7 +4828,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4840,12 +4840,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4858,7 +4858,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4874,7 +4874,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4888,7 +4888,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4898,12 +4898,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4914,7 +4914,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4969,7 +4969,7 @@ _TAO_CORBA_ConstantDef_Remote_Proxy_Broker::~_TAO_CORBA_ConstantDef_Remote_Proxy _TAO_CORBA_ConstantDef_Proxy_Impl& _TAO_CORBA_ConstantDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_ConstantDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -5012,24 +5012,24 @@ void CORBA_ConstantDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_ConstantDef_ptr CORBA_ConstantDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ConstantDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstantDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstantDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); if (is_a == 0) return CORBA_ConstantDef::_nil (); } - return CORBA_ConstantDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_ConstantDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_ConstantDef_ptr CORBA_ConstantDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -5084,7 +5084,7 @@ CORBA_ConstantDef::_duplicate (CORBA_ConstantDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) || @@ -5093,7 +5093,7 @@ CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DE (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_ConstantDef::_tao_QueryInterface (ptr_arith_t type) @@ -5142,91 +5142,91 @@ const char* CORBA_ConstantDef::_interface_repository_id (void) const } CORBA::TypeCode_ptr CORBA_ConstantDef::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_IDLType_ptr CORBA_ConstantDef::type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type_def ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ConstantDef::type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.type_def ( this, type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Any * CORBA_ConstantDef::value ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.value ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ConstantDef::value ( const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.value ( this, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5263,10 +5263,10 @@ tao_CORBA_StructDef_nil ( CORBA_StructDef_ptr tao_CORBA_StructDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_StructDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_StructDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5390,10 +5390,10 @@ CORBA_StructDef_var::tao_nil (void) ::CORBA_StructDef_ptr CORBA_StructDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_StructDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_StructDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5471,21 +5471,21 @@ public: TAO_ClientRequestInfo_CORBA_StructDef_members_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5501,30 +5501,30 @@ private: TAO_ClientRequestInfo_CORBA_StructDef_members_get::TAO_ClientRequestInfo_CORBA_StructDef_members_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_StructDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StructDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5532,13 +5532,13 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5561,21 +5561,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5591,19 +5591,19 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::TAO_ClientRequestInfo_CORBA_S TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), members_ (members) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5619,12 +5619,12 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5632,13 +5632,13 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -5660,7 +5660,7 @@ _TAO_CORBA_StructDef_Remote_Proxy_Impl::_TAO_CORBA_StructDef_Remote_Proxy_Impl ( CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5704,7 +5704,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( TAO_ClientRequestInfo_CORBA_StructDef_members_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -5720,7 +5720,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5732,17 +5732,17 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -5759,7 +5759,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -5787,7 +5787,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5797,12 +5797,12 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -5813,7 +5813,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -5830,7 +5830,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5873,7 +5873,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( &_tao_call, _collocated_tao_target_, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -5889,7 +5889,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5901,12 +5901,12 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -5919,7 +5919,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -5935,7 +5935,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -5949,7 +5949,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5959,12 +5959,12 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -5975,7 +5975,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6030,7 +6030,7 @@ _TAO_CORBA_StructDef_Remote_Proxy_Broker::~_TAO_CORBA_StructDef_Remote_Proxy_Bro _TAO_CORBA_StructDef_Proxy_Impl& _TAO_CORBA_StructDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_StructDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -6075,24 +6075,24 @@ void CORBA_StructDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_StructDef_ptr CORBA_StructDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_StructDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StructDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StructDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (is_a == 0) return CORBA_StructDef::_nil (); } - return CORBA_StructDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_StructDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_StructDef_ptr CORBA_StructDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -6147,7 +6147,7 @@ CORBA_StructDef::_duplicate (CORBA_StructDef_ptr obj) return obj; } -CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) || @@ -6159,7 +6159,7 @@ CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_StructDef::_tao_QueryInterface (ptr_arith_t type) @@ -6244,38 +6244,38 @@ const char* CORBA_StructDef::_interface_repository_id (void) const } CORBA_StructMemberSeq * CORBA_StructDef::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_StructDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.members ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_StructDef::members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_StructDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.members ( this, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6306,10 +6306,10 @@ tao_CORBA_UnionDef_nil ( CORBA_UnionDef_ptr tao_CORBA_UnionDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_UnionDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_UnionDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -6433,10 +6433,10 @@ CORBA_UnionDef_var::tao_nil (void) ::CORBA_UnionDef_ptr CORBA_UnionDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_UnionDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_UnionDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -6514,21 +6514,21 @@ public: TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6544,30 +6544,30 @@ private: TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6575,13 +6575,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (TAO_ENV CORBA::Any * -TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6603,21 +6603,21 @@ public: TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6633,30 +6633,30 @@ private: TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6664,13 +6664,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (TAO CORBA::Any * -TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6693,21 +6693,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6723,19 +6723,19 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ClientReque TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), discriminator_type_def_ (discriminator_type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6751,12 +6751,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6764,13 +6764,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (TAO CORBA::Any * -TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -6782,21 +6782,21 @@ public: TAO_ClientRequestInfo_CORBA_UnionDef_members_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6812,30 +6812,30 @@ private: TAO_ClientRequestInfo_CORBA_UnionDef_members_get::TAO_ClientRequestInfo_CORBA_UnionDef_members_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_UnionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6843,13 +6843,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG CORBA::Any * -TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6872,21 +6872,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6902,19 +6902,19 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::TAO_ClientRequestInfo_CORBA_Un TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), members_ (members) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6930,12 +6930,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6943,13 +6943,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG CORBA::Any * -TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -6971,7 +6971,7 @@ _TAO_CORBA_UnionDef_Remote_Proxy_Impl::_TAO_CORBA_UnionDef_Remote_Proxy_Impl (vo CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7014,7 +7014,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type ( TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -7030,7 +7030,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7042,17 +7042,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7069,7 +7069,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7097,7 +7097,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7107,12 +7107,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7123,7 +7123,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7139,7 +7139,7 @@ return _tao_safe_retval._retn (); CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7182,7 +7182,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -7198,7 +7198,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7210,17 +7210,17 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7237,7 +7237,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7265,7 +7265,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7275,12 +7275,12 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7291,7 +7291,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7308,7 +7308,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7351,7 +7351,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( &_tao_call, _collocated_tao_target_, discriminator_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -7367,7 +7367,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7379,12 +7379,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7397,7 +7397,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7413,7 +7413,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7427,7 +7427,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7437,12 +7437,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7453,7 +7453,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7469,7 +7469,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def ( CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7513,7 +7513,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( TAO_ClientRequestInfo_CORBA_UnionDef_members_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -7529,7 +7529,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7541,17 +7541,17 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7568,7 +7568,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7596,7 +7596,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7606,12 +7606,12 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7622,7 +7622,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7639,7 +7639,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7682,7 +7682,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( &_tao_call, _collocated_tao_target_, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -7698,7 +7698,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7710,12 +7710,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7728,7 +7728,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7744,7 +7744,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7758,7 +7758,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7768,12 +7768,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7784,7 +7784,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7839,7 +7839,7 @@ _TAO_CORBA_UnionDef_Remote_Proxy_Broker::~_TAO_CORBA_UnionDef_Remote_Proxy_Broke _TAO_CORBA_UnionDef_Proxy_Impl& _TAO_CORBA_UnionDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_UnionDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -7884,24 +7884,24 @@ void CORBA_UnionDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_UnionDef_ptr CORBA_UnionDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_UnionDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/UnionDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/UnionDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (is_a == 0) return CORBA_UnionDef::_nil (); } - return CORBA_UnionDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_UnionDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_UnionDef_ptr CORBA_UnionDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -7956,7 +7956,7 @@ CORBA_UnionDef::_duplicate (CORBA_UnionDef_ptr obj) return obj; } -CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) || @@ -7968,7 +7968,7 @@ CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_UnionDef::_tao_QueryInterface (ptr_arith_t type) @@ -8053,91 +8053,91 @@ const char* CORBA_UnionDef::_interface_repository_id (void) const } CORBA::TypeCode_ptr CORBA_UnionDef::discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_UnionDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.discriminator_type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_IDLType_ptr CORBA_UnionDef::discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_UnionDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.discriminator_type_def ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_UnionDef::discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_UnionDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.discriminator_type_def ( this, discriminator_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_UnionMemberSeq * CORBA_UnionDef::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_UnionDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.members ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_UnionDef::members ( const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_UnionDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.members ( this, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -8168,10 +8168,10 @@ tao_CORBA_EnumDef_nil ( CORBA_EnumDef_ptr tao_CORBA_EnumDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_EnumDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_EnumDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -8295,10 +8295,10 @@ CORBA_EnumDef_var::tao_nil (void) ::CORBA_EnumDef_ptr CORBA_EnumDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_EnumDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_EnumDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -8376,21 +8376,21 @@ public: TAO_ClientRequestInfo_CORBA_EnumDef_members_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -8406,30 +8406,30 @@ private: TAO_ClientRequestInfo_CORBA_EnumDef_members_get::TAO_ClientRequestInfo_CORBA_EnumDef_members_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_EnumDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_EnumDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -8437,13 +8437,13 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -8466,21 +8466,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -8496,19 +8496,19 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::TAO_ClientRequestInfo_CORBA_Enu TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), members_ (members) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -8524,12 +8524,12 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -8537,13 +8537,13 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -8565,7 +8565,7 @@ _TAO_CORBA_EnumDef_Remote_Proxy_Impl::_TAO_CORBA_EnumDef_Remote_Proxy_Impl (void CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8609,7 +8609,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( TAO_ClientRequestInfo_CORBA_EnumDef_members_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8625,7 +8625,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8637,17 +8637,17 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8664,7 +8664,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8692,7 +8692,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8702,12 +8702,12 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8718,7 +8718,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8735,7 +8735,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8778,7 +8778,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( &_tao_call, _collocated_tao_target_, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -8794,7 +8794,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8806,12 +8806,12 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8824,7 +8824,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8840,7 +8840,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8854,7 +8854,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8864,12 +8864,12 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8880,7 +8880,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8935,7 +8935,7 @@ _TAO_CORBA_EnumDef_Remote_Proxy_Broker::~_TAO_CORBA_EnumDef_Remote_Proxy_Broker _TAO_CORBA_EnumDef_Proxy_Impl& _TAO_CORBA_EnumDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_EnumDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -8978,24 +8978,24 @@ void CORBA_EnumDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_EnumDef_ptr CORBA_EnumDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_EnumDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/EnumDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/EnumDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (is_a == 0) return CORBA_EnumDef::_nil (); } - return CORBA_EnumDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_EnumDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_EnumDef_ptr CORBA_EnumDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -9050,7 +9050,7 @@ CORBA_EnumDef::_duplicate (CORBA_EnumDef_ptr obj) return obj; } -CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) || @@ -9061,7 +9061,7 @@ CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_EnumDef::_tao_QueryInterface (ptr_arith_t type) @@ -9134,38 +9134,38 @@ const char* CORBA_EnumDef::_interface_repository_id (void) const } CORBA_EnumMemberSeq * CORBA_EnumDef::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_EnumDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.members ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_EnumDef::members ( const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_EnumDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.members ( this, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -9196,10 +9196,10 @@ tao_CORBA_AliasDef_nil ( CORBA_AliasDef_ptr tao_CORBA_AliasDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_AliasDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_AliasDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -9323,10 +9323,10 @@ CORBA_AliasDef_var::tao_nil (void) ::CORBA_AliasDef_ptr CORBA_AliasDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_AliasDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_AliasDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -9404,21 +9404,21 @@ public: TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9434,30 +9434,30 @@ private: TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9465,13 +9465,13 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (TAO_ENV_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9494,21 +9494,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9524,19 +9524,19 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ClientRequestInf TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), original_type_def_ (original_type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -9552,12 +9552,12 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_S } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9565,13 +9565,13 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (TAO_ENV_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -9593,7 +9593,7 @@ _TAO_CORBA_AliasDef_Remote_Proxy_Impl::_TAO_CORBA_AliasDef_Remote_Proxy_Impl (vo CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9636,7 +9636,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -9652,7 +9652,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9664,17 +9664,17 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -9691,7 +9691,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -9719,7 +9719,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9729,12 +9729,12 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9745,7 +9745,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -9762,7 +9762,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9805,7 +9805,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( &_tao_call, _collocated_tao_target_, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -9821,7 +9821,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9833,12 +9833,12 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9851,7 +9851,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -9867,7 +9867,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -9881,7 +9881,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -9891,12 +9891,12 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9907,7 +9907,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -9962,7 +9962,7 @@ _TAO_CORBA_AliasDef_Remote_Proxy_Broker::~_TAO_CORBA_AliasDef_Remote_Proxy_Broke _TAO_CORBA_AliasDef_Proxy_Impl& _TAO_CORBA_AliasDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_AliasDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -10005,24 +10005,24 @@ void CORBA_AliasDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_AliasDef_ptr CORBA_AliasDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_AliasDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AliasDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AliasDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); if (is_a == 0) return CORBA_AliasDef::_nil (); } - return CORBA_AliasDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_AliasDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_AliasDef_ptr CORBA_AliasDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -10077,7 +10077,7 @@ CORBA_AliasDef::_duplicate (CORBA_AliasDef_ptr obj) return obj; } -CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) || @@ -10088,7 +10088,7 @@ CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_AliasDef::_tao_QueryInterface (ptr_arith_t type) @@ -10161,38 +10161,38 @@ const char* CORBA_AliasDef::_interface_repository_id (void) const } CORBA_IDLType_ptr CORBA_AliasDef::original_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_AliasDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.original_type_def ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_AliasDef::original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_AliasDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.original_type_def ( this, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -10223,10 +10223,10 @@ tao_CORBA_NativeDef_nil ( CORBA_NativeDef_ptr tao_CORBA_NativeDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_NativeDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_NativeDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -10350,10 +10350,10 @@ CORBA_NativeDef_var::tao_nil (void) ::CORBA_NativeDef_ptr CORBA_NativeDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_NativeDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_NativeDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -10480,7 +10480,7 @@ _TAO_CORBA_NativeDef_Remote_Proxy_Broker::~_TAO_CORBA_NativeDef_Remote_Proxy_Bro _TAO_CORBA_NativeDef_Proxy_Impl& _TAO_CORBA_NativeDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_NativeDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -10523,24 +10523,24 @@ void CORBA_NativeDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_NativeDef_ptr CORBA_NativeDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_NativeDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/NativeDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/NativeDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); if (is_a == 0) return CORBA_NativeDef::_nil (); } - return CORBA_NativeDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_NativeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_NativeDef_ptr CORBA_NativeDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -10595,7 +10595,7 @@ CORBA_NativeDef::_duplicate (CORBA_NativeDef_ptr obj) return obj; } -CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) || @@ -10606,7 +10606,7 @@ CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_NativeDef::_tao_QueryInterface (ptr_arith_t type) @@ -10705,10 +10705,10 @@ tao_CORBA_PrimitiveDef_nil ( CORBA_PrimitiveDef_ptr tao_CORBA_PrimitiveDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_PrimitiveDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_PrimitiveDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -10832,10 +10832,10 @@ CORBA_PrimitiveDef_var::tao_nil (void) ::CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_PrimitiveDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_PrimitiveDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -10913,21 +10913,21 @@ public: TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -10943,30 +10943,30 @@ private: TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -10974,13 +10974,13 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11012,7 +11012,7 @@ _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::_TAO_CORBA_PrimitiveDef_Remote_Proxy_ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11054,7 +11054,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind ( TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -11070,7 +11070,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11082,17 +11082,17 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11109,7 +11109,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11136,7 +11136,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11146,12 +11146,12 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11162,7 +11162,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11217,7 +11217,7 @@ _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Remote_Pro _TAO_CORBA_PrimitiveDef_Proxy_Impl& _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_PrimitiveDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -11260,24 +11260,24 @@ void CORBA_PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_PrimitiveDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PrimitiveDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PrimitiveDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ()); if (is_a == 0) return CORBA_PrimitiveDef::_nil (); } - return CORBA_PrimitiveDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_PrimitiveDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -11332,7 +11332,7 @@ CORBA_PrimitiveDef::_duplicate (CORBA_PrimitiveDef_ptr obj) return obj; } -CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) || @@ -11341,7 +11341,7 @@ CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_PrimitiveDef::_tao_QueryInterface (ptr_arith_t type) @@ -11390,19 +11390,19 @@ const char* CORBA_PrimitiveDef::_interface_repository_id (void) const } CORBA::PrimitiveKind CORBA_PrimitiveDef::kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_PrimitiveDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ((CORBA::PrimitiveKind)0); return proxy.kind ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -11433,10 +11433,10 @@ tao_CORBA_StringDef_nil ( CORBA_StringDef_ptr tao_CORBA_StringDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_StringDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_StringDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -11560,10 +11560,10 @@ CORBA_StringDef_var::tao_nil (void) ::CORBA_StringDef_ptr CORBA_StringDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_StringDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_StringDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -11641,21 +11641,21 @@ public: TAO_ClientRequestInfo_CORBA_StringDef_bound_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -11671,30 +11671,30 @@ private: TAO_ClientRequestInfo_CORBA_StringDef_bound_get::TAO_ClientRequestInfo_CORBA_StringDef_bound_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_StringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -11702,13 +11702,13 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11731,21 +11731,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -11761,19 +11761,19 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::TAO_ClientRequestInfo_CORBA_Str TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), bound_ (bound) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -11789,12 +11789,12 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -11802,13 +11802,13 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -11830,7 +11830,7 @@ _TAO_CORBA_StringDef_Remote_Proxy_Impl::_TAO_CORBA_StringDef_Remote_Proxy_Impl ( CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11872,7 +11872,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( TAO_ClientRequestInfo_CORBA_StringDef_bound_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -11888,7 +11888,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11900,17 +11900,17 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11927,7 +11927,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11954,7 +11954,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11964,12 +11964,12 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11980,7 +11980,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11997,7 +11997,7 @@ return _tao_retval; void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12040,7 +12040,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( &_tao_call, _collocated_tao_target_, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -12056,7 +12056,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12068,12 +12068,12 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -12086,7 +12086,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -12102,7 +12102,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -12116,7 +12116,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12126,12 +12126,12 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -12142,7 +12142,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -12197,7 +12197,7 @@ _TAO_CORBA_StringDef_Remote_Proxy_Broker::~_TAO_CORBA_StringDef_Remote_Proxy_Bro _TAO_CORBA_StringDef_Proxy_Impl& _TAO_CORBA_StringDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_StringDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -12240,24 +12240,24 @@ void CORBA_StringDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_StringDef_ptr CORBA_StringDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_StringDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StringDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StringDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StringDef::_nil ()); if (is_a == 0) return CORBA_StringDef::_nil (); } - return CORBA_StringDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_StringDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_StringDef_ptr CORBA_StringDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -12312,7 +12312,7 @@ CORBA_StringDef::_duplicate (CORBA_StringDef_ptr obj) return obj; } -CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) || @@ -12321,7 +12321,7 @@ CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_StringDef::_tao_QueryInterface (ptr_arith_t type) @@ -12370,38 +12370,38 @@ const char* CORBA_StringDef::_interface_repository_id (void) const } CORBA::ULong CORBA_StringDef::bound ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_StringDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.bound ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_StringDef::bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_StringDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.bound ( this, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12432,10 +12432,10 @@ tao_CORBA_WstringDef_nil ( CORBA_WstringDef_ptr tao_CORBA_WstringDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_WstringDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_WstringDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -12559,10 +12559,10 @@ CORBA_WstringDef_var::tao_nil (void) ::CORBA_WstringDef_ptr CORBA_WstringDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_WstringDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_WstringDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -12640,21 +12640,21 @@ public: TAO_ClientRequestInfo_CORBA_WstringDef_bound_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -12670,30 +12670,30 @@ private: TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::TAO_ClientRequestInfo_CORBA_WstringDef_bound_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -12701,13 +12701,13 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG CORBA::Any * -TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12730,21 +12730,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -12760,19 +12760,19 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::TAO_ClientRequestInfo_CORBA_Ws TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), bound_ (bound) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12788,12 +12788,12 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -12801,13 +12801,13 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG CORBA::Any * -TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -12829,7 +12829,7 @@ _TAO_CORBA_WstringDef_Remote_Proxy_Impl::_TAO_CORBA_WstringDef_Remote_Proxy_Impl CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12871,7 +12871,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( TAO_ClientRequestInfo_CORBA_WstringDef_bound_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -12887,7 +12887,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12899,17 +12899,17 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -12926,7 +12926,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -12953,7 +12953,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12963,12 +12963,12 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -12979,7 +12979,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -12996,7 +12996,7 @@ return _tao_retval; void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -13039,7 +13039,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( &_tao_call, _collocated_tao_target_, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -13055,7 +13055,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -13067,12 +13067,12 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13085,7 +13085,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -13101,7 +13101,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -13115,7 +13115,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -13125,12 +13125,12 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13141,7 +13141,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -13196,7 +13196,7 @@ _TAO_CORBA_WstringDef_Remote_Proxy_Broker::~_TAO_CORBA_WstringDef_Remote_Proxy_B _TAO_CORBA_WstringDef_Proxy_Impl& _TAO_CORBA_WstringDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_WstringDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -13239,24 +13239,24 @@ void CORBA_WstringDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_WstringDef_ptr CORBA_WstringDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_WstringDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/WstringDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/WstringDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_WstringDef::_nil ()); if (is_a == 0) return CORBA_WstringDef::_nil (); } - return CORBA_WstringDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_WstringDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_WstringDef_ptr CORBA_WstringDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -13311,7 +13311,7 @@ CORBA_WstringDef::_duplicate (CORBA_WstringDef_ptr obj) return obj; } -CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) || @@ -13320,7 +13320,7 @@ CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_WstringDef::_tao_QueryInterface (ptr_arith_t type) @@ -13369,38 +13369,38 @@ const char* CORBA_WstringDef::_interface_repository_id (void) const } CORBA::ULong CORBA_WstringDef::bound ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_WstringDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.bound ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_WstringDef::bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_WstringDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.bound ( this, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -13431,10 +13431,10 @@ tao_CORBA_SequenceDef_nil ( CORBA_SequenceDef_ptr tao_CORBA_SequenceDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_SequenceDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_SequenceDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -13558,10 +13558,10 @@ CORBA_SequenceDef_var::tao_nil (void) ::CORBA_SequenceDef_ptr CORBA_SequenceDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_SequenceDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_SequenceDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -13639,21 +13639,21 @@ public: TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -13669,30 +13669,30 @@ private: TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -13700,13 +13700,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -13729,21 +13729,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -13759,19 +13759,19 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::TAO_ClientRequestInfo_CORBA_S TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), bound_ (bound) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -13787,12 +13787,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -13800,13 +13800,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -13818,21 +13818,21 @@ public: TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -13848,30 +13848,30 @@ private: TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -13879,13 +13879,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (TAO_ENV_SI CORBA::Any * -TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -13907,21 +13907,21 @@ public: TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -13937,30 +13937,30 @@ private: TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -13968,13 +13968,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (TAO_EN CORBA::Any * -TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -13997,21 +13997,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -14027,19 +14027,19 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ClientRequestI TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), element_type_def_ (element_type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -14055,12 +14055,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -14068,13 +14068,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (TAO_EN CORBA::Any * -TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -14096,7 +14096,7 @@ _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::_TAO_CORBA_SequenceDef_Remote_Proxy_Im CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14138,7 +14138,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -14154,7 +14154,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14166,17 +14166,17 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -14193,7 +14193,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -14220,7 +14220,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14230,12 +14230,12 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14246,7 +14246,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -14263,7 +14263,7 @@ return _tao_retval; void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14306,7 +14306,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( &_tao_call, _collocated_tao_target_, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -14322,7 +14322,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14334,12 +14334,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -14352,7 +14352,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -14368,7 +14368,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -14382,7 +14382,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14392,12 +14392,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14408,7 +14408,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -14424,7 +14424,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound ( CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14467,7 +14467,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type ( TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -14483,7 +14483,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14495,17 +14495,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -14522,7 +14522,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -14550,7 +14550,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14560,12 +14560,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14576,7 +14576,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -14592,7 +14592,7 @@ return _tao_safe_retval._retn (); CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14635,7 +14635,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -14651,7 +14651,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14663,17 +14663,17 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -14690,7 +14690,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -14718,7 +14718,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14728,12 +14728,12 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14744,7 +14744,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -14761,7 +14761,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14804,7 +14804,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( &_tao_call, _collocated_tao_target_, element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -14820,7 +14820,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14832,12 +14832,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -14850,7 +14850,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -14866,7 +14866,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -14880,7 +14880,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14890,12 +14890,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14906,7 +14906,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -14961,7 +14961,7 @@ _TAO_CORBA_SequenceDef_Remote_Proxy_Broker::~_TAO_CORBA_SequenceDef_Remote_Proxy _TAO_CORBA_SequenceDef_Proxy_Impl& _TAO_CORBA_SequenceDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_SequenceDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -15004,24 +15004,24 @@ void CORBA_SequenceDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_SequenceDef_ptr CORBA_SequenceDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_SequenceDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/SequenceDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/SequenceDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ()); if (is_a == 0) return CORBA_SequenceDef::_nil (); } - return CORBA_SequenceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_SequenceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_SequenceDef_ptr CORBA_SequenceDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -15076,7 +15076,7 @@ CORBA_SequenceDef::_duplicate (CORBA_SequenceDef_ptr obj) return obj; } -CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) || @@ -15085,7 +15085,7 @@ CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DE (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_SequenceDef::_tao_QueryInterface (ptr_arith_t type) @@ -15134,91 +15134,91 @@ const char* CORBA_SequenceDef::_interface_repository_id (void) const } CORBA::ULong CORBA_SequenceDef::bound ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.bound ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_SequenceDef::bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.bound ( this, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::TypeCode_ptr CORBA_SequenceDef::element_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.element_type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_IDLType_ptr CORBA_SequenceDef::element_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.element_type_def ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_SequenceDef::element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.element_type_def ( this, element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -15249,10 +15249,10 @@ tao_CORBA_ArrayDef_nil ( CORBA_ArrayDef_ptr tao_CORBA_ArrayDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_ArrayDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_ArrayDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -15376,10 +15376,10 @@ CORBA_ArrayDef_var::tao_nil (void) ::CORBA_ArrayDef_ptr CORBA_ArrayDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_ArrayDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_ArrayDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -15457,21 +15457,21 @@ public: TAO_ClientRequestInfo_CORBA_ArrayDef_length_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -15487,30 +15487,30 @@ private: TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::TAO_ClientRequestInfo_CORBA_ArrayDef_length_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -15518,13 +15518,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (TAO_ENV_SINGLE_ARG_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -15547,21 +15547,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & length - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -15577,19 +15577,19 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::TAO_ClientRequestInfo_CORBA_Arr TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & length - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), length_ (length) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -15605,12 +15605,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -15618,13 +15618,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (TAO_ENV_SINGLE_ARG_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -15636,21 +15636,21 @@ public: TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -15666,30 +15666,30 @@ private: TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -15697,13 +15697,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -15725,21 +15725,21 @@ public: TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -15755,30 +15755,30 @@ private: TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -15786,13 +15786,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (TAO_ENV_S CORBA::Any * -TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -15815,21 +15815,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -15845,19 +15845,19 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ClientRequestInfo TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), element_type_def_ (element_type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -15873,12 +15873,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SI } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -15886,13 +15886,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (TAO_ENV_S CORBA::Any * -TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -15914,7 +15914,7 @@ _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::_TAO_CORBA_ArrayDef_Remote_Proxy_Impl (vo CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -15956,7 +15956,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( TAO_ClientRequestInfo_CORBA_ArrayDef_length_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -15972,7 +15972,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -15984,17 +15984,17 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -16011,7 +16011,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -16038,7 +16038,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -16048,12 +16048,12 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16064,7 +16064,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -16081,7 +16081,7 @@ return _tao_retval; void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -16124,7 +16124,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( &_tao_call, _collocated_tao_target_, length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -16140,7 +16140,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -16152,12 +16152,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -16170,7 +16170,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -16186,7 +16186,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -16200,7 +16200,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -16210,12 +16210,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16226,7 +16226,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -16242,7 +16242,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length ( CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -16285,7 +16285,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type ( TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -16301,7 +16301,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -16313,17 +16313,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -16340,7 +16340,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -16368,7 +16368,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -16378,12 +16378,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16394,7 +16394,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -16410,7 +16410,7 @@ return _tao_safe_retval._retn (); CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -16453,7 +16453,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -16469,7 +16469,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -16481,17 +16481,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -16508,7 +16508,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -16536,7 +16536,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -16546,12 +16546,12 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16562,7 +16562,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -16579,7 +16579,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -16622,7 +16622,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( &_tao_call, _collocated_tao_target_, element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -16638,7 +16638,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -16650,12 +16650,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -16668,7 +16668,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -16684,7 +16684,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -16698,7 +16698,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -16708,12 +16708,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16724,7 +16724,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -16779,7 +16779,7 @@ _TAO_CORBA_ArrayDef_Remote_Proxy_Broker::~_TAO_CORBA_ArrayDef_Remote_Proxy_Broke _TAO_CORBA_ArrayDef_Proxy_Impl& _TAO_CORBA_ArrayDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_ArrayDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -16822,24 +16822,24 @@ void CORBA_ArrayDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_ArrayDef_ptr CORBA_ArrayDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ArrayDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ArrayDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ArrayDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ()); if (is_a == 0) return CORBA_ArrayDef::_nil (); } - return CORBA_ArrayDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_ArrayDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_ArrayDef_ptr CORBA_ArrayDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -16894,7 +16894,7 @@ CORBA_ArrayDef::_duplicate (CORBA_ArrayDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) || @@ -16903,7 +16903,7 @@ CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_ArrayDef::_tao_QueryInterface (ptr_arith_t type) @@ -16952,91 +16952,91 @@ const char* CORBA_ArrayDef::_interface_repository_id (void) const } CORBA::ULong CORBA_ArrayDef::length ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.length ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ArrayDef::length ( CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.length ( this, length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::TypeCode_ptr CORBA_ArrayDef::element_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.element_type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_IDLType_ptr CORBA_ArrayDef::element_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.element_type_def ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ArrayDef::element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.element_type_def ( this, element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -17067,10 +17067,10 @@ tao_CORBA_ExceptionDef_nil ( CORBA_ExceptionDef_ptr tao_CORBA_ExceptionDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_ExceptionDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_ExceptionDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -17194,10 +17194,10 @@ CORBA_ExceptionDef_var::tao_nil (void) ::CORBA_ExceptionDef_ptr CORBA_ExceptionDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_ExceptionDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_ExceptionDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -17275,21 +17275,21 @@ public: TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17305,30 +17305,30 @@ private: TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -17336,13 +17336,13 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -17364,21 +17364,21 @@ public: TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17394,30 +17394,30 @@ private: TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -17425,13 +17425,13 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (TAO_ENV_SINGLE CORBA::Any * -TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -17454,21 +17454,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17484,19 +17484,19 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::TAO_ClientRequestInfo_CORB TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), members_ (members) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -17512,12 +17512,12 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -17525,13 +17525,13 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (TAO_ENV_SINGLE CORBA::Any * -TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -17553,7 +17553,7 @@ _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::_TAO_CORBA_ExceptionDef_Remote_Proxy_ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17596,7 +17596,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type ( TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -17612,7 +17612,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -17624,17 +17624,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -17651,7 +17651,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -17679,7 +17679,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -17689,12 +17689,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17705,7 +17705,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -17721,7 +17721,7 @@ return _tao_safe_retval._retn (); CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17765,7 +17765,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -17781,7 +17781,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -17793,17 +17793,17 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -17820,7 +17820,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -17848,7 +17848,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -17858,12 +17858,12 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17874,7 +17874,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -17891,7 +17891,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17934,7 +17934,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( &_tao_call, _collocated_tao_target_, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -17950,7 +17950,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -17962,12 +17962,12 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -17980,7 +17980,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -17996,7 +17996,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -18010,7 +18010,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18020,12 +18020,12 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -18036,7 +18036,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -18091,7 +18091,7 @@ _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Remote_Pro _TAO_CORBA_ExceptionDef_Proxy_Impl& _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_ExceptionDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -18136,24 +18136,24 @@ void CORBA_ExceptionDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_ExceptionDef_ptr CORBA_ExceptionDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ExceptionDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ExceptionDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ExceptionDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); if (is_a == 0) return CORBA_ExceptionDef::_nil (); } - return CORBA_ExceptionDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_ExceptionDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_ExceptionDef_ptr CORBA_ExceptionDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -18208,7 +18208,7 @@ CORBA_ExceptionDef::_duplicate (CORBA_ExceptionDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) || @@ -18218,7 +18218,7 @@ CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_ExceptionDef::_tao_QueryInterface (ptr_arith_t type) @@ -18279,55 +18279,55 @@ const char* CORBA_ExceptionDef::_interface_repository_id (void) const } CORBA::TypeCode_ptr CORBA_ExceptionDef::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_StructMemberSeq * CORBA_ExceptionDef::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.members ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ExceptionDef::members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.members ( this, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -18411,11 +18411,11 @@ void _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA_ExceptionDef **tmp = ACE_static_cast (CORBA_ExceptionDef**, target); - *tmp = CORBA_ExceptionDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = CORBA_ExceptionDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -18600,10 +18600,10 @@ tao_CORBA_AttributeDef_nil ( CORBA_AttributeDef_ptr tao_CORBA_AttributeDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_AttributeDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_AttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -18727,10 +18727,10 @@ CORBA_AttributeDef_var::tao_nil (void) ::CORBA_AttributeDef_ptr CORBA_AttributeDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_AttributeDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_AttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -18808,21 +18808,21 @@ public: TAO_ClientRequestInfo_CORBA_AttributeDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -18838,30 +18838,30 @@ private: TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -18869,13 +18869,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18897,21 +18897,21 @@ public: TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -18927,30 +18927,30 @@ private: TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -18958,13 +18958,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18987,21 +18987,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -19017,19 +19017,19 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ClientRequestInfo_COR TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), type_def_ (type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -19045,12 +19045,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -19058,13 +19058,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -19076,21 +19076,21 @@ public: TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -19106,30 +19106,30 @@ private: TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -19137,13 +19137,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -19166,21 +19166,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -19196,19 +19196,19 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::TAO_ClientRequestInfo_CORBA_A TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), mode_ (mode) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -19224,12 +19224,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -19237,13 +19237,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -19265,7 +19265,7 @@ _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::_TAO_CORBA_AttributeDef_Remote_Proxy_ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19308,7 +19308,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type ( TAO_ClientRequestInfo_CORBA_AttributeDef_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -19324,7 +19324,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19336,17 +19336,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -19363,7 +19363,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -19391,7 +19391,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19401,12 +19401,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -19417,7 +19417,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -19433,7 +19433,7 @@ return _tao_safe_retval._retn (); CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19476,7 +19476,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -19492,7 +19492,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19504,17 +19504,17 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -19531,7 +19531,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -19559,7 +19559,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19569,12 +19569,12 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -19585,7 +19585,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -19602,7 +19602,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19645,7 +19645,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( &_tao_call, _collocated_tao_target_, type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -19661,7 +19661,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19673,12 +19673,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -19691,7 +19691,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -19707,7 +19707,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -19721,7 +19721,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19731,12 +19731,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -19747,7 +19747,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -19763,7 +19763,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def ( CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19805,7 +19805,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -19821,7 +19821,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19833,17 +19833,17 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -19860,7 +19860,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -19887,7 +19887,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19897,12 +19897,12 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -19913,7 +19913,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -19930,7 +19930,7 @@ return _tao_retval; void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19973,7 +19973,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( &_tao_call, _collocated_tao_target_, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -19989,7 +19989,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -20001,12 +20001,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20019,7 +20019,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -20035,7 +20035,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -20049,7 +20049,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -20059,12 +20059,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20075,7 +20075,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -20130,7 +20130,7 @@ _TAO_CORBA_AttributeDef_Remote_Proxy_Broker::~_TAO_CORBA_AttributeDef_Remote_Pro _TAO_CORBA_AttributeDef_Proxy_Impl& _TAO_CORBA_AttributeDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_AttributeDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -20173,24 +20173,24 @@ void CORBA_AttributeDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_AttributeDef_ptr CORBA_AttributeDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_AttributeDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AttributeDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AttributeDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); if (is_a == 0) return CORBA_AttributeDef::_nil (); } - return CORBA_AttributeDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_AttributeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_AttributeDef_ptr CORBA_AttributeDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -20245,7 +20245,7 @@ CORBA_AttributeDef::_duplicate (CORBA_AttributeDef_ptr obj) return obj; } -CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) || @@ -20254,7 +20254,7 @@ CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_AttributeDef::_tao_QueryInterface (ptr_arith_t type) @@ -20303,91 +20303,91 @@ const char* CORBA_AttributeDef::_interface_repository_id (void) const } CORBA::TypeCode_ptr CORBA_AttributeDef::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_IDLType_ptr CORBA_AttributeDef::type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type_def ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_AttributeDef::type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.type_def ( this, type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::AttributeMode CORBA_AttributeDef::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ((CORBA::AttributeMode)0); return proxy.mode ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_AttributeDef::mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.mode ( this, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -20574,10 +20574,10 @@ tao_CORBA_OperationDef_nil ( CORBA_OperationDef_ptr tao_CORBA_OperationDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_OperationDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_OperationDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -20701,10 +20701,10 @@ CORBA_OperationDef_var::tao_nil (void) ::CORBA_OperationDef_ptr CORBA_OperationDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_OperationDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_OperationDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -20782,21 +20782,21 @@ public: TAO_ClientRequestInfo_CORBA_OperationDef_result_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -20812,30 +20812,30 @@ private: TAO_ClientRequestInfo_CORBA_OperationDef_result_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_result_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_result_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -20843,13 +20843,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -20871,21 +20871,21 @@ public: TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -20901,30 +20901,30 @@ private: TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -20932,13 +20932,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -20961,21 +20961,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -20991,19 +20991,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::TAO_ClientRequestInfo_C TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), result_def_ (result_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21019,12 +21019,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -21032,13 +21032,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -21050,21 +21050,21 @@ public: TAO_ClientRequestInfo_CORBA_OperationDef_params_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21080,30 +21080,30 @@ private: TAO_ClientRequestInfo_CORBA_OperationDef_params_get::TAO_ClientRequestInfo_CORBA_OperationDef_params_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_params_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_params_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -21111,13 +21111,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21140,21 +21140,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21170,19 +21170,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::TAO_ClientRequestInfo_CORBA TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), params_ (params) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21198,12 +21198,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -21211,13 +21211,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -21229,21 +21229,21 @@ public: TAO_ClientRequestInfo_CORBA_OperationDef_mode_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21259,30 +21259,30 @@ private: TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::TAO_ClientRequestInfo_CORBA_OperationDef_mode_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -21290,13 +21290,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21319,21 +21319,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA::OperationMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21349,19 +21349,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::TAO_ClientRequestInfo_CORBA_O TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA::OperationMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), mode_ (mode) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21377,12 +21377,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -21390,13 +21390,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -21408,21 +21408,21 @@ public: TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21438,30 +21438,30 @@ private: TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -21469,13 +21469,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21498,21 +21498,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21528,19 +21528,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::TAO_ClientRequestInfo_COR TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), contexts_ (contexts) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21556,12 +21556,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -21569,13 +21569,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -21587,21 +21587,21 @@ public: TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21617,30 +21617,30 @@ private: TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -21648,13 +21648,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21677,21 +21677,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21707,19 +21707,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ClientRequestInfo_C TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), exceptions_ (exceptions) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21735,12 +21735,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -21748,13 +21748,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -21776,7 +21776,7 @@ _TAO_CORBA_OperationDef_Remote_Proxy_Impl::_TAO_CORBA_OperationDef_Remote_Proxy_ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -21819,7 +21819,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result ( TAO_ClientRequestInfo_CORBA_OperationDef_result_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -21835,7 +21835,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -21847,17 +21847,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -21874,7 +21874,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -21902,7 +21902,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -21912,12 +21912,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -21928,7 +21928,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -21944,7 +21944,7 @@ return _tao_safe_retval._retn (); CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -21987,7 +21987,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -22003,7 +22003,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22015,17 +22015,17 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -22042,7 +22042,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -22070,7 +22070,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22080,12 +22080,12 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22096,7 +22096,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -22113,7 +22113,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22156,7 +22156,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( &_tao_call, _collocated_tao_target_, result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -22172,7 +22172,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22184,12 +22184,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22202,7 +22202,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -22218,7 +22218,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -22232,7 +22232,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22242,12 +22242,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22258,7 +22258,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -22274,7 +22274,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def ( CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22318,7 +22318,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( TAO_ClientRequestInfo_CORBA_OperationDef_params_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -22334,7 +22334,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22346,17 +22346,17 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -22373,7 +22373,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -22401,7 +22401,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22411,12 +22411,12 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22427,7 +22427,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -22444,7 +22444,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( CORBA_Object *_collocated_tao_target_, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22487,7 +22487,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( &_tao_call, _collocated_tao_target_, params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -22503,7 +22503,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22515,12 +22515,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22533,7 +22533,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -22549,7 +22549,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -22563,7 +22563,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22573,12 +22573,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22589,7 +22589,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -22605,7 +22605,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params ( CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22647,7 +22647,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( TAO_ClientRequestInfo_CORBA_OperationDef_mode_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -22663,7 +22663,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22675,17 +22675,17 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -22702,7 +22702,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -22729,7 +22729,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22739,12 +22739,12 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22755,7 +22755,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -22772,7 +22772,7 @@ return _tao_retval; void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_, CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22815,7 +22815,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( &_tao_call, _collocated_tao_target_, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -22831,7 +22831,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22843,12 +22843,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22861,7 +22861,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -22877,7 +22877,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -22891,7 +22891,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -22901,12 +22901,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22917,7 +22917,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -22933,7 +22933,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode ( CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22977,7 +22977,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -22993,7 +22993,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -23005,17 +23005,17 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -23032,7 +23032,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -23060,7 +23060,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -23070,12 +23070,12 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -23086,7 +23086,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -23103,7 +23103,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( CORBA_Object *_collocated_tao_target_, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -23146,7 +23146,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( &_tao_call, _collocated_tao_target_, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -23162,7 +23162,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -23174,12 +23174,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -23192,7 +23192,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -23208,7 +23208,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -23222,7 +23222,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -23232,12 +23232,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -23248,7 +23248,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -23264,7 +23264,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts ( CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -23308,7 +23308,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -23324,7 +23324,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -23336,17 +23336,17 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -23363,7 +23363,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -23391,7 +23391,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -23401,12 +23401,12 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -23417,7 +23417,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -23434,7 +23434,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( CORBA_Object *_collocated_tao_target_, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -23477,7 +23477,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( &_tao_call, _collocated_tao_target_, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -23493,7 +23493,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -23505,12 +23505,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -23523,7 +23523,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -23539,7 +23539,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -23553,7 +23553,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -23563,12 +23563,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -23579,7 +23579,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -23634,7 +23634,7 @@ _TAO_CORBA_OperationDef_Remote_Proxy_Broker::~_TAO_CORBA_OperationDef_Remote_Pro _TAO_CORBA_OperationDef_Proxy_Impl& _TAO_CORBA_OperationDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_OperationDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -23677,24 +23677,24 @@ void CORBA_OperationDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_OperationDef_ptr CORBA_OperationDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_OperationDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/OperationDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/OperationDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); if (is_a == 0) return CORBA_OperationDef::_nil (); } - return CORBA_OperationDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_OperationDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_OperationDef_ptr CORBA_OperationDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -23749,7 +23749,7 @@ CORBA_OperationDef::_duplicate (CORBA_OperationDef_ptr obj) return obj; } -CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || @@ -23758,7 +23758,7 @@ CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_OperationDef::_tao_QueryInterface (ptr_arith_t type) @@ -23807,199 +23807,199 @@ const char* CORBA_OperationDef::_interface_repository_id (void) const } CORBA::TypeCode_ptr CORBA_OperationDef::result ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.result ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_IDLType_ptr CORBA_OperationDef::result_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.result_def ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_OperationDef::result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.result_def ( this, result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ParDescriptionSeq * CORBA_OperationDef::params ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.params ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_OperationDef::params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.params ( this, params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::OperationMode CORBA_OperationDef::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ((CORBA::OperationMode)0); return proxy.mode ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_OperationDef::mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.mode ( this, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ContextIdSeq * CORBA_OperationDef::contexts ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.contexts ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_OperationDef::contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.contexts ( this, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ExceptionDefSeq * CORBA_OperationDef::exceptions ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.exceptions ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_OperationDef::exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_OperationDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.exceptions ( this, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -24278,10 +24278,10 @@ tao_CORBA_InterfaceDef_nil ( CORBA_InterfaceDef_ptr tao_CORBA_InterfaceDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_InterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_InterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -24405,10 +24405,10 @@ CORBA_InterfaceDef_var::tao_nil (void) ::CORBA_InterfaceDef_ptr CORBA_InterfaceDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_InterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_InterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -24486,21 +24486,21 @@ public: TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -24516,30 +24516,30 @@ private: TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -24547,13 +24547,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (TAO_EN CORBA::Any * -TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -24576,21 +24576,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -24606,19 +24606,19 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ClientRequestI TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), base_interfaces_ (base_interfaces) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -24634,12 +24634,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -24647,13 +24647,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (TAO_EN CORBA::Any * -TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -24666,21 +24666,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -24698,19 +24698,19 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::TAO_ClientRequestInfo_CORBA_Inter TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * interface_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), interface_id_ (interface_id) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -24726,12 +24726,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DEC } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -24739,13 +24739,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DE CORBA::Any * -TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -24767,21 +24767,21 @@ public: TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -24797,30 +24797,30 @@ private: TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -24828,13 +24828,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (TAO_ENV CORBA::Any * -TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -24861,21 +24861,21 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -24901,7 +24901,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -24912,12 +24912,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -24945,12 +24945,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SI } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -24958,13 +24958,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (TAO_ENV_S CORBA::Any * -TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -24994,21 +24994,21 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -25040,7 +25040,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -25054,12 +25054,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -25096,12 +25096,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SI } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -25109,13 +25109,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (TAO_ENV_S CORBA::Any * -TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -25147,7 +25147,7 @@ _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::_TAO_CORBA_InterfaceDef_Remote_Proxy_ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -25191,7 +25191,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -25207,7 +25207,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25219,17 +25219,17 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -25246,7 +25246,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -25274,7 +25274,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25284,12 +25284,12 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -25300,7 +25300,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -25317,7 +25317,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -25360,7 +25360,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( &_tao_call, _collocated_tao_target_, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -25376,7 +25376,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25388,12 +25388,12 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -25406,7 +25406,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -25422,7 +25422,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -25436,7 +25436,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25446,12 +25446,12 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -25462,7 +25462,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -25479,7 +25479,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces ( CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -25522,7 +25522,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a ( &_tao_call, _collocated_tao_target_, interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -25538,7 +25538,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25550,12 +25550,12 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -25569,7 +25569,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -25586,7 +25586,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -25613,7 +25613,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25623,12 +25623,12 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -25639,7 +25639,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -25655,7 +25655,7 @@ return _tao_retval; CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::describe_interface ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -25698,7 +25698,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -25714,7 +25714,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25726,17 +25726,17 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -25753,7 +25753,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -25781,7 +25781,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25791,12 +25791,12 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -25807,7 +25807,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -25828,7 +25828,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -25876,7 +25876,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -25892,7 +25892,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25904,12 +25904,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -25927,7 +25927,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -25944,7 +25944,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -25972,7 +25972,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -25982,12 +25982,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -25998,7 +25998,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -26022,7 +26022,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -26073,7 +26073,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -26089,7 +26089,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -26101,12 +26101,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -26127,7 +26127,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -26144,7 +26144,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -26172,7 +26172,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -26182,12 +26182,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -26198,7 +26198,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -26253,7 +26253,7 @@ _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Remote_Pro _TAO_CORBA_InterfaceDef_Proxy_Impl& _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_InterfaceDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -26300,24 +26300,24 @@ void CORBA_InterfaceDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_InterfaceDef_ptr CORBA_InterfaceDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_InterfaceDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/InterfaceDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/InterfaceDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (is_a == 0) return CORBA_InterfaceDef::_nil (); } - return CORBA_InterfaceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_InterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_InterfaceDef_ptr CORBA_InterfaceDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -26372,7 +26372,7 @@ CORBA_InterfaceDef::_duplicate (CORBA_InterfaceDef_ptr obj) return obj; } -CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || @@ -26383,7 +26383,7 @@ CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_InterfaceDef::_tao_QueryInterface (ptr_arith_t type) @@ -26456,57 +26456,57 @@ const char* CORBA_InterfaceDef::_interface_repository_id (void) const } CORBA_InterfaceDefSeq * CORBA_InterfaceDef::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.base_interfaces ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_InterfaceDef::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.base_interfaces ( this, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Boolean CORBA_InterfaceDef::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_a ( this, interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -27437,19 +27437,19 @@ void CORBA_InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_t } CORBA_InterfaceDef::FullInterfaceDescription * CORBA_InterfaceDef::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.describe_interface ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -27459,14 +27459,14 @@ CORBA_AttributeDef_ptr CORBA_InterfaceDef::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_attribute ( @@ -27476,7 +27476,7 @@ CORBA_AttributeDef_ptr CORBA_InterfaceDef::create_attribute ( version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -27489,14 +27489,14 @@ CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_operation ( @@ -27509,7 +27509,7 @@ CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -27546,10 +27546,10 @@ tao_CORBA_AbstractInterfaceDef_nil ( CORBA_AbstractInterfaceDef_ptr tao_CORBA_AbstractInterfaceDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_AbstractInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_AbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -27673,10 +27673,10 @@ CORBA_AbstractInterfaceDef_var::tao_nil (void) ::CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_AbstractInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_AbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -27803,7 +27803,7 @@ _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_AbstractInterfa _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl& _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_AbstractInterfaceDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -27846,24 +27846,24 @@ void CORBA_AbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_AbstractInterfaceDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AbstractInterfaceDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AbstractInterfaceDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); if (is_a == 0) return CORBA_AbstractInterfaceDef::_nil (); } - return CORBA_AbstractInterfaceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_AbstractInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -27918,7 +27918,7 @@ CORBA_AbstractInterfaceDef::_duplicate (CORBA_AbstractInterfaceDef_ptr obj) return obj; } -CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) || @@ -27930,7 +27930,7 @@ CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value TAO_E (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) @@ -28041,10 +28041,10 @@ tao_CORBA_LocalInterfaceDef_nil ( CORBA_LocalInterfaceDef_ptr tao_CORBA_LocalInterfaceDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_LocalInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_LocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -28168,10 +28168,10 @@ CORBA_LocalInterfaceDef_var::tao_nil (void) ::CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_LocalInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_LocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -28298,7 +28298,7 @@ _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_LocalInterfaceDef_ _TAO_CORBA_LocalInterfaceDef_Proxy_Impl& _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_LocalInterfaceDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -28341,24 +28341,24 @@ void CORBA_LocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_LocalInterfaceDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/LocalInterfaceDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/LocalInterfaceDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); if (is_a == 0) return CORBA_LocalInterfaceDef::_nil (); } - return CORBA_LocalInterfaceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_LocalInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -28413,7 +28413,7 @@ CORBA_LocalInterfaceDef::_duplicate (CORBA_LocalInterfaceDef_ptr obj) return obj; } -CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) || @@ -28425,7 +28425,7 @@ CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) @@ -28526,7 +28526,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveKind &_t { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveKind TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveKind ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -28572,7 +28572,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Repository_ptr &_t _tao_elem = CORBA_Repository::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_Repository TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_Repository ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -28633,7 +28633,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ModuleDef_ptr &_ta _tao_elem = CORBA_ModuleDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -28708,7 +28708,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ModuleDescri { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -28777,7 +28777,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstantDef_ptr &_ _tao_elem = CORBA_ConstantDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -28852,7 +28852,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ConstantDesc { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -28921,7 +28921,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StructDef_ptr &_ta _tao_elem = CORBA_StructDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_StructDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_StructDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -28982,7 +28982,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_UnionDef_ptr &_tao _tao_elem = CORBA_UnionDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29043,7 +29043,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_EnumDef_ptr &_tao_ _tao_elem = CORBA_EnumDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29104,7 +29104,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AliasDef_ptr &_tao _tao_elem = CORBA_AliasDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_AliasDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_AliasDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29165,7 +29165,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_NativeDef_ptr &_ta _tao_elem = CORBA_NativeDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_NativeDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_NativeDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29226,7 +29226,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PrimitiveDef_ptr & _tao_elem = CORBA_PrimitiveDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29287,7 +29287,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringDef_ptr &_ta _tao_elem = CORBA_StringDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_StringDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_StringDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29348,7 +29348,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WstringDef_ptr &_t _tao_elem = CORBA_WstringDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_WstringDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_WstringDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29409,7 +29409,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_SequenceDef_ptr &_ _tao_elem = CORBA_SequenceDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_SequenceDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_SequenceDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29470,7 +29470,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ArrayDef_ptr &_tao _tao_elem = CORBA_ArrayDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ArrayDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ArrayDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29531,7 +29531,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ExceptionDef_ptr & _tao_elem = CORBA_ExceptionDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29606,7 +29606,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDes { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29697,7 +29697,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDef { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29788,7 +29788,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExcDescripti { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ExcDescriptionSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ExcDescriptionSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29851,7 +29851,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeMode &_t { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeMode TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeMode ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29897,7 +29897,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AttributeDef_ptr & _tao_elem = CORBA_AttributeDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -29972,7 +29972,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttributeDes { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30035,7 +30035,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationMode &_t { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationMode TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationMode ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30075,7 +30075,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterMode &_t { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterMode TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterMode ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30135,7 +30135,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParameterDes { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30226,7 +30226,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParDescripti { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ParDescriptionSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ParDescriptionSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30317,7 +30317,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ContextIdSeq { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ContextIdSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ContextIdSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30386,7 +30386,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OperationDef_ptr & _tao_elem = CORBA_OperationDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30461,7 +30461,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OperationDes { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30552,7 +30552,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_RepositoryId { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_RepositoryIdSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_RepositoryIdSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30643,7 +30643,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OpDescriptio { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_OpDescriptionSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_OpDescriptionSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30734,7 +30734,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttrDescript { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_AttrDescriptionSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_AttrDescriptionSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30803,7 +30803,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InterfaceDef_ptr & _tao_elem = CORBA_InterfaceDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30878,7 +30878,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDef { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA_InterfaceDef::_tc_FullInterfaceDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA_InterfaceDef::_tc_FullInterfaceDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -30961,7 +30961,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDes { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -31030,7 +31030,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AbstractInterfaceD _tao_elem = CORBA_AbstractInterfaceDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -31091,7 +31091,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_LocalInterfaceDef_ _tao_elem = CORBA_LocalInterfaceDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -31152,7 +31152,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_Repository::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31188,7 +31188,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_ModuleDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31224,7 +31224,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_ConstantDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31260,7 +31260,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_StructDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31296,7 +31296,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_UnionDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31332,7 +31332,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_EnumDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31368,7 +31368,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_AliasDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31404,7 +31404,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_NativeDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31440,7 +31440,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_PrimitiveDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31476,7 +31476,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_StringDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31512,7 +31512,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_WstringDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31548,7 +31548,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_SequenceDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31584,7 +31584,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_ArrayDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31620,7 +31620,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_ExceptionDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31740,7 +31740,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_AttributeDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -31860,7 +31860,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_OperationDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -32022,7 +32022,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_InterfaceDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -32058,7 +32058,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_AbstractInterfaceDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -32094,7 +32094,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_LocalInterfaceDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h index 992841af4ef..05f9d665f44 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.h +++ b/TAO/tao/IFR_Client/IFR_BasicC.h @@ -94,7 +94,7 @@ public: static CORBA_PrimitiveDef_ptr tao_nil (void); static CORBA_PrimitiveDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -173,7 +173,7 @@ public: static CORBA_StringDef_ptr tao_nil (void); static CORBA_StringDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -252,7 +252,7 @@ public: static CORBA_SequenceDef_ptr tao_nil (void); static CORBA_SequenceDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -331,7 +331,7 @@ public: static CORBA_ArrayDef_ptr tao_nil (void); static CORBA_ArrayDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -410,7 +410,7 @@ public: static CORBA_WstringDef_ptr tao_nil (void); static CORBA_WstringDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -489,7 +489,7 @@ public: static CORBA_FixedDef_ptr tao_nil (void); static CORBA_FixedDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -567,7 +567,7 @@ public: static CORBA_Repository_ptr tao_nil (void); static CORBA_Repository_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -631,12 +631,12 @@ public: static CORBA_Repository_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Repository_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Repository_ptr _nil (void) @@ -648,7 +648,7 @@ public: virtual CORBA_Contained_ptr lookup_id ( const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -656,7 +656,7 @@ public: virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -664,7 +664,7 @@ public: virtual CORBA_PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -672,7 +672,7 @@ public: virtual CORBA_StringDef_ptr create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -680,7 +680,7 @@ public: virtual CORBA_WstringDef_ptr create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -689,7 +689,7 @@ public: virtual CORBA_SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -698,7 +698,7 @@ public: virtual CORBA_ArrayDef_ptr create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -707,7 +707,7 @@ public: virtual CORBA_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -715,7 +715,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -766,7 +766,7 @@ public: virtual CORBA_Contained_ptr lookup_id ( CORBA_Object *_collocated_tao_target_, const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -775,7 +775,7 @@ public: virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA_Object *_collocated_tao_target_, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -784,7 +784,7 @@ public: virtual CORBA_PrimitiveDef_ptr get_primitive ( CORBA_Object *_collocated_tao_target_, CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -793,7 +793,7 @@ public: virtual CORBA_StringDef_ptr create_string ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -802,7 +802,7 @@ public: virtual CORBA_WstringDef_ptr create_wstring ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -812,7 +812,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -822,7 +822,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -832,7 +832,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -864,7 +864,7 @@ public: virtual CORBA_Contained_ptr lookup_id ( CORBA_Object *_collocated_tao_target_, const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -873,7 +873,7 @@ public: virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA_Object *_collocated_tao_target_, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -882,7 +882,7 @@ public: virtual CORBA_PrimitiveDef_ptr get_primitive ( CORBA_Object *_collocated_tao_target_, CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -891,7 +891,7 @@ public: virtual CORBA_StringDef_ptr create_string ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -900,7 +900,7 @@ public: virtual CORBA_WstringDef_ptr create_wstring ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -910,7 +910,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -920,7 +920,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -930,7 +930,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -959,7 +959,7 @@ public: virtual ~_TAO_CORBA_Repository_Proxy_Broker (void); virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy ( CORBA_Repository *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -986,7 +986,7 @@ public: virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy ( CORBA_Repository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1047,7 +1047,7 @@ public: static CORBA_ModuleDef_ptr tao_nil (void); static CORBA_ModuleDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1112,12 +1112,12 @@ public: static CORBA_ModuleDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ModuleDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ModuleDef_ptr _nil (void) @@ -1129,7 +1129,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1225,7 +1225,7 @@ public: virtual ~_TAO_CORBA_ModuleDef_Proxy_Broker (void); virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy ( CORBA_ModuleDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -1252,7 +1252,7 @@ public: virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy ( CORBA_ModuleDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1380,7 +1380,7 @@ public: static CORBA_ConstantDef_ptr tao_nil (void); static CORBA_ConstantDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1444,12 +1444,12 @@ public: static CORBA_ConstantDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ConstantDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ConstantDef_ptr _nil (void) @@ -1460,14 +1460,14 @@ public: static void _tao_any_destructor (void*); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1475,14 +1475,14 @@ public: virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Any * value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1490,7 +1490,7 @@ public: virtual void value ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1498,7 +1498,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1548,7 +1548,7 @@ public: virtual ~_TAO_CORBA_ConstantDef_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1556,7 +1556,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1565,7 +1565,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1573,7 +1573,7 @@ public: virtual CORBA::Any * value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1582,7 +1582,7 @@ public: virtual void value ( CORBA_Object *_collocated_tao_target_, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1613,7 +1613,7 @@ public: virtual ~_TAO_CORBA_ConstantDef_Remote_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1621,7 +1621,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1630,7 +1630,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1638,7 +1638,7 @@ public: virtual CORBA::Any * value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1647,7 +1647,7 @@ public: virtual void value ( CORBA_Object *_collocated_tao_target_, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1676,7 +1676,7 @@ public: virtual ~_TAO_CORBA_ConstantDef_Proxy_Broker (void); virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy ( CORBA_ConstantDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -1703,7 +1703,7 @@ public: virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy ( CORBA_ConstantDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1835,7 +1835,7 @@ public: static CORBA_StructDef_ptr tao_nil (void); static CORBA_StructDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1900,12 +1900,12 @@ public: static CORBA_StructDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_StructDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_StructDef_ptr _nil (void) @@ -1916,7 +1916,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1924,7 +1924,7 @@ public: virtual void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1932,7 +1932,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1983,7 +1983,7 @@ public: virtual ~_TAO_CORBA_StructDef_Proxy_Impl (void) { } virtual CORBA_StructMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1992,7 +1992,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2024,7 +2024,7 @@ public: virtual ~_TAO_CORBA_StructDef_Remote_Proxy_Impl (void) { } virtual CORBA_StructMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2033,7 +2033,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2062,7 +2062,7 @@ public: virtual ~_TAO_CORBA_StructDef_Proxy_Broker (void); virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy ( CORBA_StructDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -2089,7 +2089,7 @@ public: virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy ( CORBA_StructDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2151,7 +2151,7 @@ public: static CORBA_UnionDef_ptr tao_nil (void); static CORBA_UnionDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2216,12 +2216,12 @@ public: static CORBA_UnionDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_UnionDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_UnionDef_ptr _nil (void) @@ -2232,14 +2232,14 @@ public: static void _tao_any_destructor (void*); virtual CORBA::TypeCode_ptr discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_IDLType_ptr discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2247,14 +2247,14 @@ public: virtual void discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_UnionMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2262,7 +2262,7 @@ public: virtual void members ( const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2270,7 +2270,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2321,7 +2321,7 @@ public: virtual ~_TAO_CORBA_UnionDef_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr discriminator_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2329,7 +2329,7 @@ public: virtual CORBA_IDLType_ptr discriminator_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2338,7 +2338,7 @@ public: virtual void discriminator_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2346,7 +2346,7 @@ public: virtual CORBA_UnionMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2355,7 +2355,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2387,7 +2387,7 @@ public: virtual ~_TAO_CORBA_UnionDef_Remote_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr discriminator_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2395,7 +2395,7 @@ public: virtual CORBA_IDLType_ptr discriminator_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2404,7 +2404,7 @@ public: virtual void discriminator_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2412,7 +2412,7 @@ public: virtual CORBA_UnionMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2421,7 +2421,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2450,7 +2450,7 @@ public: virtual ~_TAO_CORBA_UnionDef_Proxy_Broker (void); virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy ( CORBA_UnionDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -2477,7 +2477,7 @@ public: virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy ( CORBA_UnionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2539,7 +2539,7 @@ public: static CORBA_EnumDef_ptr tao_nil (void); static CORBA_EnumDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2603,12 +2603,12 @@ public: static CORBA_EnumDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_EnumDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_EnumDef_ptr _nil (void) @@ -2619,7 +2619,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA_EnumMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2627,7 +2627,7 @@ public: virtual void members ( const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2635,7 +2635,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2685,7 +2685,7 @@ public: virtual ~_TAO_CORBA_EnumDef_Proxy_Impl (void) { } virtual CORBA_EnumMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2694,7 +2694,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2725,7 +2725,7 @@ public: virtual ~_TAO_CORBA_EnumDef_Remote_Proxy_Impl (void) { } virtual CORBA_EnumMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2734,7 +2734,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2763,7 +2763,7 @@ public: virtual ~_TAO_CORBA_EnumDef_Proxy_Broker (void); virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy ( CORBA_EnumDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -2790,7 +2790,7 @@ public: virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy ( CORBA_EnumDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2852,7 +2852,7 @@ public: static CORBA_AliasDef_ptr tao_nil (void); static CORBA_AliasDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2916,12 +2916,12 @@ public: static CORBA_AliasDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_AliasDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_AliasDef_ptr _nil (void) @@ -2932,7 +2932,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2940,7 +2940,7 @@ public: virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2948,7 +2948,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2998,7 +2998,7 @@ public: virtual ~_TAO_CORBA_AliasDef_Proxy_Impl (void) { } virtual CORBA_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3007,7 +3007,7 @@ public: virtual void original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3038,7 +3038,7 @@ public: virtual ~_TAO_CORBA_AliasDef_Remote_Proxy_Impl (void) { } virtual CORBA_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3047,7 +3047,7 @@ public: virtual void original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3076,7 +3076,7 @@ public: virtual ~_TAO_CORBA_AliasDef_Proxy_Broker (void); virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy ( CORBA_AliasDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -3103,7 +3103,7 @@ public: virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy ( CORBA_AliasDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3165,7 +3165,7 @@ public: static CORBA_NativeDef_ptr tao_nil (void); static CORBA_NativeDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -3229,12 +3229,12 @@ public: static CORBA_NativeDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_NativeDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_NativeDef_ptr _nil (void) @@ -3246,7 +3246,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -3340,7 +3340,7 @@ public: virtual ~_TAO_CORBA_NativeDef_Proxy_Broker (void); virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy ( CORBA_NativeDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -3367,7 +3367,7 @@ public: virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy ( CORBA_NativeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3414,12 +3414,12 @@ public: static CORBA_PrimitiveDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_PrimitiveDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_PrimitiveDef_ptr _nil (void) @@ -3430,7 +3430,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA::PrimitiveKind kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3438,7 +3438,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -3488,7 +3488,7 @@ public: virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Impl (void) { } virtual CORBA::PrimitiveKind kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3519,7 +3519,7 @@ public: virtual ~_TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl (void) { } virtual CORBA::PrimitiveKind kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3548,7 +3548,7 @@ public: virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Broker (void); virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy ( CORBA_PrimitiveDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -3575,7 +3575,7 @@ public: virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy ( CORBA_PrimitiveDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3622,12 +3622,12 @@ public: static CORBA_StringDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_StringDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_StringDef_ptr _nil (void) @@ -3638,7 +3638,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3646,7 +3646,7 @@ public: virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3654,7 +3654,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -3704,7 +3704,7 @@ public: virtual ~_TAO_CORBA_StringDef_Proxy_Impl (void) { } virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3713,7 +3713,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3744,7 +3744,7 @@ public: virtual ~_TAO_CORBA_StringDef_Remote_Proxy_Impl (void) { } virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3753,7 +3753,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3782,7 +3782,7 @@ public: virtual ~_TAO_CORBA_StringDef_Proxy_Broker (void); virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy ( CORBA_StringDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -3809,7 +3809,7 @@ public: virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy ( CORBA_StringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3856,12 +3856,12 @@ public: static CORBA_WstringDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_WstringDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_WstringDef_ptr _nil (void) @@ -3872,7 +3872,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3880,7 +3880,7 @@ public: virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3888,7 +3888,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -3938,7 +3938,7 @@ public: virtual ~_TAO_CORBA_WstringDef_Proxy_Impl (void) { } virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3947,7 +3947,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3978,7 +3978,7 @@ public: virtual ~_TAO_CORBA_WstringDef_Remote_Proxy_Impl (void) { } virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3987,7 +3987,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4016,7 +4016,7 @@ public: virtual ~_TAO_CORBA_WstringDef_Proxy_Broker (void); virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy ( CORBA_WstringDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -4043,7 +4043,7 @@ public: virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy ( CORBA_WstringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4090,12 +4090,12 @@ public: static CORBA_SequenceDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_SequenceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_SequenceDef_ptr _nil (void) @@ -4106,7 +4106,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4114,21 +4114,21 @@ public: virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4136,7 +4136,7 @@ public: virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4144,7 +4144,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -4194,7 +4194,7 @@ public: virtual ~_TAO_CORBA_SequenceDef_Proxy_Impl (void) { } virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4203,7 +4203,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4211,7 +4211,7 @@ public: virtual CORBA::TypeCode_ptr element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4219,7 +4219,7 @@ public: virtual CORBA_IDLType_ptr element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4228,7 +4228,7 @@ public: virtual void element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4259,7 +4259,7 @@ public: virtual ~_TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void) { } virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4268,7 +4268,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4276,7 +4276,7 @@ public: virtual CORBA::TypeCode_ptr element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4284,7 +4284,7 @@ public: virtual CORBA_IDLType_ptr element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4293,7 +4293,7 @@ public: virtual void element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4322,7 +4322,7 @@ public: virtual ~_TAO_CORBA_SequenceDef_Proxy_Broker (void); virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy ( CORBA_SequenceDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -4349,7 +4349,7 @@ public: virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy ( CORBA_SequenceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4396,12 +4396,12 @@ public: static CORBA_ArrayDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ArrayDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ArrayDef_ptr _nil (void) @@ -4412,7 +4412,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA::ULong length ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4420,21 +4420,21 @@ public: virtual void length ( CORBA::ULong length - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4442,7 +4442,7 @@ public: virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4450,7 +4450,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -4500,7 +4500,7 @@ public: virtual ~_TAO_CORBA_ArrayDef_Proxy_Impl (void) { } virtual CORBA::ULong length ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4509,7 +4509,7 @@ public: virtual void length ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4517,7 +4517,7 @@ public: virtual CORBA::TypeCode_ptr element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4525,7 +4525,7 @@ public: virtual CORBA_IDLType_ptr element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4534,7 +4534,7 @@ public: virtual void element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4565,7 +4565,7 @@ public: virtual ~_TAO_CORBA_ArrayDef_Remote_Proxy_Impl (void) { } virtual CORBA::ULong length ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4574,7 +4574,7 @@ public: virtual void length ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4582,7 +4582,7 @@ public: virtual CORBA::TypeCode_ptr element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4590,7 +4590,7 @@ public: virtual CORBA_IDLType_ptr element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4599,7 +4599,7 @@ public: virtual void element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4628,7 +4628,7 @@ public: virtual ~_TAO_CORBA_ArrayDef_Proxy_Broker (void); virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy ( CORBA_ArrayDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -4655,7 +4655,7 @@ public: virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy ( CORBA_ArrayDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4716,7 +4716,7 @@ public: static CORBA_ExceptionDef_ptr tao_nil (void); static CORBA_ExceptionDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -4781,12 +4781,12 @@ public: static CORBA_ExceptionDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ExceptionDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ExceptionDef_ptr _nil (void) @@ -4797,14 +4797,14 @@ public: static void _tao_any_destructor (void*); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4812,7 +4812,7 @@ public: virtual void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4820,7 +4820,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -4871,7 +4871,7 @@ public: virtual ~_TAO_CORBA_ExceptionDef_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4879,7 +4879,7 @@ public: virtual CORBA_StructMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4888,7 +4888,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4920,7 +4920,7 @@ public: virtual ~_TAO_CORBA_ExceptionDef_Remote_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4928,7 +4928,7 @@ public: virtual CORBA_StructMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4937,7 +4937,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4966,7 +4966,7 @@ public: virtual ~_TAO_CORBA_ExceptionDef_Proxy_Broker (void); virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy ( CORBA_ExceptionDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -4993,7 +4993,7 @@ public: virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy ( CORBA_ExceptionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5130,7 +5130,7 @@ public: virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -5451,7 +5451,7 @@ public: static CORBA_AttributeDef_ptr tao_nil (void); static CORBA_AttributeDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -5515,12 +5515,12 @@ public: static CORBA_AttributeDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_AttributeDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_AttributeDef_ptr _nil (void) @@ -5531,14 +5531,14 @@ public: static void _tao_any_destructor (void*); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5546,14 +5546,14 @@ public: virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::AttributeMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5561,7 +5561,7 @@ public: virtual void mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5569,7 +5569,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -5619,7 +5619,7 @@ public: virtual ~_TAO_CORBA_AttributeDef_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5627,7 +5627,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5636,7 +5636,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5644,7 +5644,7 @@ public: virtual CORBA::AttributeMode mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5653,7 +5653,7 @@ public: virtual void mode ( CORBA_Object *_collocated_tao_target_, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5684,7 +5684,7 @@ public: virtual ~_TAO_CORBA_AttributeDef_Remote_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5692,7 +5692,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5701,7 +5701,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5709,7 +5709,7 @@ public: virtual CORBA::AttributeMode mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5718,7 +5718,7 @@ public: virtual void mode ( CORBA_Object *_collocated_tao_target_, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5747,7 +5747,7 @@ public: virtual ~_TAO_CORBA_AttributeDef_Proxy_Broker (void); virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy ( CORBA_AttributeDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -5774,7 +5774,7 @@ public: virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy ( CORBA_AttributeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -6247,7 +6247,7 @@ public: static CORBA_OperationDef_ptr tao_nil (void); static CORBA_OperationDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -6311,12 +6311,12 @@ public: static CORBA_OperationDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_OperationDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_OperationDef_ptr _nil (void) @@ -6327,14 +6327,14 @@ public: static void _tao_any_destructor (void*); virtual CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6342,14 +6342,14 @@ public: virtual void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_ParDescriptionSeq * params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6357,14 +6357,14 @@ public: virtual void params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6372,14 +6372,14 @@ public: virtual void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_ContextIdSeq * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6387,14 +6387,14 @@ public: virtual void contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_ExceptionDefSeq * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6402,7 +6402,7 @@ public: virtual void exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6410,7 +6410,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -6460,7 +6460,7 @@ public: virtual ~_TAO_CORBA_OperationDef_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr result ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6468,7 +6468,7 @@ public: virtual CORBA_IDLType_ptr result_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6477,7 +6477,7 @@ public: virtual void result_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6485,7 +6485,7 @@ public: virtual CORBA_ParDescriptionSeq * params ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6494,7 +6494,7 @@ public: virtual void params ( CORBA_Object *_collocated_tao_target_, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6502,7 +6502,7 @@ public: virtual CORBA::OperationMode mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6511,7 +6511,7 @@ public: virtual void mode ( CORBA_Object *_collocated_tao_target_, CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6519,7 +6519,7 @@ public: virtual CORBA_ContextIdSeq * contexts ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6528,7 +6528,7 @@ public: virtual void contexts ( CORBA_Object *_collocated_tao_target_, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6536,7 +6536,7 @@ public: virtual CORBA_ExceptionDefSeq * exceptions ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6545,7 +6545,7 @@ public: virtual void exceptions ( CORBA_Object *_collocated_tao_target_, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6576,7 +6576,7 @@ public: virtual ~_TAO_CORBA_OperationDef_Remote_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr result ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6584,7 +6584,7 @@ public: virtual CORBA_IDLType_ptr result_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6593,7 +6593,7 @@ public: virtual void result_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6601,7 +6601,7 @@ public: virtual CORBA_ParDescriptionSeq * params ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6610,7 +6610,7 @@ public: virtual void params ( CORBA_Object *_collocated_tao_target_, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6618,7 +6618,7 @@ public: virtual CORBA::OperationMode mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6627,7 +6627,7 @@ public: virtual void mode ( CORBA_Object *_collocated_tao_target_, CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6635,7 +6635,7 @@ public: virtual CORBA_ContextIdSeq * contexts ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6644,7 +6644,7 @@ public: virtual void contexts ( CORBA_Object *_collocated_tao_target_, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6652,7 +6652,7 @@ public: virtual CORBA_ExceptionDefSeq * exceptions ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6661,7 +6661,7 @@ public: virtual void exceptions ( CORBA_Object *_collocated_tao_target_, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6690,7 +6690,7 @@ public: virtual ~_TAO_CORBA_OperationDef_Proxy_Broker (void); virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy ( CORBA_OperationDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -6717,7 +6717,7 @@ public: virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy ( CORBA_OperationDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -7283,7 +7283,7 @@ public: static CORBA_InterfaceDef_ptr tao_nil (void); static CORBA_InterfaceDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -7349,12 +7349,12 @@ public: static CORBA_InterfaceDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_InterfaceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_InterfaceDef_ptr _nil (void) @@ -7365,7 +7365,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -7373,7 +7373,7 @@ public: virtual void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -7381,7 +7381,7 @@ public: virtual CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -7462,7 +7462,7 @@ public: static CORBA::TypeCode_ptr _tc_FullInterfaceDescription; virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -7474,7 +7474,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -7489,7 +7489,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -7497,7 +7497,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -7549,7 +7549,7 @@ public: virtual ~_TAO_CORBA_InterfaceDef_Proxy_Impl (void) { } virtual CORBA_InterfaceDefSeq * base_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7558,7 +7558,7 @@ public: virtual void base_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7567,7 +7567,7 @@ public: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7575,7 +7575,7 @@ public: virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7588,7 +7588,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7604,7 +7604,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7637,7 +7637,7 @@ public: virtual ~_TAO_CORBA_InterfaceDef_Remote_Proxy_Impl (void) { } virtual CORBA_InterfaceDefSeq * base_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7646,7 +7646,7 @@ public: virtual void base_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7655,7 +7655,7 @@ public: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7663,7 +7663,7 @@ public: virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7676,7 +7676,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7692,7 +7692,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7721,7 +7721,7 @@ public: virtual ~_TAO_CORBA_InterfaceDef_Proxy_Broker (void); virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy ( CORBA_InterfaceDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -7748,7 +7748,7 @@ public: virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy ( CORBA_InterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -7879,7 +7879,7 @@ public: static CORBA_AbstractInterfaceDef_ptr tao_nil (void); static CORBA_AbstractInterfaceDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -7943,12 +7943,12 @@ public: static CORBA_AbstractInterfaceDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_AbstractInterfaceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_AbstractInterfaceDef_ptr _nil (void) @@ -7960,7 +7960,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -8054,7 +8054,7 @@ public: virtual ~_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void); virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy ( CORBA_AbstractInterfaceDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -8081,7 +8081,7 @@ public: virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy ( CORBA_AbstractInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -8143,7 +8143,7 @@ public: static CORBA_LocalInterfaceDef_ptr tao_nil (void); static CORBA_LocalInterfaceDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -8207,12 +8207,12 @@ public: static CORBA_LocalInterfaceDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_LocalInterfaceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_LocalInterfaceDef_ptr _nil (void) @@ -8224,7 +8224,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -8318,7 +8318,7 @@ public: virtual ~_TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void); virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy ( CORBA_LocalInterfaceDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -8345,7 +8345,7 @@ public: virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy ( CORBA_LocalInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -8503,7 +8503,7 @@ public: CORBA_FixedDef_ptr tao_CORBA_FixedDef_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); TAO_IFR_Client_Export CORBA::Object * diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index da828bfc82d..e2c6db87cb6 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -41,12 +41,12 @@ CORBA_InterfaceDef_ptr TAO_IFR_Client_Adapter_Impl::get_interface ( CORBA::ORB_ptr orb, const char *repo_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA::Object_var obj = orb->resolve_initial_references ("InterfaceRepository" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (CORBA::is_nil (obj.in ())) @@ -57,7 +57,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface ( CORBA_Repository_var repo = CORBA_Repository::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (CORBA::is_nil (repo.in ())) @@ -67,7 +67,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface ( } CORBA_Contained_var result = repo->lookup_id (repo_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (CORBA::is_nil (result.in ())) @@ -77,14 +77,14 @@ TAO_IFR_Client_Adapter_Impl::get_interface ( else { return CORBA_InterfaceDef::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } CORBA_InterfaceDef_ptr TAO_IFR_Client_Adapter_Impl::get_interface_remote ( const CORBA::Object_ptr target - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA_InterfaceDef_ptr _tao_retval = CORBA_InterfaceDef::_nil (); @@ -112,17 +112,17 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote ( for (;;) { - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (_invoke_status == TAO_INVOKE_RESTART) diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h index d8f93d930bf..34fa0f893f9 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h @@ -56,12 +56,12 @@ public: virtual CORBA_InterfaceDef_ptr get_interface ( CORBA::ORB_ptr orb, const char *repo_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_InterfaceDef_ptr get_interface_remote ( const CORBA::Object_ptr target - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Used to force the initialization of the ORB code. diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp index c5bc53db81d..9ec1ebfc03a 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp @@ -350,11 +350,11 @@ void IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, target); - *tmp = IR::ComponentDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = IR::ComponentDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -547,11 +547,11 @@ void IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, target); - *tmp = IR::ProvidesDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = IR::ProvidesDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -743,11 +743,11 @@ void IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, target); - *tmp = IR::UsesDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = IR::UsesDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -935,11 +935,11 @@ void IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, target); - *tmp = IR::HomeDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = IR::HomeDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1127,11 +1127,11 @@ void IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, target); - *tmp = IR::EmitsDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = IR::EmitsDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1320,11 +1320,11 @@ void IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, target); - *tmp = IR::PublishesDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = IR::PublishesDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1517,11 +1517,11 @@ void IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, target); - *tmp = IR::ConsumesDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = IR::ConsumesDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1713,11 +1713,11 @@ void IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, target); - *tmp = IR::FactoryDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = IR::FactoryDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1909,11 +1909,11 @@ void IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, target); - *tmp = IR::FinderDef::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = IR::FinderDef::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -2057,10 +2057,10 @@ tao_IR_ComponentRepository_nil ( IR::ComponentRepository_ptr tao_IR_ComponentRepository_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::ComponentRepository::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::ComponentRepository::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2184,10 +2184,10 @@ IR::ComponentRepository_var::tao_nil (void) ::IR::ComponentRepository_ptr IR::ComponentRepository_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::ComponentRepository::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::ComponentRepository::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2270,21 +2270,21 @@ public: const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2310,7 +2310,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequest const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -2321,12 +2321,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequest {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2354,12 +2354,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2367,13 +2367,13 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (TAO_E CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2401,21 +2401,21 @@ public: IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2443,7 +2443,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_ IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -2455,12 +2455,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_ {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2491,12 +2491,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SIN } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2504,13 +2504,13 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (TAO_ENV_SI CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2547,7 +2547,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2595,7 +2595,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp version, base_component, supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2611,7 +2611,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2623,12 +2623,12 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -2646,7 +2646,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2663,7 +2663,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2691,7 +2691,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2701,12 +2701,12 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2717,7 +2717,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2739,7 +2739,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home ( IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2788,7 +2788,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home ( base_home, managed_component, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2804,7 +2804,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2816,12 +2816,12 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -2840,7 +2840,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2857,7 +2857,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2885,7 +2885,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2895,12 +2895,12 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2911,7 +2911,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2966,7 +2966,7 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remo IR::_TAO_ComponentRepository_Proxy_Impl& IR::_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy ( ::IR::ComponentRepository * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -3009,24 +3009,24 @@ void IR::ComponentRepository::_tao_any_destructor (void *_tao_void_pointer) IR::ComponentRepository_ptr IR::ComponentRepository::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return ComponentRepository::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ComponentRepository::_nil ()); if (is_a == 0) return ComponentRepository::_nil (); } - return ComponentRepository::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ComponentRepository::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::ComponentRepository_ptr IR::ComponentRepository::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3081,7 +3081,7 @@ IR::ComponentRepository::_duplicate (ComponentRepository_ptr obj) return obj; } -CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) || @@ -3091,7 +3091,7 @@ CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value TAO_ENV_ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type) @@ -3157,14 +3157,14 @@ IR::ComponentDef_ptr IR::ComponentRepository::create_component ( const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentRepository_Proxy_Impl &proxy = - this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_component ( @@ -3174,7 +3174,7 @@ IR::ComponentDef_ptr IR::ComponentRepository::create_component ( version, base_component, supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3185,14 +3185,14 @@ IR::HomeDef_ptr IR::ComponentRepository::create_home ( IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentRepository_Proxy_Impl &proxy = - this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_home ( @@ -3203,7 +3203,7 @@ IR::HomeDef_ptr IR::ComponentRepository::create_home ( base_home, managed_component, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3269,10 +3269,10 @@ tao_IR_ProvidesDef_nil ( IR::ProvidesDef_ptr tao_IR_ProvidesDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::ProvidesDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3396,10 +3396,10 @@ IR::ProvidesDef_var::tao_nil (void) ::IR::ProvidesDef_ptr IR::ProvidesDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::ProvidesDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3477,21 +3477,21 @@ public: TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3507,30 +3507,30 @@ private: TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -3538,13 +3538,13 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3576,7 +3576,7 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3619,7 +3619,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type ( TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -3635,7 +3635,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3647,17 +3647,17 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3674,7 +3674,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3702,7 +3702,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3712,12 +3712,12 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3728,7 +3728,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3783,7 +3783,7 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker IR::_TAO_ProvidesDef_Proxy_Impl& IR::_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy ( ::IR::ProvidesDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -3826,24 +3826,24 @@ void IR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer) IR::ProvidesDef_ptr IR::ProvidesDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return ProvidesDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ProvidesDef::_nil ()); if (is_a == 0) return ProvidesDef::_nil (); } - return ProvidesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ProvidesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::ProvidesDef_ptr IR::ProvidesDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3898,7 +3898,7 @@ IR::ProvidesDef::_duplicate (ProvidesDef_ptr obj) return obj; } -CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) || @@ -3907,7 +3907,7 @@ CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type) @@ -3956,19 +3956,19 @@ const char* IR::ProvidesDef::_interface_repository_id (void) const } CORBA_InterfaceDef_ptr IR::ProvidesDef::interface_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ProvidesDef_Proxy_Impl &proxy = - this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.interface_type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4186,10 +4186,10 @@ tao_IR_UsesDef_nil ( IR::UsesDef_ptr tao_IR_UsesDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::UsesDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4313,10 +4313,10 @@ IR::UsesDef_var::tao_nil (void) ::IR::UsesDef_ptr IR::UsesDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::UsesDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4394,21 +4394,21 @@ public: TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4424,30 +4424,30 @@ private: TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4455,13 +4455,13 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4483,21 +4483,21 @@ public: TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4513,30 +4513,30 @@ private: TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4544,13 +4544,13 @@ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (TAO_ENV_SINGLE_ARG CORBA::Any * -TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4582,7 +4582,7 @@ IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void) CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4625,7 +4625,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type ( TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -4641,7 +4641,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4653,17 +4653,17 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4680,7 +4680,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4708,7 +4708,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4718,12 +4718,12 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4734,7 +4734,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4750,7 +4750,7 @@ return _tao_safe_retval._retn (); CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4792,7 +4792,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple ( TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -4808,7 +4808,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4820,17 +4820,17 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4847,7 +4847,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4874,7 +4874,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4884,12 +4884,12 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4900,7 +4900,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4955,7 +4955,7 @@ IR::_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void) IR::_TAO_UsesDef_Proxy_Impl& IR::_TAO_UsesDef_Remote_Proxy_Broker::select_proxy ( ::IR::UsesDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -4998,24 +4998,24 @@ void IR::UsesDef::_tao_any_destructor (void *_tao_void_pointer) IR::UsesDef_ptr IR::UsesDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return UsesDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (UsesDef::_nil ()); if (is_a == 0) return UsesDef::_nil (); } - return UsesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return UsesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::UsesDef_ptr IR::UsesDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -5070,7 +5070,7 @@ IR::UsesDef::_duplicate (UsesDef_ptr obj) return obj; } -CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) || @@ -5079,7 +5079,7 @@ CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::UsesDef::_tao_QueryInterface (ptr_arith_t type) @@ -5128,36 +5128,36 @@ const char* IR::UsesDef::_interface_repository_id (void) const } CORBA_InterfaceDef_ptr IR::UsesDef::interface_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_UsesDef_Proxy_Impl &proxy = - this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.interface_type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Boolean IR::UsesDef::is_multiple ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_UsesDef_Proxy_Impl &proxy = - this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_multiple ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5919,10 +5919,10 @@ tao_IR_EventDef_nil ( IR::EventDef_ptr tao_IR_EventDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::EventDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -6046,10 +6046,10 @@ IR::EventDef_var::tao_nil (void) ::IR::EventDef_ptr IR::EventDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::EventDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -6128,21 +6128,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6160,19 +6160,19 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * event_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), event_id_ (event_id) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6188,12 +6188,12 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6201,13 +6201,13 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * -TAO_ClientRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_EventDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6229,21 +6229,21 @@ public: TAO_ClientRequestInfo_IR_EventDef_event_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6259,30 +6259,30 @@ private: TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -6290,13 +6290,13 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (TAO_ENV_SINGLE_ARG_DECL CORBA::Any * -TAO_ClientRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_EventDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6329,7 +6329,7 @@ IR::_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void) CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6372,7 +6372,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a ( &_tao_call, _collocated_tao_target_, event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -6388,7 +6388,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6400,12 +6400,12 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -6419,7 +6419,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6436,7 +6436,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6463,7 +6463,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6473,12 +6473,12 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6489,7 +6489,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6505,7 +6505,7 @@ return _tao_retval; CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6548,7 +6548,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event ( TAO_ClientRequestInfo_IR_EventDef_event_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -6564,7 +6564,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6576,17 +6576,17 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6603,7 +6603,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6631,7 +6631,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6641,12 +6641,12 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6657,7 +6657,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6712,7 +6712,7 @@ IR::_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void) IR::_TAO_EventDef_Proxy_Impl& IR::_TAO_EventDef_Remote_Proxy_Broker::select_proxy ( ::IR::EventDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -6755,24 +6755,24 @@ void IR::EventDef::_tao_any_destructor (void *_tao_void_pointer) IR::EventDef_ptr IR::EventDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return EventDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (EventDef::_nil ()); if (is_a == 0) return EventDef::_nil (); } - return EventDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return EventDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::EventDef_ptr IR::EventDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -6827,7 +6827,7 @@ IR::EventDef::_duplicate (EventDef_ptr obj) return obj; } -CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) || @@ -6836,7 +6836,7 @@ CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::EventDef::_tao_QueryInterface (ptr_arith_t type) @@ -6886,37 +6886,37 @@ const char* IR::EventDef::_interface_repository_id (void) const CORBA::Boolean IR::EventDef::is_a ( const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_EventDef_Proxy_Impl &proxy = - this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_a ( this, event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDef_ptr IR::EventDef::event ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_EventDef_Proxy_Impl &proxy = - this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.event ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7128,10 +7128,10 @@ tao_IR_EmitsDef_nil ( IR::EmitsDef_ptr tao_IR_EmitsDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::EmitsDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -7255,10 +7255,10 @@ IR::EmitsDef_var::tao_nil (void) ::IR::EmitsDef_ptr IR::EmitsDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::EmitsDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -7385,7 +7385,7 @@ IR::_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void) IR::_TAO_EmitsDef_Proxy_Impl& IR::_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy ( ::IR::EmitsDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -7428,24 +7428,24 @@ void IR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer) IR::EmitsDef_ptr IR::EmitsDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return EmitsDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (EmitsDef::_nil ()); if (is_a == 0) return EmitsDef::_nil (); } - return EmitsDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return EmitsDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::EmitsDef_ptr IR::EmitsDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -7500,7 +7500,7 @@ IR::EmitsDef::_duplicate (EmitsDef_ptr obj) return obj; } -CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) || @@ -7510,7 +7510,7 @@ CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::EmitsDef::_tao_QueryInterface (ptr_arith_t type) @@ -7627,10 +7627,10 @@ tao_IR_PublishesDef_nil ( IR::PublishesDef_ptr tao_IR_PublishesDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::PublishesDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -7754,10 +7754,10 @@ IR::PublishesDef_var::tao_nil (void) ::IR::PublishesDef_ptr IR::PublishesDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::PublishesDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -7884,7 +7884,7 @@ IR::_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broke IR::_TAO_PublishesDef_Proxy_Impl& IR::_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy ( ::IR::PublishesDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -7927,24 +7927,24 @@ void IR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer) IR::PublishesDef_ptr IR::PublishesDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return PublishesDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PublishesDef::_nil ()); if (is_a == 0) return PublishesDef::_nil (); } - return PublishesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return PublishesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::PublishesDef_ptr IR::PublishesDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -7999,7 +7999,7 @@ IR::PublishesDef::_duplicate (PublishesDef_ptr obj) return obj; } -CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) || @@ -8009,7 +8009,7 @@ CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::PublishesDef::_tao_QueryInterface (ptr_arith_t type) @@ -8128,10 +8128,10 @@ tao_IR_ConsumesDef_nil ( IR::ConsumesDef_ptr tao_IR_ConsumesDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::ConsumesDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -8255,10 +8255,10 @@ IR::ConsumesDef_var::tao_nil (void) ::IR::ConsumesDef_ptr IR::ConsumesDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::ConsumesDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -8385,7 +8385,7 @@ IR::_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker IR::_TAO_ConsumesDef_Proxy_Impl& IR::_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy ( ::IR::ConsumesDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -8428,24 +8428,24 @@ void IR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer) IR::ConsumesDef_ptr IR::ConsumesDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return ConsumesDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ConsumesDef::_nil ()); if (is_a == 0) return ConsumesDef::_nil (); } - return ConsumesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ConsumesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::ConsumesDef_ptr IR::ConsumesDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -8500,7 +8500,7 @@ IR::ConsumesDef::_duplicate (ConsumesDef_ptr obj) return obj; } -CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) || @@ -8510,7 +8510,7 @@ CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type) @@ -8628,10 +8628,10 @@ tao_IR_ComponentDef_nil ( IR::ComponentDef_ptr tao_IR_ComponentDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::ComponentDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -8755,10 +8755,10 @@ IR::ComponentDef_var::tao_nil (void) ::IR::ComponentDef_ptr IR::ComponentDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::ComponentDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -8836,21 +8836,21 @@ public: TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -8866,30 +8866,30 @@ private: TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -8897,13 +8897,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (TAO_ CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -8926,21 +8926,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -8956,19 +8956,19 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientReques TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), supported_interfaces_ (supported_interfaces) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -8984,12 +8984,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_E } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -8997,13 +8997,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (TAO_ CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -9015,21 +9015,21 @@ public: TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9045,30 +9045,30 @@ private: TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9076,13 +9076,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (TAO_ENV_SI CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9104,21 +9104,21 @@ public: TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9134,30 +9134,30 @@ private: TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9165,13 +9165,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (TAO_E CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9193,21 +9193,21 @@ public: TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9223,30 +9223,30 @@ private: TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9254,13 +9254,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (TAO_ENV_S CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9282,21 +9282,21 @@ public: TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9312,30 +9312,30 @@ private: TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9343,13 +9343,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (TAO_ENV_SING CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9371,21 +9371,21 @@ public: TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9401,30 +9401,30 @@ private: TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9432,13 +9432,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (TAO_ENV_ CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9460,21 +9460,21 @@ public: TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9490,30 +9490,30 @@ private: TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9521,13 +9521,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (TAO_ENV_S CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9549,21 +9549,21 @@ public: TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9579,30 +9579,30 @@ private: TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9610,13 +9610,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (TAO_ENV_SINGLE_A CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9642,21 +9642,21 @@ public: const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9680,7 +9680,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_ const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -9690,12 +9690,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_ {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -9720,12 +9720,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9733,13 +9733,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9766,21 +9766,21 @@ public: const char * version, CORBA_InterfaceDef_ptr interface_type, const CORBA::Boolean & is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9806,7 +9806,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_Comp const char * version, CORBA_InterfaceDef_ptr interface_type, const CORBA::Boolean & is_multiple - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -9817,12 +9817,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_Comp {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -9850,12 +9850,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9863,13 +9863,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (TAO_ENV_SINGLE_AR CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9895,21 +9895,21 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -9933,7 +9933,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_Com const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -9943,12 +9943,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_Com {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -9973,12 +9973,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -9986,13 +9986,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (TAO_ENV_SINGLE_A CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -10018,21 +10018,21 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -10056,7 +10056,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -10066,12 +10066,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -10096,12 +10096,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -10109,13 +10109,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (TAO_ENV_SING CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -10141,21 +10141,21 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -10179,7 +10179,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_ const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -10189,12 +10189,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_ {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -10219,12 +10219,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -10232,13 +10232,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -10270,7 +10270,7 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10314,7 +10314,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -10330,7 +10330,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10342,17 +10342,17 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10369,7 +10369,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10397,7 +10397,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10407,12 +10407,12 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10423,7 +10423,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -10440,7 +10440,7 @@ return _tao_safe_retval._retn (); void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10483,7 +10483,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( &_tao_call, _collocated_tao_target_, supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -10499,7 +10499,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10511,12 +10511,12 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -10529,7 +10529,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10545,7 +10545,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10559,7 +10559,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10569,12 +10569,12 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10585,7 +10585,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -10601,7 +10601,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces ( IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10644,7 +10644,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component ( TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -10660,7 +10660,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10672,17 +10672,17 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10699,7 +10699,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10727,7 +10727,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10737,12 +10737,12 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10753,7 +10753,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -10769,7 +10769,7 @@ return _tao_safe_retval._retn (); IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10813,7 +10813,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -10829,7 +10829,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10841,17 +10841,17 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -10868,7 +10868,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -10896,7 +10896,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -10906,12 +10906,12 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10922,7 +10922,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -10938,7 +10938,7 @@ return _tao_safe_retval._retn (); IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10982,7 +10982,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces ( TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -10998,7 +10998,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11010,17 +11010,17 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11037,7 +11037,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11065,7 +11065,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11075,12 +11075,12 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11091,7 +11091,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11107,7 +11107,7 @@ return _tao_safe_retval._retn (); IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11151,7 +11151,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events ( TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -11167,7 +11167,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11179,17 +11179,17 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11206,7 +11206,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11234,7 +11234,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11244,12 +11244,12 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11260,7 +11260,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11276,7 +11276,7 @@ return _tao_safe_retval._retn (); IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11320,7 +11320,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -11336,7 +11336,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11348,17 +11348,17 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11375,7 +11375,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11403,7 +11403,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11413,12 +11413,12 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11429,7 +11429,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11445,7 +11445,7 @@ return _tao_safe_retval._retn (); IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11489,7 +11489,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events ( TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -11505,7 +11505,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11517,17 +11517,17 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11544,7 +11544,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11572,7 +11572,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11582,12 +11582,12 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11598,7 +11598,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11614,7 +11614,7 @@ return _tao_safe_retval._retn (); CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11656,7 +11656,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic ( TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -11672,7 +11672,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11684,17 +11684,17 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11711,7 +11711,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11738,7 +11738,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11748,12 +11748,12 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11764,7 +11764,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11784,7 +11784,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides ( const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11831,7 +11831,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides ( name, version, interface_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -11847,7 +11847,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11859,12 +11859,12 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -11881,7 +11881,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11898,7 +11898,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11926,7 +11926,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11936,12 +11936,12 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11952,7 +11952,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11973,7 +11973,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses ( const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12021,7 +12021,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses ( version, interface_type, is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -12037,7 +12037,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12049,12 +12049,12 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -12072,7 +12072,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -12089,7 +12089,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -12117,7 +12117,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12127,12 +12127,12 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -12143,7 +12143,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -12163,7 +12163,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12210,7 +12210,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits ( name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -12226,7 +12226,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12238,12 +12238,12 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -12260,7 +12260,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -12277,7 +12277,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -12305,7 +12305,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12315,12 +12315,12 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -12331,7 +12331,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -12351,7 +12351,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12398,7 +12398,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes ( name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -12414,7 +12414,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12426,12 +12426,12 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -12448,7 +12448,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -12465,7 +12465,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -12493,7 +12493,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12503,12 +12503,12 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -12519,7 +12519,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -12539,7 +12539,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12586,7 +12586,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes ( name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -12602,7 +12602,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12614,12 +12614,12 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -12636,7 +12636,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -12653,7 +12653,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -12681,7 +12681,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -12691,12 +12691,12 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -12707,7 +12707,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -12762,7 +12762,7 @@ IR::_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broke IR::_TAO_ComponentDef_Proxy_Impl& IR::_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy ( ::IR::ComponentDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -12805,24 +12805,24 @@ void IR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer) IR::ComponentDef_ptr IR::ComponentDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return ComponentDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ComponentDef::_nil ()); if (is_a == 0) return ComponentDef::_nil (); } - return ComponentDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ComponentDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::ComponentDef_ptr IR::ComponentDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -12877,7 +12877,7 @@ IR::ComponentDef::_duplicate (ComponentDef_ptr obj) return obj; } -CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) || @@ -12889,7 +12889,7 @@ CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type) @@ -12974,157 +12974,157 @@ const char* IR::ComponentDef::_interface_repository_id (void) const } CORBA_InterfaceDefSeq * IR::ComponentDef::supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.supported_interfaces ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void IR::ComponentDef::supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.supported_interfaces ( this, supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::ComponentDef_ptr IR::ComponentDef::base_component ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.base_component ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::ProvidesDefSeq * IR::ComponentDef::provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.provides_interfaces ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::UsesDefSeq * IR::ComponentDef::uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.uses_interfaces ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::EmitsDefSeq * IR::ComponentDef::emits_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.emits_events ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::PublishesDefSeq * IR::ComponentDef::publishes_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.publishes_events ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::ConsumesDefSeq * IR::ComponentDef::consumes_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.consumes_events ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Boolean IR::ComponentDef::is_basic ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_basic ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -13133,14 +13133,14 @@ IR::ProvidesDef_ptr IR::ComponentDef::create_provides ( const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_provides ( @@ -13149,7 +13149,7 @@ IR::ProvidesDef_ptr IR::ComponentDef::create_provides ( name, version, interface_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -13159,14 +13159,14 @@ IR::UsesDef_ptr IR::ComponentDef::create_uses ( const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_uses ( @@ -13176,7 +13176,7 @@ IR::UsesDef_ptr IR::ComponentDef::create_uses ( version, interface_type, is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -13185,14 +13185,14 @@ IR::EmitsDef_ptr IR::ComponentDef::create_emits ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_emits ( @@ -13201,7 +13201,7 @@ IR::EmitsDef_ptr IR::ComponentDef::create_emits ( name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -13210,14 +13210,14 @@ IR::PublishesDef_ptr IR::ComponentDef::create_publishes ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_publishes ( @@ -13226,7 +13226,7 @@ IR::PublishesDef_ptr IR::ComponentDef::create_publishes ( name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -13235,14 +13235,14 @@ IR::ConsumesDef_ptr IR::ComponentDef::create_consumes ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ComponentDef_Proxy_Impl &proxy = - this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_consumes ( @@ -13251,7 +13251,7 @@ IR::ConsumesDef_ptr IR::ComponentDef::create_consumes ( name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -14248,10 +14248,10 @@ tao_IR_PrimaryKeyDef_nil ( IR::PrimaryKeyDef_ptr tao_IR_PrimaryKeyDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::PrimaryKeyDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::PrimaryKeyDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -14375,10 +14375,10 @@ IR::PrimaryKeyDef_var::tao_nil (void) ::IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::PrimaryKeyDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::PrimaryKeyDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -14457,21 +14457,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -14489,19 +14489,19 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKey TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * primary_key_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), primary_key_id_ (primary_key_id) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -14517,12 +14517,12 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -14530,13 +14530,13 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL CORBA::Any * -TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -14558,21 +14558,21 @@ public: TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -14588,30 +14588,30 @@ private: TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -14619,13 +14619,13 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (TAO_ENV_SING CORBA::Any * -TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -14658,7 +14658,7 @@ IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::_TAO_PrimaryKeyDef_Remote_Proxy_Impl ( CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14701,7 +14701,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a ( &_tao_call, _collocated_tao_target_, primary_key_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -14717,7 +14717,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14729,12 +14729,12 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -14748,7 +14748,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -14765,7 +14765,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -14792,7 +14792,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14802,12 +14802,12 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14818,7 +14818,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -14834,7 +14834,7 @@ return _tao_retval; CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14877,7 +14877,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key ( TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -14893,7 +14893,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14905,17 +14905,17 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -14932,7 +14932,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -14960,7 +14960,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -14970,12 +14970,12 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14986,7 +14986,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -15041,7 +15041,7 @@ IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::~_TAO_PrimaryKeyDef_Remote_Proxy_Bro IR::_TAO_PrimaryKeyDef_Proxy_Impl& IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy ( ::IR::PrimaryKeyDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -15084,24 +15084,24 @@ void IR::PrimaryKeyDef::_tao_any_destructor (void *_tao_void_pointer) IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return PrimaryKeyDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PrimaryKeyDef::_nil ()); if (is_a == 0) return PrimaryKeyDef::_nil (); } - return PrimaryKeyDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return PrimaryKeyDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -15156,7 +15156,7 @@ IR::PrimaryKeyDef::_duplicate (PrimaryKeyDef_ptr obj) return obj; } -CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) || @@ -15165,7 +15165,7 @@ CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DE (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type) @@ -15215,37 +15215,37 @@ const char* IR::PrimaryKeyDef::_interface_repository_id (void) const CORBA::Boolean IR::PrimaryKeyDef::is_a ( const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_PrimaryKeyDef_Proxy_Impl &proxy = - this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_a ( this, primary_key_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDef_ptr IR::PrimaryKeyDef::primary_key ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_PrimaryKeyDef_Proxy_Impl &proxy = - this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.primary_key ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -15464,10 +15464,10 @@ tao_IR_FactoryDef_nil ( IR::FactoryDef_ptr tao_IR_FactoryDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::FactoryDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -15591,10 +15591,10 @@ IR::FactoryDef_var::tao_nil (void) ::IR::FactoryDef_ptr IR::FactoryDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::FactoryDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -15721,7 +15721,7 @@ IR::_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (v IR::_TAO_FactoryDef_Proxy_Impl& IR::_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy ( ::IR::FactoryDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -15764,24 +15764,24 @@ void IR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer) IR::FactoryDef_ptr IR::FactoryDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return FactoryDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (FactoryDef::_nil ()); if (is_a == 0) return FactoryDef::_nil (); } - return FactoryDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return FactoryDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::FactoryDef_ptr IR::FactoryDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -15836,7 +15836,7 @@ IR::FactoryDef::_duplicate (FactoryDef_ptr obj) return obj; } -CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) || @@ -15846,7 +15846,7 @@ CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::FactoryDef::_tao_QueryInterface (ptr_arith_t type) @@ -15964,10 +15964,10 @@ tao_IR_FinderDef_nil ( IR::FinderDef_ptr tao_IR_FinderDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::FinderDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -16091,10 +16091,10 @@ IR::FinderDef_var::tao_nil (void) ::IR::FinderDef_ptr IR::FinderDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::FinderDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -16221,7 +16221,7 @@ IR::_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (voi IR::_TAO_FinderDef_Proxy_Impl& IR::_TAO_FinderDef_Remote_Proxy_Broker::select_proxy ( ::IR::FinderDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -16264,24 +16264,24 @@ void IR::FinderDef::_tao_any_destructor (void *_tao_void_pointer) IR::FinderDef_ptr IR::FinderDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return FinderDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (FinderDef::_nil ()); if (is_a == 0) return FinderDef::_nil (); } - return FinderDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return FinderDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::FinderDef_ptr IR::FinderDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -16336,7 +16336,7 @@ IR::FinderDef::_duplicate (FinderDef_ptr obj) return obj; } -CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) || @@ -16346,7 +16346,7 @@ CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::FinderDef::_tao_QueryInterface (ptr_arith_t type) @@ -16464,10 +16464,10 @@ tao_IR_HomeDef_nil ( IR::HomeDef_ptr tao_IR_HomeDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IR::HomeDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return IR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -16591,10 +16591,10 @@ IR::HomeDef_var::tao_nil (void) ::IR::HomeDef_ptr IR::HomeDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IR::HomeDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -16672,21 +16672,21 @@ public: TAO_ClientRequestInfo_IR_HomeDef_base_home_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -16702,30 +16702,30 @@ private: TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -16733,13 +16733,13 @@ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (TAO_ENV_SINGLE_ARG_D CORBA::Any * -TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -16761,21 +16761,21 @@ public: TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -16791,30 +16791,30 @@ private: TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -16822,13 +16822,13 @@ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (TAO_ENV_SING CORBA::Any * -TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -16850,21 +16850,21 @@ public: TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -16880,30 +16880,30 @@ private: TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -16911,13 +16911,13 @@ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG CORBA::Any * -TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -16939,21 +16939,21 @@ public: TAO_ClientRequestInfo_IR_HomeDef_factories_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -16969,30 +16969,30 @@ private: TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -17000,13 +17000,13 @@ TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (TAO_ENV_SINGLE_ARG_D CORBA::Any * -TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -17028,21 +17028,21 @@ public: TAO_ClientRequestInfo_IR_HomeDef_finders_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17058,30 +17058,30 @@ private: TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -17089,13 +17089,13 @@ TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (TAO_ENV_SINGLE_ARG_DEC CORBA::Any * -TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -17117,21 +17117,21 @@ public: TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17147,30 +17147,30 @@ private: TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -17178,13 +17178,13 @@ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DE CORBA::Any * -TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -17210,21 +17210,21 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17248,7 +17248,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_Ho const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -17258,12 +17258,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_Ho {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -17288,12 +17288,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -17301,13 +17301,13 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -17334,21 +17334,21 @@ public: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17374,7 +17374,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDe const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -17385,12 +17385,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDe {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -17418,12 +17418,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -17431,13 +17431,13 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (TAO_ENV_SINGLE_ARG_ CORBA::Any * -TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -17464,21 +17464,21 @@ public: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17504,7 +17504,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -17515,12 +17515,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef {} Dynamic::ParameterList * -TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -17548,12 +17548,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -17561,13 +17561,13 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (TAO_ENV_SINGLE_ARG_D CORBA::Any * -TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -17599,7 +17599,7 @@ IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void) IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17642,7 +17642,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home ( TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -17658,7 +17658,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -17670,17 +17670,17 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -17697,7 +17697,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -17725,7 +17725,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -17735,12 +17735,12 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17751,7 +17751,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -17767,7 +17767,7 @@ return _tao_safe_retval._retn (); IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17810,7 +17810,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component ( TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -17826,7 +17826,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -17838,17 +17838,17 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -17865,7 +17865,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -17893,7 +17893,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -17903,12 +17903,12 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17919,7 +17919,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -17935,7 +17935,7 @@ return _tao_safe_retval._retn (); IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17978,7 +17978,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key ( TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -17994,7 +17994,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18006,17 +18006,17 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -18033,7 +18033,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -18061,7 +18061,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18071,12 +18071,12 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -18087,7 +18087,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -18103,7 +18103,7 @@ return _tao_safe_retval._retn (); IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -18147,7 +18147,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories ( TAO_ClientRequestInfo_IR_HomeDef_factories_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -18163,7 +18163,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18175,17 +18175,17 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -18202,7 +18202,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -18230,7 +18230,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18240,12 +18240,12 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -18256,7 +18256,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -18272,7 +18272,7 @@ return _tao_safe_retval._retn (); IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -18316,7 +18316,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders ( TAO_ClientRequestInfo_IR_HomeDef_finders_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -18332,7 +18332,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18344,17 +18344,17 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -18371,7 +18371,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -18399,7 +18399,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18409,12 +18409,12 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -18425,7 +18425,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -18441,7 +18441,7 @@ return _tao_safe_retval._retn (); CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -18483,7 +18483,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic ( TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -18499,7 +18499,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18511,17 +18511,17 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -18538,7 +18538,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -18565,7 +18565,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18575,12 +18575,12 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -18591,7 +18591,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -18611,7 +18611,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key ( const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -18658,7 +18658,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key ( name, version, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -18674,7 +18674,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18686,12 +18686,12 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -18708,7 +18708,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -18725,7 +18725,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -18753,7 +18753,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18763,12 +18763,12 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -18779,7 +18779,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -18800,7 +18800,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -18848,7 +18848,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory ( version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -18864,7 +18864,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18876,12 +18876,12 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -18899,7 +18899,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -18916,7 +18916,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -18944,7 +18944,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -18954,12 +18954,12 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -18970,7 +18970,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -18991,7 +18991,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19039,7 +19039,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder ( version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -19055,7 +19055,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19067,12 +19067,12 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -19090,7 +19090,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -19107,7 +19107,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -19135,7 +19135,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -19145,12 +19145,12 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -19161,7 +19161,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -19216,7 +19216,7 @@ IR::_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void) IR::_TAO_HomeDef_Proxy_Impl& IR::_TAO_HomeDef_Remote_Proxy_Broker::select_proxy ( ::IR::HomeDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -19259,24 +19259,24 @@ void IR::HomeDef::_tao_any_destructor (void *_tao_void_pointer) IR::HomeDef_ptr IR::HomeDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return HomeDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (HomeDef::_nil ()); if (is_a == 0) return HomeDef::_nil (); } - return HomeDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return HomeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IR::HomeDef_ptr IR::HomeDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -19331,7 +19331,7 @@ IR::HomeDef::_duplicate (HomeDef_ptr obj) return obj; } -CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) || @@ -19343,7 +19343,7 @@ CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *IR::HomeDef::_tao_QueryInterface (ptr_arith_t type) @@ -19428,104 +19428,104 @@ const char* IR::HomeDef::_interface_repository_id (void) const } IR::HomeDef_ptr IR::HomeDef::base_home ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_HomeDef_Proxy_Impl &proxy = - this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.base_home ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::ComponentDef_ptr IR::HomeDef::managed_component ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_HomeDef_Proxy_Impl &proxy = - this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.managed_component ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::PrimaryKeyDef_ptr IR::HomeDef::primary_key ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_HomeDef_Proxy_Impl &proxy = - this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.primary_key ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::FactoryDefSeq * IR::HomeDef::factories ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_HomeDef_Proxy_Impl &proxy = - this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.factories ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } IR::FinderDefSeq * IR::HomeDef::finders ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_HomeDef_Proxy_Impl &proxy = - this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.finders ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Boolean IR::HomeDef::is_basic ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_HomeDef_Proxy_Impl &proxy = - this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_basic ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -19534,14 +19534,14 @@ IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key ( const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_HomeDef_Proxy_Impl &proxy = - this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_primary_key ( @@ -19550,7 +19550,7 @@ IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key ( name, version, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -19560,14 +19560,14 @@ IR::FactoryDef_ptr IR::HomeDef::create_factory ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_HomeDef_Proxy_Impl &proxy = - this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_factory ( @@ -19577,7 +19577,7 @@ IR::FactoryDef_ptr IR::HomeDef::create_factory ( version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -19587,14 +19587,14 @@ IR::FinderDef_ptr IR::HomeDef::create_finder ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_HomeDef_Proxy_Impl &proxy = - this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_finder ( @@ -19604,7 +19604,7 @@ IR::FinderDef_ptr IR::HomeDef::create_finder ( version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -21017,7 +21017,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::RepositoryIdSe { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21108,7 +21108,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDefSe { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21199,7 +21199,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDefSeq { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21290,7 +21290,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDefSeq *&_ { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21381,7 +21381,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDefSeq *&_ { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21472,7 +21472,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EmitsDefSeq *& { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21563,7 +21563,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PublishesDefSe { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21654,7 +21654,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ConsumesDefSeq { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21745,7 +21745,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FactoryDefSeq { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21836,7 +21836,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FinderDefSeq * { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21905,7 +21905,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentRepository_ _tao_elem = IR::ComponentRepository::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -21966,7 +21966,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDef_ptr &_ta _tao_elem = IR::ProvidesDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22041,7 +22041,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescri { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22110,7 +22110,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDef_ptr &_tao_el _tao_elem = IR::UsesDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22185,7 +22185,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescriptio { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22276,7 +22276,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescSe { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22367,7 +22367,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescSeq *& { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22436,7 +22436,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EventDef_ptr &_tao_e _tao_elem = IR::EventDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_EventDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_EventDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22511,7 +22511,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EventDescripti { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22580,7 +22580,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EmitsDef_ptr &_tao_e _tao_elem = IR::EmitsDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22641,7 +22641,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PublishesDef_ptr &_t _tao_elem = IR::PublishesDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22702,7 +22702,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConsumesDef_ptr &_ta _tao_elem = IR::ConsumesDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22763,7 +22763,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDef_ptr &_t _tao_elem = IR::ComponentDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22838,7 +22838,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDescr { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22907,7 +22907,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimaryKeyDef_ptr &_ _tao_elem = IR::PrimaryKeyDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -22982,7 +22982,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PrimaryKeyDesc { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -23051,7 +23051,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FactoryDef_ptr &_tao _tao_elem = IR::FactoryDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -23112,7 +23112,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FinderDef_ptr &_tao_ _tao_elem = IR::FinderDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -23173,7 +23173,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDef_ptr &_tao_el _tao_elem = IR::HomeDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -23248,7 +23248,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDescriptio { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -23737,7 +23737,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::ComponentRepository::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -23773,7 +23773,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::ProvidesDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -23809,7 +23809,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::UsesDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -23929,7 +23929,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::EventDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -23965,7 +23965,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::EmitsDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -24001,7 +24001,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::PublishesDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -24037,7 +24037,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::ConsumesDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -24073,7 +24073,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::ComponentDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -24109,7 +24109,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::PrimaryKeyDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -24145,7 +24145,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::FactoryDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -24181,7 +24181,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::FinderDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -24217,7 +24217,7 @@ CORBA::Boolean operator>> ( _tao_objref = IR::HomeDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h index 86c1ce37159..3e1daa5eee6 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.h +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h @@ -227,7 +227,7 @@ TAO_NAMESPACE IR static ComponentDef_ptr tao_nil (void); static ComponentDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -312,7 +312,7 @@ TAO_NAMESPACE IR virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -472,7 +472,7 @@ TAO_NAMESPACE IR static ProvidesDef_ptr tao_nil (void); static ProvidesDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -557,7 +557,7 @@ TAO_NAMESPACE IR virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -717,7 +717,7 @@ TAO_NAMESPACE IR static UsesDef_ptr tao_nil (void); static UsesDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -802,7 +802,7 @@ TAO_NAMESPACE IR virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -962,7 +962,7 @@ TAO_NAMESPACE IR static HomeDef_ptr tao_nil (void); static HomeDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1047,7 +1047,7 @@ TAO_NAMESPACE IR virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -1207,7 +1207,7 @@ TAO_NAMESPACE IR static EventDef_ptr tao_nil (void); static EventDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1286,7 +1286,7 @@ TAO_NAMESPACE IR static EmitsDef_ptr tao_nil (void); static EmitsDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1371,7 +1371,7 @@ TAO_NAMESPACE IR virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -1531,7 +1531,7 @@ TAO_NAMESPACE IR static PublishesDef_ptr tao_nil (void); static PublishesDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1616,7 +1616,7 @@ TAO_NAMESPACE IR virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -1776,7 +1776,7 @@ TAO_NAMESPACE IR static ConsumesDef_ptr tao_nil (void); static ConsumesDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1861,7 +1861,7 @@ TAO_NAMESPACE IR virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -2021,7 +2021,7 @@ TAO_NAMESPACE IR static FactoryDef_ptr tao_nil (void); static FactoryDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2106,7 +2106,7 @@ TAO_NAMESPACE IR virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -2266,7 +2266,7 @@ TAO_NAMESPACE IR static FinderDef_ptr tao_nil (void); static FinderDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2351,7 +2351,7 @@ TAO_NAMESPACE IR virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; }; @@ -2511,7 +2511,7 @@ TAO_NAMESPACE IR static PrimaryKeyDef_ptr tao_nil (void); static PrimaryKeyDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2590,7 +2590,7 @@ TAO_NAMESPACE IR static ComponentRepository_ptr tao_nil (void); static ComponentRepository_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2654,12 +2654,12 @@ TAO_NAMESPACE IR static ComponentRepository_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ComponentRepository_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ComponentRepository_ptr _nil (void) @@ -2675,7 +2675,7 @@ TAO_NAMESPACE IR const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2688,7 +2688,7 @@ TAO_NAMESPACE IR IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2696,7 +2696,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2751,7 +2751,7 @@ TAO_NAMESPACE IR const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2765,7 +2765,7 @@ TAO_NAMESPACE IR IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2801,7 +2801,7 @@ TAO_NAMESPACE IR const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2815,7 +2815,7 @@ TAO_NAMESPACE IR IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2844,7 +2844,7 @@ TAO_NAMESPACE IR virtual ~_TAO_ComponentRepository_Proxy_Broker (void); virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy ( ComponentRepository *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -2871,7 +2871,7 @@ TAO_NAMESPACE IR virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy ( ComponentRepository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2919,12 +2919,12 @@ TAO_NAMESPACE IR static ProvidesDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ProvidesDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ProvidesDef_ptr _nil (void) @@ -2935,7 +2935,7 @@ TAO_NAMESPACE IR static void _tao_any_destructor (void*); virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2943,7 +2943,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2993,7 +2993,7 @@ TAO_NAMESPACE IR virtual ~_TAO_ProvidesDef_Proxy_Impl (void) { } virtual CORBA_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3024,7 +3024,7 @@ TAO_NAMESPACE IR virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) { } virtual CORBA_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3053,7 +3053,7 @@ TAO_NAMESPACE IR virtual ~_TAO_ProvidesDef_Proxy_Broker (void); virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy ( ProvidesDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -3080,7 +3080,7 @@ TAO_NAMESPACE IR virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy ( ProvidesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3198,12 +3198,12 @@ TAO_NAMESPACE IR static UsesDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static UsesDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static UsesDef_ptr _nil (void) @@ -3214,14 +3214,14 @@ TAO_NAMESPACE IR static void _tao_any_destructor (void*); virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean is_multiple ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3229,7 +3229,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -3279,7 +3279,7 @@ TAO_NAMESPACE IR virtual ~_TAO_UsesDef_Proxy_Impl (void) { } virtual CORBA_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3287,7 +3287,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_multiple ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3318,7 +3318,7 @@ TAO_NAMESPACE IR virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) { } virtual CORBA_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3326,7 +3326,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_multiple ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3355,7 +3355,7 @@ TAO_NAMESPACE IR virtual ~_TAO_UsesDef_Proxy_Broker (void); virtual _TAO_UsesDef_Proxy_Impl &select_proxy ( UsesDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -3382,7 +3382,7 @@ TAO_NAMESPACE IR virtual _TAO_UsesDef_Proxy_Impl &select_proxy ( UsesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3827,12 +3827,12 @@ TAO_NAMESPACE IR static EventDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static EventDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static EventDef_ptr _nil (void) @@ -3844,14 +3844,14 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3859,7 +3859,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -3910,7 +3910,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3918,7 +3918,7 @@ TAO_NAMESPACE IR virtual CORBA_ValueDef_ptr event ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3950,7 +3950,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3958,7 +3958,7 @@ TAO_NAMESPACE IR virtual CORBA_ValueDef_ptr event ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3987,7 +3987,7 @@ TAO_NAMESPACE IR virtual ~_TAO_EventDef_Proxy_Broker (void); virtual _TAO_EventDef_Proxy_Impl &select_proxy ( EventDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -4014,7 +4014,7 @@ TAO_NAMESPACE IR virtual _TAO_EventDef_Proxy_Impl &select_proxy ( EventDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4132,12 +4132,12 @@ TAO_NAMESPACE IR static EmitsDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static EmitsDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static EmitsDef_ptr _nil (void) @@ -4149,7 +4149,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -4243,7 +4243,7 @@ TAO_NAMESPACE IR virtual ~_TAO_EmitsDef_Proxy_Broker (void); virtual _TAO_EmitsDef_Proxy_Impl &select_proxy ( EmitsDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -4270,7 +4270,7 @@ TAO_NAMESPACE IR virtual _TAO_EmitsDef_Proxy_Impl &select_proxy ( EmitsDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4318,12 +4318,12 @@ TAO_NAMESPACE IR static PublishesDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PublishesDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PublishesDef_ptr _nil (void) @@ -4335,7 +4335,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -4429,7 +4429,7 @@ TAO_NAMESPACE IR virtual ~_TAO_PublishesDef_Proxy_Broker (void); virtual _TAO_PublishesDef_Proxy_Impl &select_proxy ( PublishesDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -4456,7 +4456,7 @@ TAO_NAMESPACE IR virtual _TAO_PublishesDef_Proxy_Impl &select_proxy ( PublishesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4504,12 +4504,12 @@ TAO_NAMESPACE IR static ConsumesDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ConsumesDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ConsumesDef_ptr _nil (void) @@ -4521,7 +4521,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -4615,7 +4615,7 @@ TAO_NAMESPACE IR virtual ~_TAO_ConsumesDef_Proxy_Broker (void); virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy ( ConsumesDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -4642,7 +4642,7 @@ TAO_NAMESPACE IR virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy ( ConsumesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4690,12 +4690,12 @@ TAO_NAMESPACE IR static ComponentDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ComponentDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ComponentDef_ptr _nil (void) @@ -4706,7 +4706,7 @@ TAO_NAMESPACE IR static void _tao_any_destructor (void*); virtual CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4714,56 +4714,56 @@ TAO_NAMESPACE IR virtual void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::ComponentDef_ptr base_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::ProvidesDefSeq * provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::UsesDefSeq * uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::EmitsDefSeq * emits_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::PublishesDefSeq * publishes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::ConsumesDefSeq * consumes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4774,7 +4774,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4786,7 +4786,7 @@ TAO_NAMESPACE IR const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4797,7 +4797,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4808,7 +4808,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4819,7 +4819,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4827,7 +4827,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -4877,7 +4877,7 @@ TAO_NAMESPACE IR virtual ~_TAO_ComponentDef_Proxy_Impl (void) { } virtual CORBA_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4886,7 +4886,7 @@ TAO_NAMESPACE IR virtual void supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4894,7 +4894,7 @@ TAO_NAMESPACE IR virtual IR::ComponentDef_ptr base_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4902,7 +4902,7 @@ TAO_NAMESPACE IR virtual IR::ProvidesDefSeq * provides_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4910,7 +4910,7 @@ TAO_NAMESPACE IR virtual IR::UsesDefSeq * uses_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4918,7 +4918,7 @@ TAO_NAMESPACE IR virtual IR::EmitsDefSeq * emits_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4926,7 +4926,7 @@ TAO_NAMESPACE IR virtual IR::PublishesDefSeq * publishes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4934,7 +4934,7 @@ TAO_NAMESPACE IR virtual IR::ConsumesDefSeq * consumes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4942,7 +4942,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4954,7 +4954,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4967,7 +4967,7 @@ TAO_NAMESPACE IR const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4979,7 +4979,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4991,7 +4991,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5003,7 +5003,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5034,7 +5034,7 @@ TAO_NAMESPACE IR virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) { } virtual CORBA_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5043,7 +5043,7 @@ TAO_NAMESPACE IR virtual void supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5051,7 +5051,7 @@ TAO_NAMESPACE IR virtual IR::ComponentDef_ptr base_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5059,7 +5059,7 @@ TAO_NAMESPACE IR virtual IR::ProvidesDefSeq * provides_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5067,7 +5067,7 @@ TAO_NAMESPACE IR virtual IR::UsesDefSeq * uses_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5075,7 +5075,7 @@ TAO_NAMESPACE IR virtual IR::EmitsDefSeq * emits_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5083,7 +5083,7 @@ TAO_NAMESPACE IR virtual IR::PublishesDefSeq * publishes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5091,7 +5091,7 @@ TAO_NAMESPACE IR virtual IR::ConsumesDefSeq * consumes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5099,7 +5099,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5111,7 +5111,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5124,7 +5124,7 @@ TAO_NAMESPACE IR const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5136,7 +5136,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5148,7 +5148,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5160,7 +5160,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5189,7 +5189,7 @@ TAO_NAMESPACE IR virtual ~_TAO_ComponentDef_Proxy_Broker (void); virtual _TAO_ComponentDef_Proxy_Impl &select_proxy ( ComponentDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -5216,7 +5216,7 @@ TAO_NAMESPACE IR virtual _TAO_ComponentDef_Proxy_Impl &select_proxy ( ComponentDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5342,12 +5342,12 @@ TAO_NAMESPACE IR static PrimaryKeyDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PrimaryKeyDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PrimaryKeyDef_ptr _nil (void) @@ -5359,14 +5359,14 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_a ( const char * primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_ValueDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5374,7 +5374,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -5425,7 +5425,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5433,7 +5433,7 @@ TAO_NAMESPACE IR virtual CORBA_ValueDef_ptr primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5465,7 +5465,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5473,7 +5473,7 @@ TAO_NAMESPACE IR virtual CORBA_ValueDef_ptr primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5502,7 +5502,7 @@ TAO_NAMESPACE IR virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void); virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy ( PrimaryKeyDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -5529,7 +5529,7 @@ TAO_NAMESPACE IR virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy ( PrimaryKeyDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5647,12 +5647,12 @@ TAO_NAMESPACE IR static FactoryDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static FactoryDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static FactoryDef_ptr _nil (void) @@ -5664,7 +5664,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -5758,7 +5758,7 @@ TAO_NAMESPACE IR virtual ~_TAO_FactoryDef_Proxy_Broker (void); virtual _TAO_FactoryDef_Proxy_Impl &select_proxy ( FactoryDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -5785,7 +5785,7 @@ TAO_NAMESPACE IR virtual _TAO_FactoryDef_Proxy_Impl &select_proxy ( FactoryDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5833,12 +5833,12 @@ TAO_NAMESPACE IR static FinderDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static FinderDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static FinderDef_ptr _nil (void) @@ -5850,7 +5850,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -5944,7 +5944,7 @@ TAO_NAMESPACE IR virtual ~_TAO_FinderDef_Proxy_Broker (void); virtual _TAO_FinderDef_Proxy_Impl &select_proxy ( FinderDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -5971,7 +5971,7 @@ TAO_NAMESPACE IR virtual _TAO_FinderDef_Proxy_Impl &select_proxy ( FinderDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -6019,12 +6019,12 @@ TAO_NAMESPACE IR static HomeDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static HomeDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static HomeDef_ptr _nil (void) @@ -6035,42 +6035,42 @@ TAO_NAMESPACE IR static void _tao_any_destructor (void*); virtual IR::HomeDef_ptr base_home ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::ComponentDef_ptr managed_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::PrimaryKeyDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::FactoryDefSeq * factories ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual IR::FinderDefSeq * finders ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6081,7 +6081,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6093,7 +6093,7 @@ TAO_NAMESPACE IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6105,7 +6105,7 @@ TAO_NAMESPACE IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -6113,7 +6113,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -6163,7 +6163,7 @@ TAO_NAMESPACE IR virtual ~_TAO_HomeDef_Proxy_Impl (void) { } virtual IR::HomeDef_ptr base_home ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6171,7 +6171,7 @@ TAO_NAMESPACE IR virtual IR::ComponentDef_ptr managed_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6179,7 +6179,7 @@ TAO_NAMESPACE IR virtual IR::PrimaryKeyDef_ptr primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6187,7 +6187,7 @@ TAO_NAMESPACE IR virtual IR::FactoryDefSeq * factories ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6195,7 +6195,7 @@ TAO_NAMESPACE IR virtual IR::FinderDefSeq * finders ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6203,7 +6203,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6215,7 +6215,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6228,7 +6228,7 @@ TAO_NAMESPACE IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6241,7 +6241,7 @@ TAO_NAMESPACE IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6272,7 +6272,7 @@ TAO_NAMESPACE IR virtual ~_TAO_HomeDef_Remote_Proxy_Impl (void) { } virtual IR::HomeDef_ptr base_home ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6280,7 +6280,7 @@ TAO_NAMESPACE IR virtual IR::ComponentDef_ptr managed_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6288,7 +6288,7 @@ TAO_NAMESPACE IR virtual IR::PrimaryKeyDef_ptr primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6296,7 +6296,7 @@ TAO_NAMESPACE IR virtual IR::FactoryDefSeq * factories ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6304,7 +6304,7 @@ TAO_NAMESPACE IR virtual IR::FinderDefSeq * finders ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6312,7 +6312,7 @@ TAO_NAMESPACE IR virtual CORBA::Boolean is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6324,7 +6324,7 @@ TAO_NAMESPACE IR const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6337,7 +6337,7 @@ TAO_NAMESPACE IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6350,7 +6350,7 @@ TAO_NAMESPACE IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6379,7 +6379,7 @@ TAO_NAMESPACE IR virtual ~_TAO_HomeDef_Proxy_Broker (void); virtual _TAO_HomeDef_Proxy_Impl &select_proxy ( HomeDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -6406,7 +6406,7 @@ TAO_NAMESPACE IR virtual _TAO_HomeDef_Proxy_Impl &select_proxy ( HomeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index 32bb3083735..2db5acb3533 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -66,10 +66,10 @@ tao_CORBA_FixedDef_nil ( CORBA_FixedDef_ptr tao_CORBA_FixedDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_FixedDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_FixedDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -193,10 +193,10 @@ CORBA_FixedDef_var::tao_nil (void) ::CORBA_FixedDef_ptr CORBA_FixedDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_FixedDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_FixedDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -274,21 +274,21 @@ public: TAO_ClientRequestInfo_CORBA_FixedDef_digits_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -304,30 +304,30 @@ private: TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::TAO_ClientRequestInfo_CORBA_FixedDef_digits_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -335,13 +335,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (TAO_ENV_SINGLE_ARG_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -364,21 +364,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::UShort & digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -394,19 +394,19 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::TAO_ClientRequestInfo_CORBA_Fix TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::UShort & digits - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), digits_ (digits) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -422,12 +422,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -435,13 +435,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (TAO_ENV_SINGLE_ARG_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -453,21 +453,21 @@ public: TAO_ClientRequestInfo_CORBA_FixedDef_scale_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -483,30 +483,30 @@ private: TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::TAO_ClientRequestInfo_CORBA_FixedDef_scale_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -514,13 +514,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (TAO_ENV_SINGLE_ARG_D CORBA::Any * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -543,21 +543,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Short & scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -573,19 +573,19 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::TAO_ClientRequestInfo_CORBA_Fixe TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Short & scale - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), scale_ (scale) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -601,12 +601,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -614,13 +614,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (TAO_ENV_SINGLE_ARG_D CORBA::Any * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -642,7 +642,7 @@ _TAO_CORBA_FixedDef_Remote_Proxy_Impl::_TAO_CORBA_FixedDef_Remote_Proxy_Impl (vo CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -684,7 +684,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( TAO_ClientRequestInfo_CORBA_FixedDef_digits_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -700,7 +700,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -712,17 +712,17 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -739,7 +739,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -766,7 +766,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -776,12 +776,12 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -792,7 +792,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -809,7 +809,7 @@ return _tao_retval; void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -852,7 +852,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( &_tao_call, _collocated_tao_target_, digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -868,7 +868,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -880,12 +880,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -898,7 +898,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -914,7 +914,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -928,7 +928,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -938,12 +938,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -954,7 +954,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -970,7 +970,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1012,7 +1012,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( TAO_ClientRequestInfo_CORBA_FixedDef_scale_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -1028,7 +1028,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1040,17 +1040,17 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1067,7 +1067,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1094,7 +1094,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1104,12 +1104,12 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1120,7 +1120,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1137,7 +1137,7 @@ return _tao_retval; void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( CORBA_Object *_collocated_tao_target_, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1180,7 +1180,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( &_tao_call, _collocated_tao_target_, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -1196,7 +1196,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1208,12 +1208,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1226,7 +1226,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1242,7 +1242,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1256,7 +1256,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1266,12 +1266,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1282,7 +1282,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1337,7 +1337,7 @@ _TAO_CORBA_FixedDef_Remote_Proxy_Broker::~_TAO_CORBA_FixedDef_Remote_Proxy_Broke _TAO_CORBA_FixedDef_Proxy_Impl& _TAO_CORBA_FixedDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_FixedDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -1380,24 +1380,24 @@ void CORBA_FixedDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_FixedDef_ptr CORBA_FixedDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_FixedDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_FixedDef::_nil ()); if (is_a == 0) return CORBA_FixedDef::_nil (); } - return CORBA_FixedDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_FixedDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_FixedDef_ptr CORBA_FixedDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1452,7 +1452,7 @@ CORBA_FixedDef::_duplicate (CORBA_FixedDef_ptr obj) return obj; } -CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) || @@ -1461,7 +1461,7 @@ CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_FixedDef::_tao_QueryInterface (ptr_arith_t type) @@ -1510,74 +1510,74 @@ const char* CORBA_FixedDef::_interface_repository_id (void) const } CORBA::UShort CORBA_FixedDef::digits ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_FixedDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.digits ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_FixedDef::digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_FixedDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.digits ( this, digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Short CORBA_FixedDef::scale ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_FixedDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.scale ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_FixedDef::scale ( CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_FixedDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.scale ( this, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1711,10 +1711,10 @@ tao_CORBA_ValueMemberDef_nil ( CORBA_ValueMemberDef_ptr tao_CORBA_ValueMemberDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_ValueMemberDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_ValueMemberDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1838,10 +1838,10 @@ CORBA_ValueMemberDef_var::tao_nil (void) ::CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_ValueMemberDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_ValueMemberDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1919,21 +1919,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1949,30 +1949,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1980,13 +1980,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2008,21 +2008,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2038,30 +2038,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2069,13 +2069,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2098,21 +2098,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2128,19 +2128,19 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_C TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), type_def_ (type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2156,12 +2156,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2169,13 +2169,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2187,21 +2187,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2217,30 +2217,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2248,13 +2248,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2277,21 +2277,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2307,19 +2307,19 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ClientRequestInfo_COR TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), access_ (access) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2335,12 +2335,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2348,13 +2348,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2376,7 +2376,7 @@ _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::_TAO_CORBA_ValueMemberDef_Remote_Pr CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2419,7 +2419,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2435,7 +2435,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2447,17 +2447,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2474,7 +2474,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2502,7 +2502,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2512,12 +2512,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2528,7 +2528,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2544,7 +2544,7 @@ return _tao_safe_retval._retn (); CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2587,7 +2587,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2603,7 +2603,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2615,17 +2615,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2642,7 +2642,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2670,7 +2670,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2680,12 +2680,12 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2696,7 +2696,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2713,7 +2713,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2756,7 +2756,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( &_tao_call, _collocated_tao_target_, type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -2772,7 +2772,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2784,12 +2784,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2802,7 +2802,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2818,7 +2818,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2832,7 +2832,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2842,12 +2842,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2858,7 +2858,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2874,7 +2874,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2916,7 +2916,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -2932,7 +2932,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2944,17 +2944,17 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2971,7 +2971,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2998,7 +2998,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3008,12 +3008,12 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3024,7 +3024,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3041,7 +3041,7 @@ return _tao_retval; void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( CORBA_Object *_collocated_tao_target_, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3084,7 +3084,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( &_tao_call, _collocated_tao_target_, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3100,7 +3100,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3112,12 +3112,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3130,7 +3130,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3146,7 +3146,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3160,7 +3160,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3170,12 +3170,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3186,7 +3186,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3241,7 +3241,7 @@ _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_Remote _TAO_CORBA_ValueMemberDef_Proxy_Impl& _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_ValueMemberDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -3284,24 +3284,24 @@ void CORBA_ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ValueMemberDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueMemberDef::_nil ()); if (is_a == 0) return CORBA_ValueMemberDef::_nil (); } - return CORBA_ValueMemberDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_ValueMemberDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3356,7 +3356,7 @@ CORBA_ValueMemberDef::_duplicate (CORBA_ValueMemberDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) || @@ -3365,7 +3365,7 @@ CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value TAO_ENV_ARG (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_ValueMemberDef::_tao_QueryInterface (ptr_arith_t type) @@ -3414,91 +3414,91 @@ const char* CORBA_ValueMemberDef::_interface_repository_id (void) const } CORBA::TypeCode_ptr CORBA_ValueMemberDef::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_IDLType_ptr CORBA_ValueMemberDef::type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type_def ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueMemberDef::type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.type_def ( this, type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Visibility CORBA_ValueMemberDef::access ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.access ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueMemberDef::access ( CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.access ( this, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3529,10 +3529,10 @@ tao_CORBA_ValueDef_nil ( CORBA_ValueDef_ptr tao_CORBA_ValueDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_ValueDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_ValueDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3656,10 +3656,10 @@ CORBA_ValueDef_var::tao_nil (void) ::CORBA_ValueDef_ptr CORBA_ValueDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_ValueDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_ValueDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3737,21 +3737,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3767,30 +3767,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -3798,13 +3798,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (TAO_E CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3827,21 +3827,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3857,19 +3857,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ClientRequest TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), supported_interfaces_ (supported_interfaces) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3885,12 +3885,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -3898,13 +3898,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (TAO_E CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3916,21 +3916,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3946,30 +3946,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -3977,13 +3977,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4006,21 +4006,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4036,19 +4036,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::TAO_ClientRequestInfo_COR TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), initializers_ (initializers) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4064,12 +4064,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4077,13 +4077,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4095,21 +4095,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4125,30 +4125,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4156,13 +4156,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4185,21 +4185,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4215,19 +4215,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::TAO_ClientRequestInfo_CORBA TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), base_value_ (base_value) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4243,12 +4243,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4256,13 +4256,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4274,21 +4274,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4304,30 +4304,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4335,13 +4335,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (TAO_E CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4364,21 +4364,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4394,19 +4394,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ClientRequest TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), abstract_base_values_ (abstract_base_values) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4422,12 +4422,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4435,13 +4435,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (TAO_E CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4453,21 +4453,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4483,30 +4483,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4514,13 +4514,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (TAO_ENV_SINGLE CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4543,21 +4543,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Boolean & is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4573,19 +4573,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ClientRequestInfo_CORB TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Boolean & is_abstract - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), is_abstract_ (is_abstract) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4601,12 +4601,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4614,13 +4614,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (TAO_ENV_SINGLE CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4632,21 +4632,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4662,30 +4662,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4693,13 +4693,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (TAO_ENV_SINGLE_A CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4722,21 +4722,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Boolean & is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4752,19 +4752,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ClientRequestInfo_CORBA_ TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Boolean & is_custom - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), is_custom_ (is_custom) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4780,12 +4780,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4793,13 +4793,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (TAO_ENV_SINGLE_A CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4811,21 +4811,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4841,30 +4841,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4872,13 +4872,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4901,21 +4901,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Boolean & is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4931,19 +4931,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_C TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::Boolean & is_truncatable - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), is_truncatable_ (is_truncatable) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4959,12 +4959,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4972,13 +4972,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (TAO_ENV_SIN CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4991,21 +4991,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5023,19 +5023,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::TAO_ClientRequestInfo_CORBA_ValueDef_ TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5051,12 +5051,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5064,13 +5064,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5092,21 +5092,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_describe_value ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5122,30 +5122,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::TAO_ClientRequestInfo_CORBA_ValueDef_describe_value ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5153,13 +5153,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (TAO_ENV_SINGLE_ CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5186,21 +5186,21 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5226,7 +5226,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_ const char * version, CORBA_IDLType_ptr type, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -5237,12 +5237,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_ {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5270,12 +5270,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SIN } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5283,13 +5283,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (TAO_ENV_SI CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5316,21 +5316,21 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5356,7 +5356,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_COR const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -5367,12 +5367,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_COR {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5400,12 +5400,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5413,13 +5413,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5449,21 +5449,21 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5495,7 +5495,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_COR const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), id_ (id), @@ -5509,12 +5509,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_COR {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5551,12 +5551,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5564,13 +5564,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (TAO_ENV_SINGL CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5602,7 +5602,7 @@ _TAO_CORBA_ValueDef_Remote_Proxy_Impl::_TAO_CORBA_ValueDef_Remote_Proxy_Impl (vo CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5646,7 +5646,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -5662,7 +5662,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5674,17 +5674,17 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -5701,7 +5701,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -5729,7 +5729,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5739,12 +5739,12 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -5755,7 +5755,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -5772,7 +5772,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5815,7 +5815,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( &_tao_call, _collocated_tao_target_, supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -5831,7 +5831,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5843,12 +5843,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -5861,7 +5861,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -5877,7 +5877,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -5891,7 +5891,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5901,12 +5901,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -5917,7 +5917,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -5933,7 +5933,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5977,7 +5977,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -5993,7 +5993,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6005,17 +6005,17 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6032,7 +6032,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6060,7 +6060,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6070,12 +6070,12 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6086,7 +6086,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6103,7 +6103,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( CORBA_Object *_collocated_tao_target_, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6146,7 +6146,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( &_tao_call, _collocated_tao_target_, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -6162,7 +6162,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6174,12 +6174,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6192,7 +6192,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6208,7 +6208,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6222,7 +6222,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6232,12 +6232,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6248,7 +6248,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6264,7 +6264,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6307,7 +6307,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -6323,7 +6323,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6335,17 +6335,17 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6362,7 +6362,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6390,7 +6390,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6400,12 +6400,12 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6416,7 +6416,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6433,7 +6433,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( CORBA_Object *_collocated_tao_target_, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6476,7 +6476,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( &_tao_call, _collocated_tao_target_, base_value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -6492,7 +6492,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6504,12 +6504,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6522,7 +6522,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6538,7 +6538,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6552,7 +6552,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6562,12 +6562,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6578,7 +6578,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6594,7 +6594,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6638,7 +6638,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -6654,7 +6654,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6666,17 +6666,17 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6693,7 +6693,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6721,7 +6721,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6731,12 +6731,12 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6747,7 +6747,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6764,7 +6764,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( CORBA_Object *_collocated_tao_target_, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6807,7 +6807,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( &_tao_call, _collocated_tao_target_, abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -6823,7 +6823,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6835,12 +6835,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6853,7 +6853,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6869,7 +6869,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6883,7 +6883,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6893,12 +6893,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6909,7 +6909,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6925,7 +6925,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6967,7 +6967,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -6983,7 +6983,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6995,17 +6995,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7022,7 +7022,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7049,7 +7049,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7059,12 +7059,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7075,7 +7075,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7092,7 +7092,7 @@ return _tao_retval; void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7135,7 +7135,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( &_tao_call, _collocated_tao_target_, is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -7151,7 +7151,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7163,12 +7163,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7181,7 +7181,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7197,7 +7197,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7211,7 +7211,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7221,12 +7221,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7237,7 +7237,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7253,7 +7253,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7295,7 +7295,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -7311,7 +7311,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7323,17 +7323,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7350,7 +7350,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7377,7 +7377,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7387,12 +7387,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7403,7 +7403,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7420,7 +7420,7 @@ return _tao_retval; void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7463,7 +7463,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( &_tao_call, _collocated_tao_target_, is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -7479,7 +7479,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7491,12 +7491,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7509,7 +7509,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7525,7 +7525,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7539,7 +7539,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7549,12 +7549,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7565,7 +7565,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7581,7 +7581,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7623,7 +7623,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -7639,7 +7639,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7651,17 +7651,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7678,7 +7678,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7705,7 +7705,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7715,12 +7715,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7731,7 +7731,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7748,7 +7748,7 @@ return _tao_retval; void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7791,7 +7791,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( &_tao_call, _collocated_tao_target_, is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -7807,7 +7807,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7819,12 +7819,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7837,7 +7837,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7853,7 +7853,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7867,7 +7867,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7877,12 +7877,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7893,7 +7893,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7910,7 +7910,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7953,7 +7953,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( &_tao_call, _collocated_tao_target_, id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -7969,7 +7969,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7981,12 +7981,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -8000,7 +8000,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8017,7 +8017,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8044,7 +8044,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8054,12 +8054,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8070,7 +8070,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8086,7 +8086,7 @@ return _tao_retval; CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::describe_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8129,7 +8129,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de TAO_ClientRequestInfo_CORBA_ValueDef_describe_value ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8145,7 +8145,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8157,17 +8157,17 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8184,7 +8184,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8212,7 +8212,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8222,12 +8222,12 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8238,7 +8238,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8259,7 +8259,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8307,7 +8307,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem version, type, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8323,7 +8323,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8335,12 +8335,12 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8358,7 +8358,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8375,7 +8375,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8403,7 +8403,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8413,12 +8413,12 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8429,7 +8429,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8450,7 +8450,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8498,7 +8498,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8514,7 +8514,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8526,12 +8526,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8549,7 +8549,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8566,7 +8566,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8594,7 +8594,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8604,12 +8604,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8620,7 +8620,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8644,7 +8644,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8695,7 +8695,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8711,7 +8711,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8723,12 +8723,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8749,7 +8749,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8766,7 +8766,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8794,7 +8794,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8804,12 +8804,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8820,7 +8820,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8875,7 +8875,7 @@ _TAO_CORBA_ValueDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueDef_Remote_Proxy_Broke _TAO_CORBA_ValueDef_Proxy_Impl& _TAO_CORBA_ValueDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_ValueDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -8922,24 +8922,24 @@ void CORBA_ValueDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_ValueDef_ptr CORBA_ValueDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ValueDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueDef::_nil ()); if (is_a == 0) return CORBA_ValueDef::_nil (); } - return CORBA_ValueDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_ValueDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_ValueDef_ptr CORBA_ValueDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -8994,7 +8994,7 @@ CORBA_ValueDef::_duplicate (CORBA_ValueDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) || @@ -9005,7 +9005,7 @@ CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_ValueDef::_tao_QueryInterface (ptr_arith_t type) @@ -9078,273 +9078,273 @@ const char* CORBA_ValueDef::_interface_repository_id (void) const } CORBA_InterfaceDefSeq * CORBA_ValueDef::supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.supported_interfaces ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.supported_interfaces ( this, supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_InitializerSeq * CORBA_ValueDef::initializers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.initializers ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.initializers ( this, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDef_ptr CORBA_ValueDef::base_value ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.base_value ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.base_value ( this, base_value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDefSeq * CORBA_ValueDef::abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.abstract_base_values ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.abstract_base_values ( this, abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Boolean CORBA_ValueDef::is_abstract ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_abstract ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.is_abstract ( this, is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Boolean CORBA_ValueDef::is_custom ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_custom ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.is_custom ( this, is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Boolean CORBA_ValueDef::is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_truncatable ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.is_truncatable ( this, is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Boolean CORBA_ValueDef::is_a ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_a ( this, id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -10728,19 +10728,19 @@ void CORBA_ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void_ } CORBA_ValueDef::FullValueDescription * CORBA_ValueDef::describe_value ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.describe_value ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -10750,14 +10750,14 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member ( const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_value_member ( @@ -10767,7 +10767,7 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member ( version, type, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -10777,14 +10777,14 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_attribute ( @@ -10794,7 +10794,7 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute ( version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -10807,14 +10807,14 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_operation ( @@ -10827,7 +10827,7 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -10865,10 +10865,10 @@ tao_CORBA_ValueBoxDef_nil ( CORBA_ValueBoxDef_ptr tao_CORBA_ValueBoxDef_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_ValueBoxDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_ValueBoxDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -10992,10 +10992,10 @@ CORBA_ValueBoxDef_var::tao_nil (void) ::CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_ValueBoxDef::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_ValueBoxDef::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -11073,21 +11073,21 @@ public: TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -11103,30 +11103,30 @@ private: TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -11134,13 +11134,13 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (TAO_E CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11163,21 +11163,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -11193,19 +11193,19 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ClientRequest TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), original_type_def_ (original_type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -11221,12 +11221,12 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -11234,13 +11234,13 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (TAO_E CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -11262,7 +11262,7 @@ _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Im CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11305,7 +11305,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -11321,7 +11321,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11333,17 +11333,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11360,7 +11360,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11388,7 +11388,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11398,12 +11398,12 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11414,7 +11414,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11431,7 +11431,7 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11474,7 +11474,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( &_tao_call, _collocated_tao_target_, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -11490,7 +11490,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11502,12 +11502,12 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -11520,7 +11520,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11536,7 +11536,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11550,7 +11550,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11560,12 +11560,12 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11576,7 +11576,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11631,7 +11631,7 @@ _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Remote_Proxy _TAO_CORBA_ValueBoxDef_Proxy_Impl& _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::select_proxy ( ::CORBA_ValueBoxDef * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -11674,24 +11674,24 @@ void CORBA_ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer) CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ValueBoxDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); if (is_a == 0) return CORBA_ValueBoxDef::_nil (); } - return CORBA_ValueBoxDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_ValueBoxDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -11746,7 +11746,7 @@ CORBA_ValueBoxDef::_duplicate (CORBA_ValueBoxDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) || @@ -11757,7 +11757,7 @@ CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DE (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA_ValueBoxDef::_tao_QueryInterface (ptr_arith_t type) @@ -11830,38 +11830,38 @@ const char* CORBA_ValueBoxDef::_interface_repository_id (void) const } CORBA_IDLType_ptr CORBA_ValueBoxDef::original_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.original_type_def ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA_ValueBoxDef::original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.original_type_def ( this, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -11888,7 +11888,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_FixedDef_ptr &_tao _tao_elem = CORBA_FixedDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -11963,7 +11963,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMember { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12054,7 +12054,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMemberS { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12123,7 +12123,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueMemberDef_ptr _tao_elem = CORBA_ValueMemberDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12184,7 +12184,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDef_ptr &_tao _tao_elem = CORBA_ValueDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12259,7 +12259,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDef::Fu { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12342,7 +12342,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDescrip { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12411,7 +12411,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueBoxDef_ptr &_ _tao_elem = CORBA_ValueBoxDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12472,7 +12472,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_FixedDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -12550,7 +12550,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_ValueMemberDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -12586,7 +12586,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_ValueDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -12622,7 +12622,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA_ValueBoxDef::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h index fe1c8246aff..c0e04325f97 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.h +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h @@ -93,7 +93,7 @@ public: static CORBA_FixedDef_ptr tao_nil (void); static CORBA_FixedDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -157,12 +157,12 @@ public: static CORBA_FixedDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_FixedDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_FixedDef_ptr _nil (void) @@ -173,7 +173,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA::UShort digits ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -181,14 +181,14 @@ public: virtual void digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Short scale ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -196,7 +196,7 @@ public: virtual void scale ( CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -204,7 +204,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -254,7 +254,7 @@ public: virtual ~_TAO_CORBA_FixedDef_Proxy_Impl (void) { } virtual CORBA::UShort digits ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -263,7 +263,7 @@ public: virtual void digits ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -271,7 +271,7 @@ public: virtual CORBA::Short scale ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -280,7 +280,7 @@ public: virtual void scale ( CORBA_Object *_collocated_tao_target_, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -311,7 +311,7 @@ public: virtual ~_TAO_CORBA_FixedDef_Remote_Proxy_Impl (void) { } virtual CORBA::UShort digits ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -320,7 +320,7 @@ public: virtual void digits ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -328,7 +328,7 @@ public: virtual CORBA::Short scale ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -337,7 +337,7 @@ public: virtual void scale ( CORBA_Object *_collocated_tao_target_, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -366,7 +366,7 @@ public: virtual ~_TAO_CORBA_FixedDef_Proxy_Broker (void); virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy ( CORBA_FixedDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -393,7 +393,7 @@ public: virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy ( CORBA_FixedDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -685,7 +685,7 @@ public: static CORBA_ValueMemberDef_ptr tao_nil (void); static CORBA_ValueMemberDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -749,12 +749,12 @@ public: static CORBA_ValueMemberDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ValueMemberDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ValueMemberDef_ptr _nil (void) @@ -765,14 +765,14 @@ public: static void _tao_any_destructor (void*); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -780,14 +780,14 @@ public: virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Visibility access ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -795,7 +795,7 @@ public: virtual void access ( CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -803,7 +803,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -853,7 +853,7 @@ public: virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -861,7 +861,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -870,7 +870,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -878,7 +878,7 @@ public: virtual CORBA::Visibility access ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -887,7 +887,7 @@ public: virtual void access ( CORBA_Object *_collocated_tao_target_, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -918,7 +918,7 @@ public: virtual ~_TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl (void) { } virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -926,7 +926,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -935,7 +935,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -943,7 +943,7 @@ public: virtual CORBA::Visibility access ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -952,7 +952,7 @@ public: virtual void access ( CORBA_Object *_collocated_tao_target_, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -981,7 +981,7 @@ public: virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Broker (void); virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy ( CORBA_ValueMemberDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -1008,7 +1008,7 @@ public: virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy ( CORBA_ValueMemberDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1069,7 +1069,7 @@ public: static CORBA_ValueDef_ptr tao_nil (void); static CORBA_ValueDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1135,12 +1135,12 @@ public: static CORBA_ValueDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ValueDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ValueDef_ptr _nil (void) @@ -1151,7 +1151,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1159,14 +1159,14 @@ public: virtual void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_InitializerSeq * initializers ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1174,14 +1174,14 @@ public: virtual void initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_ValueDef_ptr base_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1189,14 +1189,14 @@ public: virtual void base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA_ValueDefSeq * abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1204,14 +1204,14 @@ public: virtual void abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean is_abstract ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1219,14 +1219,14 @@ public: virtual void is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean is_custom ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1234,14 +1234,14 @@ public: virtual void is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1249,7 +1249,7 @@ public: virtual void is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1257,7 +1257,7 @@ public: virtual CORBA::Boolean is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1344,7 +1344,7 @@ public: static CORBA::TypeCode_ptr _tc_FullValueDescription; virtual CORBA_ValueDef::FullValueDescription * describe_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1356,7 +1356,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1368,7 +1368,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1383,7 +1383,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1391,7 +1391,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1443,7 +1443,7 @@ public: virtual ~_TAO_CORBA_ValueDef_Proxy_Impl (void) { } virtual CORBA_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1452,7 +1452,7 @@ public: virtual void supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1460,7 +1460,7 @@ public: virtual CORBA_InitializerSeq * initializers ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1469,7 +1469,7 @@ public: virtual void initializers ( CORBA_Object *_collocated_tao_target_, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1477,7 +1477,7 @@ public: virtual CORBA_ValueDef_ptr base_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1486,7 +1486,7 @@ public: virtual void base_value ( CORBA_Object *_collocated_tao_target_, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1494,7 +1494,7 @@ public: virtual CORBA_ValueDefSeq * abstract_base_values ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1503,7 +1503,7 @@ public: virtual void abstract_base_values ( CORBA_Object *_collocated_tao_target_, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1511,7 +1511,7 @@ public: virtual CORBA::Boolean is_abstract ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1520,7 +1520,7 @@ public: virtual void is_abstract ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1528,7 +1528,7 @@ public: virtual CORBA::Boolean is_custom ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1537,7 +1537,7 @@ public: virtual void is_custom ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1545,7 +1545,7 @@ public: virtual CORBA::Boolean is_truncatable ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1554,7 +1554,7 @@ public: virtual void is_truncatable ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1563,7 +1563,7 @@ public: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1571,7 +1571,7 @@ public: virtual CORBA_ValueDef::FullValueDescription * describe_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1584,7 +1584,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1597,7 +1597,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1613,7 +1613,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1646,7 +1646,7 @@ public: virtual ~_TAO_CORBA_ValueDef_Remote_Proxy_Impl (void) { } virtual CORBA_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1655,7 +1655,7 @@ public: virtual void supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1663,7 +1663,7 @@ public: virtual CORBA_InitializerSeq * initializers ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1672,7 +1672,7 @@ public: virtual void initializers ( CORBA_Object *_collocated_tao_target_, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1680,7 +1680,7 @@ public: virtual CORBA_ValueDef_ptr base_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1689,7 +1689,7 @@ public: virtual void base_value ( CORBA_Object *_collocated_tao_target_, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1697,7 +1697,7 @@ public: virtual CORBA_ValueDefSeq * abstract_base_values ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1706,7 +1706,7 @@ public: virtual void abstract_base_values ( CORBA_Object *_collocated_tao_target_, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1714,7 +1714,7 @@ public: virtual CORBA::Boolean is_abstract ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1723,7 +1723,7 @@ public: virtual void is_abstract ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1731,7 +1731,7 @@ public: virtual CORBA::Boolean is_custom ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1740,7 +1740,7 @@ public: virtual void is_custom ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1748,7 +1748,7 @@ public: virtual CORBA::Boolean is_truncatable ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1757,7 +1757,7 @@ public: virtual void is_truncatable ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1766,7 +1766,7 @@ public: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1774,7 +1774,7 @@ public: virtual CORBA_ValueDef::FullValueDescription * describe_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1787,7 +1787,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1800,7 +1800,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1816,7 +1816,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1845,7 +1845,7 @@ public: virtual ~_TAO_CORBA_ValueDef_Proxy_Broker (void); virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy ( CORBA_ValueDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -1872,7 +1872,7 @@ public: virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy ( CORBA_ValueDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2006,7 +2006,7 @@ public: static CORBA_ValueBoxDef_ptr tao_nil (void); static CORBA_ValueBoxDef_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2070,12 +2070,12 @@ public: static CORBA_ValueBoxDef_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ValueBoxDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_ValueBoxDef_ptr _nil (void) @@ -2086,7 +2086,7 @@ public: static void _tao_any_destructor (void*); virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2094,7 +2094,7 @@ public: virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2102,7 +2102,7 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2152,7 +2152,7 @@ public: virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Impl (void) { } virtual CORBA_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2161,7 +2161,7 @@ public: virtual void original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2192,7 +2192,7 @@ public: virtual ~_TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl (void) { } virtual CORBA_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2201,7 +2201,7 @@ public: virtual void original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2230,7 +2230,7 @@ public: virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Broker (void); virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy ( CORBA_ValueBoxDef *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -2257,7 +2257,7 @@ public: virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy ( CORBA_ValueBoxDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp index 9aff98f44fe..a8328362bd6 100644 --- a/TAO/tao/IFR_Client_Adapter.cpp +++ b/TAO/tao/IFR_Client_Adapter.cpp @@ -32,14 +32,14 @@ TAO_IFR_Client_Adapter::dispose (CORBA_InterfaceDef_ptr) CORBA_InterfaceDef_ptr TAO_IFR_Client_Adapter::get_interface (CORBA::ORB_ptr, const char * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } CORBA_InterfaceDef_ptr TAO_IFR_Client_Adapter::get_interface_remote (const CORBA::Object_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h index f6158f80841..f2bbb4cc512 100644 --- a/TAO/tao/IFR_Client_Adapter.h +++ b/TAO/tao/IFR_Client_Adapter.h @@ -54,12 +54,12 @@ public: virtual CORBA_InterfaceDef_ptr get_interface ( CORBA::ORB_ptr orb, const char *repo_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_InterfaceDef_ptr get_interface_remote ( const CORBA::Object_ptr target - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); }; diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index 5ff8b03195e..928dd51e586 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -256,7 +256,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPoint { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (IIOP::_tc_ListenPoint TAO_ENV_ARG_PARAMETER); + type->equivalent (IIOP::_tc_ListenPoint ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -349,7 +349,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPointL { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (IIOP::_tc_ListenPointList TAO_ENV_ARG_PARAMETER); + type->equivalent (IIOP::_tc_ListenPointList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -435,7 +435,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::BiDirIIOPSer CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = type->equivalent (IIOP::_tc_BiDirIIOPServiceContext - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index d029ef9154b..371b49d9f84 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -906,7 +906,7 @@ TAO_IIOP_Acceptor::init_tcp_properties (void) int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size (); int no_delay = this->orb_core_->orb_params ()->nodelay (); - TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (tph != 0) diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index ec0bac2b60c..412aa22e33d 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -117,7 +117,7 @@ TAO_IIOP_Connector::close (void) int TAO_IIOP_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { TAO_Transport *&transport = invocation->transport (); ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -427,7 +427,7 @@ TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_IIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@host:port/object_key @@ -494,7 +494,7 @@ TAO_IIOP_Connector::init_tcp_properties (void) // lookup and caching are not done based on protocol // properties. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // Initialize the settings to the ORB defaults. If RT CORBA is enabled, // it may override these. @@ -502,7 +502,7 @@ TAO_IIOP_Connector::init_tcp_properties (void) int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size (); int no_delay = this->orb_core ()->orb_params ()->nodelay (); - TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (tph != 0) diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index b6b10fbc772..c15310d8972 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -58,7 +58,7 @@ public: int close (void); int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int preconnect (const char *preconnections); TAO_Profile *create_profile (TAO_InputCDR& cdr); @@ -70,7 +70,7 @@ protected: /// More TAO_Connector methods, please check the documentation on /// Pluggable.h - virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); /// Obtain tcp properties that must be used by this connector, i.e., /// initialize <tcp_properties_>. diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 7b31e4acce5..923c34df9a4 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -163,7 +163,7 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr) void TAO_IIOP_Profile::parse_string (const char *ior - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!ior || !*ior) { @@ -329,7 +329,7 @@ TAO_IIOP_Profile::is_equivalent (const TAO_Profile *other_profile) CORBA::ULong TAO_IIOP_Profile::hash (CORBA::ULong max - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; @@ -374,7 +374,7 @@ TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp) } char * -TAO_IIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { CORBA::String_var key; TAO_ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index b837f202439..8b55bead27f 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -75,7 +75,7 @@ public: /// Initialize this object using the given input string. /// Url-style string contain only one endpoint. virtual void parse_string (const char *string - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Return a string representation for this profile. @@ -83,7 +83,7 @@ public: * This is used to create url-style reference. Only one * endpoint is included into the string. */ - virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL); + virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); /// Initialize this object using the given CDR octet string. virtual int decode (TAO_InputCDR& cdr); @@ -140,7 +140,7 @@ public: /// Return a hash value for this object. virtual CORBA::ULong hash (CORBA::ULong max - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Please refer to Profile.h for the documentation of this /// function. diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index 376ff91f2ed..2fd12da18b4 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -1597,10 +1597,10 @@ tao_IOP_Codec_nil ( IOP::Codec_ptr tao_IOP_Codec_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IOP::Codec::_narrow (p TAO_ENV_ARG_PARAMETER); + return IOP::Codec::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1721,10 +1721,10 @@ IOP::Codec_var::tao_nil (void) ::IOP::Codec_ptr IOP::Codec_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IOP::Codec::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IOP::Codec::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1806,15 +1806,15 @@ IOP::Codec::~Codec (void) IOP::Codec_ptr IOP::Codec::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Codec::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Codec::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IOP::Codec_ptr IOP::Codec::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1909,7 +1909,7 @@ void IOP::Codec::InvalidTypeForEncoding::_raise () void IOP::Codec::InvalidTypeForEncoding::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -1917,7 +1917,7 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_encode ( void IOP::Codec::InvalidTypeForEncoding::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -1977,7 +1977,7 @@ void IOP::Codec::FormatMismatch::_raise () void IOP::Codec::FormatMismatch::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -1985,7 +1985,7 @@ void IOP::Codec::FormatMismatch::_tao_encode ( void IOP::Codec::FormatMismatch::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -2045,7 +2045,7 @@ void IOP::Codec::TypeMismatch::_raise () void IOP::Codec::TypeMismatch::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -2053,7 +2053,7 @@ void IOP::Codec::TypeMismatch::_tao_encode ( void IOP::Codec::TypeMismatch::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -2211,10 +2211,10 @@ tao_IOP_CodecFactory_nil ( IOP::CodecFactory_ptr tao_IOP_CodecFactory_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IOP::CodecFactory::_narrow (p TAO_ENV_ARG_PARAMETER); + return IOP::CodecFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2337,10 +2337,10 @@ IOP::CodecFactory_var::tao_nil (void) ::IOP::CodecFactory_ptr IOP::CodecFactory_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IOP::CodecFactory::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IOP::CodecFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2422,15 +2422,15 @@ IOP::CodecFactory::~CodecFactory (void) IOP::CodecFactory_ptr IOP::CodecFactory::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CodecFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CodecFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IOP::CodecFactory_ptr IOP::CodecFactory::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2525,7 +2525,7 @@ void IOP::CodecFactory::UnknownEncoding::_raise () void IOP::CodecFactory::UnknownEncoding::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -2533,7 +2533,7 @@ void IOP::CodecFactory::UnknownEncoding::_tao_encode ( void IOP::CodecFactory::UnknownEncoding::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -2584,7 +2584,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2667,7 +2667,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_el { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IOP::_tc_IOR TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IOP::_tc_IOR ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2750,7 +2750,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2841,7 +2841,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::MultipleCompo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2932,7 +2932,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -3023,7 +3023,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -3106,7 +3106,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -3197,7 +3197,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -3287,7 +3287,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::Encoding *&_t { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index 61303ca2cc6..87393af40d0 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -1280,7 +1280,7 @@ TAO_NAMESPACE IOP static Codec_ptr tao_duplicate (Codec_ptr); static void tao_release (Codec_ptr); static Codec_ptr tao_nil (void); - static Codec_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static Codec_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1335,11 +1335,11 @@ class TAO_Export Codec : public virtual CORBA_Object static Codec_ptr _duplicate (Codec_ptr obj); static Codec_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Codec_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Codec_ptr _nil (void) { @@ -1369,12 +1369,12 @@ class TAO_Export Codec : public virtual CORBA_Object virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static InvalidTypeForEncoding *_downcast (CORBA::Exception *); @@ -1410,12 +1410,12 @@ class TAO_Export Codec : public virtual CORBA_Object virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static FormatMismatch *_downcast (CORBA::Exception *); @@ -1451,12 +1451,12 @@ class TAO_Export Codec : public virtual CORBA_Object virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static TypeMismatch *_downcast (CORBA::Exception *); @@ -1471,7 +1471,7 @@ class TAO_Export Codec : public virtual CORBA_Object virtual CORBA::OctetSeq * encode ( const CORBA::Any & data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1480,7 +1480,7 @@ class TAO_Export Codec : public virtual CORBA_Object virtual CORBA::Any * decode ( const CORBA::OctetSeq & data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1489,7 +1489,7 @@ class TAO_Export Codec : public virtual CORBA_Object virtual CORBA::OctetSeq * encode_value ( const CORBA::Any & data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1499,7 +1499,7 @@ class TAO_Export Codec : public virtual CORBA_Object virtual CORBA::Any * decode_value ( const CORBA::OctetSeq & data, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1619,7 +1619,7 @@ class TAO_Export Codec : public virtual CORBA_Object static CodecFactory_ptr tao_duplicate (CodecFactory_ptr); static void tao_release (CodecFactory_ptr); static CodecFactory_ptr tao_nil (void); - static CodecFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CodecFactory_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1674,11 +1674,11 @@ class TAO_Export CodecFactory : public virtual CORBA_Object static CodecFactory_ptr _duplicate (CodecFactory_ptr obj); static CodecFactory_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CodecFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CodecFactory_ptr _nil (void) { @@ -1708,12 +1708,12 @@ class TAO_Export CodecFactory : public virtual CORBA_Object virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static UnknownEncoding *_downcast (CORBA::Exception *); @@ -1728,7 +1728,7 @@ class TAO_Export CodecFactory : public virtual CORBA_Object virtual IOP::Codec_ptr create_codec ( const IOP::Encoding & enc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index 783f085ef51..6432a6ef17f 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -84,7 +84,7 @@ void TAO_IOP::EmptyProfileList::_raise () void TAO_IOP::EmptyProfileList::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -97,7 +97,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode ( void TAO_IOP::EmptyProfileList::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -210,7 +210,7 @@ void TAO_IOP::NotFound::_raise () void TAO_IOP::NotFound::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -223,7 +223,7 @@ void TAO_IOP::NotFound::_tao_encode ( void TAO_IOP::NotFound::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -332,7 +332,7 @@ void TAO_IOP::Duplicate::_raise () void TAO_IOP::Duplicate::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -345,7 +345,7 @@ void TAO_IOP::Duplicate::_tao_encode ( void TAO_IOP::Duplicate::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -454,7 +454,7 @@ void TAO_IOP::Invalid_IOR::_raise () void TAO_IOP::Invalid_IOR::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -467,7 +467,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode ( void TAO_IOP::Invalid_IOR::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -576,7 +576,7 @@ void TAO_IOP::MultiProfileList::_raise () void TAO_IOP::MultiProfileList::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -589,7 +589,7 @@ void TAO_IOP::MultiProfileList::_tao_encode ( void TAO_IOP::MultiProfileList::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -761,10 +761,10 @@ TAO_IOP::TAO_IOR_Property_var::tao_nil (void) ::TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_IOP::TAO_IOR_Property::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -846,15 +846,15 @@ TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void) TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_IOR_Property::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TAO_IOR_Property::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1014,10 +1014,10 @@ TAO_IOP::TAO_IOR_Manipulation_var::tao_nil (void) ::TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1099,15 +1099,15 @@ TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void) TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_IOR_Manipulation::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TAO_IOR_Manipulation::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1230,11 +1230,11 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, target); - *tmp = CORBA::Object::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = CORBA::Object::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1337,7 +1337,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::EmptyProf { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1427,7 +1427,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::NotFound { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1517,7 +1517,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Duplicate { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1607,7 +1607,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Invalid_I { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1697,7 +1697,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProf { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index ed6557ecc35..601190f4f12 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -90,12 +90,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static EmptyProfileList *_downcast (CORBA::Exception *); @@ -136,12 +136,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NotFound *_downcast (CORBA::Exception *); @@ -182,12 +182,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static Duplicate *_downcast (CORBA::Exception *); @@ -228,12 +228,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static Invalid_IOR *_downcast (CORBA::Exception *); @@ -274,12 +274,12 @@ TAO_NAMESPACE TAO_IOP virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static MultiProfileList *_downcast (CORBA::Exception *); @@ -334,7 +334,7 @@ TAO_NAMESPACE TAO_IOP static TAO_IOR_Property_ptr tao_duplicate (TAO_IOR_Property_ptr); static void tao_release (TAO_IOR_Property_ptr); static TAO_IOR_Property_ptr tao_nil (void); - static TAO_IOR_Property_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static TAO_IOR_Property_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -389,11 +389,11 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj); static TAO_IOR_Property_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_IOR_Property_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_IOR_Property_ptr _nil (void) { @@ -402,7 +402,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual CORBA::Boolean set_property ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -412,7 +412,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual CORBA::Boolean set_primary ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -422,7 +422,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual CORBA::Object_ptr get_primary ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -431,7 +431,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual CORBA::Boolean is_primary_set ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -492,7 +492,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object static TAO_IOR_Manipulation_ptr tao_duplicate (TAO_IOR_Manipulation_ptr); static void tao_release (TAO_IOR_Manipulation_ptr); static TAO_IOR_Manipulation_ptr tao_nil (void); - static TAO_IOR_Manipulation_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static TAO_IOR_Manipulation_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -547,11 +547,11 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj); static TAO_IOR_Manipulation_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_IOR_Manipulation_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_IOR_Manipulation_ptr _nil (void) { @@ -590,7 +590,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; @@ -709,7 +709,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -721,7 +721,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Object_ptr add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -733,7 +733,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Object_ptr remove_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -745,7 +745,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Boolean set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -757,7 +757,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -770,7 +770,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Object_ptr get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -780,7 +780,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Boolean is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -789,7 +789,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::ULong is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -798,7 +798,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::ULong get_profile_count ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i index 073be5e1c98..f7d24f5143b 100644 --- a/TAO/tao/IORManipulation/IORC.i +++ b/TAO/tao/IORManipulation/IORC.i @@ -70,10 +70,10 @@ tao_TAO_IOP_TAO_IOR_Property_nil ( ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr tao_TAO_IOP_TAO_IOR_Property_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_IOP::TAO_IOR_Property::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -494,10 +494,10 @@ tao_TAO_IOP_TAO_IOR_Manipulation_nil ( ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr tao_TAO_IOP_TAO_IOR_Manipulation_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_IOP::TAO_IOR_Manipulation::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp index 46365ab2016..2ac6b5b4597 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.cpp +++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp @@ -27,7 +27,7 @@ CORBA::Object_ptr TAO_IORManip_Loader::create_object (CORBA::ORB_ptr, int, char *[] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h index 68d63af9f64..af9b77b1984 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.h +++ b/TAO/tao/IORManipulation/IORManip_Loader.h @@ -36,7 +36,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv [] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Creates a IORManip factory and returns it. diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 95df98ceb57..728d357f902 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -50,7 +50,7 @@ TAO_IOR_Manipulation_impl::_remove_ref (void) CORBA::Object_ptr TAO_IOR_Manipulation_impl::merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::EmptyProfileList, TAO_IOP::Duplicate, @@ -121,7 +121,7 @@ TAO_IOR_Manipulation_impl::merge_iors ( TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string Merged_Profiles - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Make the stub memory allocation exception safe for the duration @@ -156,7 +156,7 @@ CORBA::Object_ptr TAO_IOR_Manipulation_impl::add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList, @@ -170,14 +170,14 @@ TAO_IOR_Manipulation_impl::add_profiles ( buffer [0] = ior1; buffer [1] = ior2; TAO_IOP::TAO_IOR_Manipulation::IORList iors (2, 2, buffer, 0); - return this->merge_iors (iors TAO_ENV_ARG_PARAMETER); + return this->merge_iors (iors ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr TAO_IOR_Manipulation_impl::remove_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::Invalid_IOR, @@ -225,7 +225,7 @@ TAO_IOR_Manipulation_impl::remove_profiles ( TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string Diff_Profiles - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Make the stub memory allocation exception safe for the duration @@ -260,7 +260,7 @@ CORBA::Boolean TAO_IOR_Manipulation_impl::set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -275,7 +275,7 @@ TAO_IOR_Manipulation_impl::set_property ( // Call the implementation object to return prop->set_property (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean @@ -283,7 +283,7 @@ TAO_IOR_Manipulation_impl::set_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -306,14 +306,14 @@ TAO_IOR_Manipulation_impl::set_primary ( // Call the callback object to do the rest of the processing. return prop->set_primary (ior1, ior2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr TAO_IOR_Manipulation_impl::get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -329,27 +329,27 @@ TAO_IOR_Manipulation_impl::get_primary ( // here? return prop->get_primary (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_IOR_Manipulation_impl::is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - return prop->is_primary_set (ior TAO_ENV_ARG_PARAMETER); + return prop->is_primary_set (ior ACE_ENV_ARG_PARAMETER); } CORBA::ULong TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound @@ -381,7 +381,7 @@ TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::ULong TAO_IOR_Manipulation_impl::get_profile_count ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h index f446acfdb12..2fe4a8cc396 100644 --- a/TAO/tao/IORManipulation/IORManipulation.h +++ b/TAO/tao/IORManipulation/IORManipulation.h @@ -63,7 +63,7 @@ public: virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList, @@ -74,7 +74,7 @@ public: virtual CORBA::Object_ptr add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList, @@ -85,7 +85,7 @@ public: virtual CORBA::Object_ptr remove_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::Invalid_IOR, @@ -96,7 +96,7 @@ public: virtual CORBA::Boolean set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -108,7 +108,7 @@ public: TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -120,7 +120,7 @@ public: virtual CORBA::Object_ptr get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -130,7 +130,7 @@ public: virtual CORBA::Boolean is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -139,7 +139,7 @@ public: virtual CORBA::ULong is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound @@ -147,7 +147,7 @@ public: virtual CORBA::ULong get_profile_count ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::EmptyProfileList diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index 1569daf4738..bfbc2936542 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -81,7 +81,7 @@ void IORTable::AlreadyBound::_raise () void IORTable::AlreadyBound::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -89,7 +89,7 @@ void IORTable::AlreadyBound::_tao_encode ( void IORTable::AlreadyBound::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -155,7 +155,7 @@ void IORTable::NotFound::_raise () void IORTable::NotFound::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -163,7 +163,7 @@ void IORTable::NotFound::_tao_encode ( void IORTable::NotFound::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -288,10 +288,10 @@ IORTable::Table_var::tao_nil (void) ::IORTable::Table_ptr IORTable::Table_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IORTable::Table::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IORTable::Table::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -373,15 +373,15 @@ IORTable::Table::~Table (void) IORTable::Table_ptr IORTable::Table::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Table::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Table::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IORTable::Table_ptr IORTable::Table::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -541,10 +541,10 @@ IORTable::Locator_var::tao_nil (void) ::IORTable::Locator_ptr IORTable::Locator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::IORTable::Locator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::IORTable::Locator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -626,15 +626,15 @@ IORTable::Locator::~Locator (void) IORTable::Locator_ptr IORTable::Locator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Locator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Locator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } IORTable::Locator_ptr IORTable::Locator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index 71ba8c9b18a..1f38984aab5 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -95,7 +95,7 @@ TAO_NAMESPACE IORTable static Locator_ptr tao_duplicate (Locator_ptr); static void tao_release (Locator_ptr); static Locator_ptr tao_nil (void); - static Locator_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static Locator_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -157,12 +157,12 @@ TAO_NAMESPACE IORTable virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static AlreadyBound *_downcast (CORBA::Exception *); @@ -200,12 +200,12 @@ TAO_NAMESPACE IORTable virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NotFound *_downcast (CORBA::Exception *); @@ -257,7 +257,7 @@ TAO_NAMESPACE IORTable static Table_ptr tao_duplicate (Table_ptr); static void tao_release (Table_ptr); static Table_ptr tao_nil (void); - static Table_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static Table_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -312,11 +312,11 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object static Table_ptr _duplicate (Table_ptr obj); static Table_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Table_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Table_ptr _nil (void) { @@ -326,7 +326,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object virtual void bind ( const char * object_key, const char * IOR - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -336,7 +336,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object virtual void rebind ( const char * object_key, const char * IOR - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -344,7 +344,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object virtual void unbind ( const char * object_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -353,7 +353,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object virtual void set_locator ( IORTable::Locator_ptr the_locator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -393,11 +393,11 @@ class TAO_IORTable_Export Locator : public virtual CORBA_Object static Locator_ptr _duplicate (Locator_ptr obj); static Locator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Locator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Locator_ptr _nil (void) { @@ -406,7 +406,7 @@ class TAO_IORTable_Export Locator : public virtual CORBA_Object virtual char * locate ( const char * object_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.i index 061931da125..fd10672764d 100644 --- a/TAO/tao/IORTable/IORTableC.i +++ b/TAO/tao/IORTable/IORTableC.i @@ -58,10 +58,10 @@ tao_IORTable_Table_nil ( ACE_INLINE IORTable::Table_ptr tao_IORTable_Table_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IORTable::Table::_narrow (p TAO_ENV_ARG_PARAMETER); + return IORTable::Table::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -108,10 +108,10 @@ tao_IORTable_Locator_nil ( ACE_INLINE IORTable::Locator_ptr tao_IORTable_Locator_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IORTable::Locator::_narrow (p TAO_ENV_ARG_PARAMETER); + return IORTable::Locator::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index ef8768a0139..79445cba79a 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -16,7 +16,7 @@ TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void) char * TAO_IOR_Table_Impl::find (const char *object_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, IORTable::NotFound @@ -37,14 +37,14 @@ TAO_IOR_Table_Impl::find (const char *object_key ACE_THROW_RETURN (IORTable::NotFound (), 0); } - return this->locator_->locate (object_key TAO_ENV_ARG_PARAMETER); + return this->locator_->locate (object_key ACE_ENV_ARG_PARAMETER); } void TAO_IOR_Table_Impl::bind ( const char * object_key, const char * IOR - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -60,7 +60,7 @@ void TAO_IOR_Table_Impl::rebind ( const char * object_key, const char * IOR - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -73,7 +73,7 @@ TAO_IOR_Table_Impl::rebind ( void TAO_IOR_Table_Impl::unbind ( const char * object_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -88,7 +88,7 @@ TAO_IOR_Table_Impl::unbind ( void TAO_IOR_Table_Impl::set_locator ( IORTable::Locator_ptr locator - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index cd2dabbde71..c14fe8a1c93 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -40,7 +40,7 @@ public: /// Find the object, using the locator if it is not on the table. char *find ( const char *object_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -52,7 +52,7 @@ public: virtual void bind ( const char * object_key, const char * IOR - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -62,7 +62,7 @@ public: virtual void rebind ( const char * object_key, const char * IOR - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -70,7 +70,7 @@ public: virtual void unbind ( const char * object_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -79,7 +79,7 @@ public: virtual void set_locator ( IORTable::Locator_ptr the_locator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index c3399cc3e0b..f5a34bc3a93 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -26,7 +26,7 @@ TAO_Table_Adapter::~TAO_Table_Adapter (void) } void -TAO_Table_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) +TAO_Table_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->root_, TAO_IOR_Table_Impl (), @@ -35,14 +35,14 @@ TAO_Table_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Table_Adapter::close (int TAO_ENV_ARG_DECL_NOT_USED) +TAO_Table_Adapter::close (int ACE_ENV_ARG_DECL_NOT_USED) { CORBA::release (this->root_); this->root_ = 0; } void -TAO_Table_Adapter::check_close (int TAO_ENV_ARG_DECL_NOT_USED) +TAO_Table_Adapter::check_close (int ACE_ENV_ARG_DECL_NOT_USED) { } @@ -56,7 +56,7 @@ int TAO_Table_Adapter::dispatch (TAO_ObjectKey &key, TAO_ServerRequest &, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var object_key; @@ -65,12 +65,12 @@ TAO_Table_Adapter::dispatch (TAO_ObjectKey &key, ACE_TRY { CORBA::String_var ior = - this->root_->find (object_key.in () TAO_ENV_ARG_PARAMETER); + this->root_->find (object_key.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; forward_to = this->orb_core_->orb ()->string_to_object (ior.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (IORTable::NotFound, nf_ex) diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index 7c50ffdc202..40f87cc5b12 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -37,16 +37,16 @@ public: // = The TAO_Adapter methods, please check tao/Adapter.h for the // documentation - virtual void open (TAO_ENV_SINGLE_ARG_DECL); + virtual void open (ACE_ENV_SINGLE_ARG_DECL); virtual void close (int wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void check_close (int wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int priority (void) const; virtual int dispatch (TAO_ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out foward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual const char *name (void) const; virtual CORBA::Object_ptr root (void); diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h index 14d8d99ee2a..6525cd02835 100644 --- a/TAO/tao/IOR_Parser.h +++ b/TAO/tao/IOR_Parser.h @@ -50,7 +50,7 @@ public: */ virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp index dc19a516650..bd409204bfc 100644 --- a/TAO/tao/Interceptor_List.cpp +++ b/TAO/tao/Interceptor_List.cpp @@ -25,7 +25,7 @@ TAO_Interceptor_List::~TAO_Interceptor_List (void) size_t TAO_Interceptor_List::add_interceptor_i ( PortableInterceptor::Interceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)) { @@ -34,7 +34,7 @@ TAO_Interceptor_List::add_interceptor_i ( /// If the Interceptor is not anonymous, make sure an /// Interceptor with the same isn't already registered. CORBA::String_var name = interceptor->name ( - TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); size_t old_len = this->length (); @@ -122,10 +122,10 @@ TAO_ClientRequestInterceptor_List::interceptor (size_t index) void TAO_ClientRequestInterceptor_List::add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t index = this->add_interceptor_i (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->interceptors_[index] = @@ -168,10 +168,10 @@ TAO_ServerRequestInterceptor_List::interceptor (size_t index) void TAO_ServerRequestInterceptor_List::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t index = this->add_interceptor_i (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->interceptors_[index] = @@ -216,10 +216,10 @@ TAO_IORInterceptor_List::interceptor (size_t index) void TAO_IORInterceptor_List::add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t index = this->add_interceptor_i (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->interceptors_[index] = diff --git a/TAO/tao/Interceptor_List.h b/TAO/tao/Interceptor_List.h index 4c0df6e96fe..75a8a8e70d6 100644 --- a/TAO/tao/Interceptor_List.h +++ b/TAO/tao/Interceptor_List.h @@ -48,7 +48,7 @@ protected: /// Register an in interceptor with interceptor list. size_t add_interceptor_i ( PortableInterceptor::Interceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)); @@ -89,7 +89,7 @@ public: /// Register a client request interceptor. void add_interceptor (PortableInterceptor::ClientRequestInterceptor_ptr i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return reference to the underlying Portable Interceptor array. TYPE &interceptors (void); @@ -137,7 +137,7 @@ public: /// Register a server request interceptor. void add_interceptor (PortableInterceptor::ServerRequestInterceptor_ptr i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return reference to the underlying Portable Interceptor array. TYPE &interceptors (void); @@ -186,7 +186,7 @@ public: /// Register an IOR interceptor. void add_interceptor (PortableInterceptor::IORInterceptor_ptr i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return reference to the underlying Portable Interceptor array. TYPE &interceptors (void); diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 5623bb81f82..a7ee6ba2e74 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -146,7 +146,7 @@ TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void) // restarted (e.g. request forwarding). This is the start/restart entry. void -TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER); @@ -187,7 +187,7 @@ TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) this->endpoint_selector_ = this->orb_core_->endpoint_selector_factory ()->get_selector ( this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -207,7 +207,7 @@ TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) this->countdown_ = &countdown; this->endpoint_selector_->select_endpoint (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Set the unique request ID associated with this request. @@ -219,7 +219,7 @@ TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) int TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the transport object. if (this->transport_ != 0) @@ -250,7 +250,7 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc // Obtain a connection. int result = conn_reg->connect (this, &desc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (1); if (result == 0) @@ -296,7 +296,7 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc void TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Then fill in the rest of the RequestHeader @@ -307,11 +307,11 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags this->orb_core_->service_context_list (this->stub_, this->request_service_context (), this->restart_flag_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Set the target specification mode - switch (this->profile_->addressing_mode ()) + switch (this->profile_->addressing_mode ()) { case TAO_Target_Specification::Key_Addr: this->target_spec_.target_specifier ( @@ -333,7 +333,7 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags IOP::IOR *ior_info = 0; int retval = this->stub_->create_ior_info (ior_info, index - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (retval == -1) @@ -368,7 +368,7 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags // Send request. int TAO_GIOP_Invocation::invoke (CORBA::Boolean is_synchronous - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Countdown_Time countdown (this->max_wait_time_); @@ -463,7 +463,7 @@ TAO_GIOP_Invocation::close_connection (void) // Replace the IIOP Profile. int TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // It can be assumed that the GIOP header and the reply header @@ -481,7 +481,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream // in order to obtain the profiles. TAO_Stub *stubobj = this->forward_reference_->_stubobj (); - this->location_forward_i (stubobj TAO_ENV_ARG_PARAMETER); + this->location_forward_i (stubobj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); return TAO_INVOKE_RESTART; @@ -489,7 +489,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream int TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (forward)) @@ -501,7 +501,7 @@ TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward // in order to obtain the profiles. TAO_Stub *stubobj = forward->_stubobj (); - this->location_forward_i (stubobj TAO_ENV_ARG_PARAMETER); + this->location_forward_i (stubobj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); return TAO_INVOKE_RESTART; @@ -509,7 +509,7 @@ TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward void TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the profiles in the given stub object to the list of forward @@ -523,7 +523,7 @@ TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj this->endpoint_selector_ = this->orb_core_->endpoint_selector_factory ()->get_selector ( this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -531,7 +531,7 @@ TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj // profiles. this->endpoint_selector_->forward (this, stubobj->base_profiles () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->received_location_forward_ = 1; @@ -557,7 +557,7 @@ TAO_GIOP_Synch_Invocation::~TAO_GIOP_Synch_Invocation (void) int TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Register a reply dispatcher for this invocation. Use the @@ -584,7 +584,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request } // Just send the request, without trying to wait for the reply. - int retval = TAO_GIOP_Invocation::invoke (1 TAO_ENV_ARG_PARAMETER); + int retval = TAO_GIOP_Invocation::invoke (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (retval); if (retval != TAO_INVOKE_OK) @@ -673,7 +673,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request // loaded services. return this->orb_core_->service_raise_comm_failure (this, this->profile_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // @@ Alex: the old version of this had some error handling code, @@ -734,7 +734,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request CORBA::SystemException* ex = TAO_Exceptions::create_system_exception (type_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_OK); if (ex == 0) @@ -751,7 +751,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request ex->completed (CORBA::CompletionStatus (completion)); // Raise the exception. - TAO_ENV_RAISE (ex); + ACE_ENV_RAISE (ex); return TAO_INVOKE_OK; } @@ -761,7 +761,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request // Handle the forwarding and return so the stub restarts the // request! return this->location_forward (this->inp_stream () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE: { // We have received an exception with a request to change the @@ -780,7 +780,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request // Now set this addressing mode in the profile, so that // the next invocation need not go through this. this->profile_->addressing_mode (addr_mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Now restart the invocation return TAO_INVOKE_RESTART; @@ -794,10 +794,10 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request // **************************************************************** void -TAO_GIOP_Twoway_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_Twoway_Invocation::start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->rd_.state_changed (TAO_LF_Event::LFS_ACTIVE); @@ -824,12 +824,12 @@ TAO_GIOP_Twoway_Invocation::reset_states (void) int TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts, CORBA::ULong except_count - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::Exception)) { TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_INVOCATION_INVOKE_START); - int retval = this->invoke_i (0 TAO_ENV_ARG_PARAMETER); + int retval = this->invoke_i (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (retval); // A TAO_INVOKE_EXCEPTION status, but no exception raised means that @@ -871,7 +871,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts, } exception->_tao_decode (this->inp_stream () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); if (TAO_debug_level > 5) @@ -931,30 +931,30 @@ TAO_GIOP_Oneway_Invocation::TAO_GIOP_Oneway_Invocation ( } void -TAO_GIOP_Oneway_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_Oneway_Invocation::start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } int -TAO_GIOP_Oneway_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_Oneway_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->sync_scope_ == TAO::SYNC_NONE || this->sync_scope_ == TAO::SYNC_EAGER_BUFFERING || this->sync_scope_ == TAO::SYNC_DELAYED_BUFFERING) { - return TAO_GIOP_Invocation::invoke (0 TAO_ENV_ARG_PARAMETER); + return TAO_GIOP_Invocation::invoke (0 ACE_ENV_ARG_PARAMETER); } if (this->sync_scope_ == TAO::SYNC_WITH_TRANSPORT) { - return TAO_GIOP_Invocation::invoke (1 TAO_ENV_ARG_PARAMETER); + return TAO_GIOP_Invocation::invoke (1 ACE_ENV_ARG_PARAMETER); } - int retval = this->invoke_i (0 TAO_ENV_ARG_PARAMETER); + int retval = this->invoke_i (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); // A TAO_INVOKE_EXCEPTION status, but no exception raised means that @@ -987,10 +987,10 @@ TAO_GIOP_Oneway_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL) // **************************************************************** void -TAO_GIOP_Locate_Request_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_Locate_Request_Invocation::start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->transport_->generate_locate_request (this->target_spec_, @@ -1001,7 +1001,7 @@ TAO_GIOP_Locate_Request_Invocation::start (TAO_ENV_SINGLE_ARG_DECL) // Send request, block until any reply comes back. int -TAO_GIOP_Locate_Request_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL) +TAO_GIOP_Locate_Request_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->transport_ == 0) @@ -1010,7 +1010,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL) TAO_INVOKE_EXCEPTION); } - CORBA::ULong locate_status = this->invoke_i (1 TAO_ENV_ARG_PARAMETER); + CORBA::ULong locate_status = this->invoke_i (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); switch (locate_status) @@ -1024,7 +1024,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL) // NOTREACHED. case TAO_GIOP_OBJECT_FORWARD: return this->location_forward (this->inp_stream () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case TAO_GIOP_LOC_SYSTEM_EXCEPTION: { // Pull the exception from the stream. @@ -1064,7 +1064,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL) // Now set this addressing mode in the profile, so that // the next invocation need not go through this. this->profile_->addressing_mode (addr_mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Restart the invocation. return TAO_INVOKE_RESTART; diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index feb311a46aa..b7419f8da40 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -100,7 +100,7 @@ public: * raises the CORBA::TRANSIENT exception. */ void prepare_header (CORBA::Octet response_flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Accessor to the request ServiceContextList. Only valid when @@ -130,16 +130,16 @@ public: /// Establishes a connection to the remote server, initializes /// the GIOP headers in the output CDR. - void start (TAO_ENV_SINGLE_ARG_DECL) + void start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Called by the invocation endpoint selector for each selected /// endpoint. int perform_call (TAO_Transport_Descriptor_Interface &desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Dynamically allocate \param inconsistent_policies_ PolicyList. - void init_inconsistent_policies (TAO_ENV_SINGLE_ARG_DECL) + void init_inconsistent_policies (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return PolicyList stored in \param inconsistent_policies_ and @@ -157,7 +157,7 @@ public: * It returns TAO_INVOKE_RESTART unless an exception is raised. */ int location_forward (CORBA::Object_ptr forward - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the object reference returned in the LOCATION_FORWARD @@ -218,7 +218,7 @@ protected: * resources. */ int invoke (CORBA::Boolean is_synchronous - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -230,7 +230,7 @@ protected: * It returns TAO_INVOKE_RESTART unless an exception is raised. */ int location_forward (TAO_InputCDR &inp_stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -242,7 +242,7 @@ protected: * forward_reference() method in this class. */ void location_forward_i (TAO_Stub *stubobj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -367,7 +367,7 @@ protected: /// Implementation of the invoke() methods, handles the basic /// send/reply code and the system exceptions. int invoke_i (CORBA::Boolean is_locate_request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Reply dispatcher for the current synchronous invocation. @@ -404,7 +404,7 @@ public: /// Establishes a connection to the remote server, initializes /// the GIOP headers in the output CDR. - void start (TAO_ENV_SINGLE_ARG_DECL) + void start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -415,7 +415,7 @@ public: */ int invoke (TAO_Exception_Data *excepts, CORBA::ULong except_count - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::Exception)); /** @@ -452,11 +452,11 @@ public: /// Establishes a connection to the remote server, initializes /// the GIOP headers in the output CDR. - void start (TAO_ENV_SINGLE_ARG_DECL) + void start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Send request, without blocking for any response. - int invoke (TAO_ENV_SINGLE_ARG_DECL) + int invoke (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Accessor for private member. @@ -488,11 +488,11 @@ public: /// Establishes a connection to the remote server, initializes /// the GIOP headers in the output CDR. - void start (TAO_ENV_SINGLE_ARG_DECL) + void start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Send request, without blocking for any response. - int invoke (TAO_ENV_SINGLE_ARG_DECL) + int invoke (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i index 2dca45fb2c2..64ad12a8b4c 100644 --- a/TAO/tao/Invocation.i +++ b/TAO/tao/Invocation.i @@ -53,7 +53,7 @@ TAO_GIOP_Invocation::received_location_forward (void) const ACE_INLINE void TAO_GIOP_Invocation::init_inconsistent_policies ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (this->inconsistent_policies_, diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index f58e71ed890..ae09e505a18 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -37,7 +37,7 @@ TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void) void TAO_Default_Endpoint_Selector::select_endpoint ( TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { do { @@ -45,7 +45,7 @@ TAO_Default_Endpoint_Selector::select_endpoint ( invocation->endpoint (invocation->profile ()->endpoint ()); int status = - this->endpoint_from_profile (invocation TAO_ENV_ARG_PARAMETER); + this->endpoint_from_profile (invocation ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (status == 1) @@ -62,7 +62,7 @@ TAO_Default_Endpoint_Selector::select_endpoint ( // @@ RTCORBA_Subsetting - next should be deprecated... void TAO_Default_Endpoint_Selector::next (TAO_GIOP_Invocation * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n"))); // if (invocation->stub_->next_profile_retry () == 0) @@ -74,7 +74,7 @@ void TAO_Default_Endpoint_Selector::forward (TAO_GIOP_Invocation *invocation, const TAO_MProfile &mprofile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { invocation->stub ()->add_forward_profiles (mprofile); // This has to be and is thread safe. @@ -111,7 +111,7 @@ TAO_Default_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invocation int TAO_Default_Endpoint_Selector::endpoint_from_profile ( TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t endpoint_count = invocation->profile ()->endpoint_count(); @@ -124,7 +124,7 @@ TAO_Default_Endpoint_Selector::endpoint_from_profile ( TAO_Base_Transport_Property desc (invocation->endpoint ()); int status = - invocation->perform_call (desc TAO_ENV_ARG_PARAMETER); + invocation->perform_call (desc ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Check if the invocation has completed. diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h index cd655d1d64c..34424283069 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.h +++ b/TAO/tao/Invocation_Endpoint_Selectors.h @@ -54,7 +54,7 @@ public: /// Select the endpoint and set <invocation>'s <profile_> and /// <endpoint_> data members accordingly. virtual void select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; /** * This method must be called when previously selected endpoint @@ -63,7 +63,7 @@ public: * <select_endpoint> call picks a new endpoint. */ virtual void next (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; /** * This method must be called if the invocation attempt on a @@ -73,7 +73,7 @@ public: */ virtual void forward (TAO_GIOP_Invocation *invocation, const TAO_MProfile &mprofile - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; /// Update the state to indicate that the selected endpoint/profile /// were used successfully. @@ -108,12 +108,12 @@ public: virtual ~TAO_Default_Endpoint_Selector (void); virtual void select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void next (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void forward (TAO_GIOP_Invocation *invocation, const TAO_MProfile &mprofile - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void success (TAO_GIOP_Invocation *invocation); virtual void close_connection (TAO_GIOP_Invocation *invocation); @@ -121,7 +121,7 @@ protected: /// This method selects an endpoint from the profile in the /// invocation object. int endpoint_from_profile (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp index 7ee8c18104d..57ea56ffdf1 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp @@ -37,14 +37,14 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport (TAO_Transport *transport { // @todo This is not the right way to do this.... - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_ORB_Core *orb_core = transport->orb_core (); while (!transport->queue_is_empty ()) { - int result = orb_core->run (0, 1 TAO_ENV_ARG_PARAMETER); + int result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 65e3f6abf53..6188a7f0763 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -37,7 +37,7 @@ CORBA_LocalObject::_remove_ref (void) CORBA::ULong CORBA_LocalObject::_hash (CORBA::ULong maximum - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // Note that we reinterpret_cast to an "unsigned long" instead of // CORBA::ULong since we need to first cast to an integer large @@ -57,7 +57,7 @@ CORBA_LocalObject::_hash (CORBA::ULong maximum CORBA::Boolean CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (()) { return (other_obj == this) ? 1 : 0; @@ -67,7 +67,7 @@ CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj TAO_ObjectKey * -CORBA_LocalObject::_key (TAO_ENV_SINGLE_ARG_DECL) +CORBA_LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL) { ACE_ERROR((LM_ERROR, ACE_TEXT ("(%P|%t) Cannot get _key froma LocalObject!!!\n"))); @@ -103,7 +103,7 @@ CORBA_LocalObject::_tao_QueryInterface (ptr_arith_t type) // the latter case, return FALSE. CORBA::Boolean -CORBA_LocalObject::_non_existent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA_LocalObject::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // Always return false. return 0; @@ -116,7 +116,7 @@ CORBA_LocalObject::_create_request (CORBA::Context_ptr, CORBA::NamedValue_ptr, CORBA::Request_ptr &, CORBA::Flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ Correct minor code? CCM spec says one thing CORBA spec says // another! @@ -133,7 +133,7 @@ CORBA_LocalObject::_create_request (CORBA::Context_ptr, CORBA::ContextList_ptr, CORBA::Request_ptr &, CORBA::Flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ Correct minor code? CCM spec says one thing CORBA spec says // another! @@ -143,7 +143,7 @@ CORBA_LocalObject::_create_request (CORBA::Context_ptr, CORBA::Request_ptr CORBA_LocalObject::_request (const CORBA::Char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ Correct minor code? CCM spec says one thing CORBA spec says // another! @@ -153,13 +153,13 @@ CORBA_LocalObject::_request (const CORBA::Char * } CORBA_InterfaceDef_ptr -CORBA_LocalObject::_get_interface (TAO_ENV_SINGLE_ARG_DECL) +CORBA_LocalObject::_get_interface (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CORBA::ImplementationDef_ptr -CORBA_LocalObject::_get_implementation (TAO_ENV_SINGLE_ARG_DECL) +CORBA_LocalObject::_get_implementation (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } @@ -184,7 +184,7 @@ TAO_Local_RefCounted_Object::_remove_ref (void) CORBA::Policy_ptr CORBA_LocalObject::_get_policy (CORBA::PolicyType - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ()); @@ -192,7 +192,7 @@ CORBA_LocalObject::_get_policy (CORBA::PolicyType CORBA::Policy_ptr CORBA_LocalObject::_get_client_policy (CORBA::PolicyType - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ()); } @@ -200,21 +200,21 @@ CORBA_LocalObject::_get_client_policy (CORBA::PolicyType CORBA::Object_ptr CORBA_LocalObject::_set_policy_overrides (const CORBA::PolicyList &, CORBA::SetOverrideType - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ()); } CORBA::PolicyList * CORBA_LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CORBA::Boolean CORBA_LocalObject::_validate_connection (CORBA::PolicyList_out - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index fe565cd2180..acac9399955 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -55,25 +55,25 @@ public: * CORBA_Object. I'll take the easier route for now. */ static CORBA_LocalObject_ptr _narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// No-op it is just here to simplify some templates. static CORBA_LocalObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #if (TAO_HAS_MINIMUM_CORBA == 0) /// Always returns false. - virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Throws CORBA::NO_IMPLEMENT. virtual CORBA::ImplementationDef_ptr - _get_implementation (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + _get_implementation (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Gets info about object from the Interface Repository. virtual CORBA_InterfaceDef_ptr _get_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ); /// Throws NO_IMPLEMENT. @@ -83,7 +83,7 @@ public: CORBA::NamedValue_ptr result, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void _create_request (CORBA::Context_ptr ctx, const CORBA::Char *operation, @@ -93,11 +93,11 @@ public: CORBA::ContextList_ptr ctxtlist, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Throws NO_IMPLEMENT. virtual CORBA::Request_ptr _request (const CORBA::Char *operation - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -106,32 +106,32 @@ public: /// Throws CORBA::NO_IMPLEMENT. CORBA::Policy_ptr _get_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Throws CORBA::NO_IMPLEMENT. CORBA::Policy_ptr _get_client_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Throws CORBA::NO_IMPLEMENT. CORBA::Object_ptr _set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Throws CORBA::NO_IMPLEMENT. CORBA::PolicyList * _get_policy_overrides ( const CORBA::PolicyTypeSeq & types - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Throws CORBA::NO_IMPLEMENT. CORBA::Boolean _validate_connection ( CORBA::PolicyList_out inconsistent_policies - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -142,7 +142,7 @@ public: * non-unique. */ virtual CORBA::ULong _hash (CORBA::ULong maximum - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Try to determine if this object is the same as <other_obj>. This @@ -151,7 +151,7 @@ public: * protocols are in use) there is no default implementation. */ virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (()); // = Reference count managment. @@ -164,7 +164,7 @@ public: // = TAO extensions /// Throws CORBA::NO_IMPLEMENT. - virtual TAO_ObjectKey *_key (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL); #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 /// Useful for template programming. diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i index 2630bd0d0a1..9a10edac5c2 100644 --- a/TAO/tao/LocalObject.i +++ b/TAO/tao/LocalObject.i @@ -22,7 +22,7 @@ CORBA_LocalObject::_nil (void) ACE_INLINE CORBA_LocalObject_ptr CORBA_LocalObject::_narrow (CORBA_Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (obj->_is_local () != 0) return @@ -37,7 +37,7 @@ CORBA_LocalObject::_narrow (CORBA_Object_ptr obj ACE_INLINE CORBA_LocalObject_ptr CORBA_LocalObject::_unchecked_narrow (CORBA_Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (obj->_is_local () != 0) return diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 6a449260658..9d242b261fa 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -36,7 +36,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { const char *mcast_name = @@ -62,7 +62,7 @@ TAO_MCAST_Parser::parse_string (const char *ior, this->mcast_nic_.in (), orb, timeout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object; @@ -76,7 +76,7 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name, const char *mcast_nic, CORBA::ORB_ptr orb, ACE_Time_Value *timeout - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { char buf[2048]; char *ior = buf; @@ -106,7 +106,7 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name, // Convert IOR to an object reference. return_value = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Object::_nil ()); } diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h index 10c2aafa339..7ff1edbd784 100644 --- a/TAO/tao/MCAST_Parser.h +++ b/TAO/tao/MCAST_Parser.h @@ -50,7 +50,7 @@ public: /// Parse the ior-string that is passed. virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -62,7 +62,7 @@ private: const char *mcast_nic, CORBA::ORB_ptr orb, ACE_Time_Value *timeout - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); int multicast_query (char *&buf, const char *service_name, diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index bcc25e545fb..50346df28d6 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -201,7 +201,7 @@ TAO_MProfile::is_equivalent (const TAO_MProfile *rhs) } CORBA::ULong -TAO_MProfile::hash (CORBA::ULong max TAO_ENV_ARG_DECL) +TAO_MProfile::hash (CORBA::ULong max ACE_ENV_ARG_DECL) { CORBA::ULong hashval = 0; @@ -210,7 +210,7 @@ TAO_MProfile::hash (CORBA::ULong max TAO_ENV_ARG_DECL) for (TAO_PHandle h = 0; h < this->last_ ; ++h) { - hashval += pfiles_[h]->hash (max TAO_ENV_ARG_PARAMETER); + hashval += pfiles_[h]->hash (max ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -222,20 +222,20 @@ TAO_MProfile::hash (CORBA::ULong max TAO_ENV_ARG_DECL) } void -TAO_MProfile::init_policy_list (TAO_ENV_SINGLE_ARG_DECL) +TAO_MProfile::init_policy_list (ACE_ENV_SINGLE_ARG_DECL) { // The first time this method is called // it causes the initialization of the policies // for the current profile. - this->get_current_profile ()->policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_current_profile ()->policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->is_policy_list_initialized_ = 1; } CORBA::PolicyList * -TAO_MProfile::policy_list (TAO_ENV_SINGLE_ARG_DECL) +TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL) { if (!this->is_policy_list_initialized_) { @@ -246,10 +246,10 @@ TAO_MProfile::policy_list (TAO_ENV_SINGLE_ARG_DECL) if (this->policy_list_ == 0) { - this->create_policy_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->create_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - this->init_policy_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index 771bfd4797f..9108fc39e55 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -159,13 +159,13 @@ public: * NON-THREAD SAFE. */ CORBA::ULong hash (CORBA::ULong max - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// This method handle the dynamic allocation of the data member /// <policy_list_>. - void create_policy_list (TAO_ENV_SINGLE_ARG_DECL); + void create_policy_list (ACE_ENV_SINGLE_ARG_DECL); public: @@ -175,12 +175,12 @@ public: /// Gets the policies list associated with the profiles /// owned by the TAO_MProfile. - CORBA::PolicyList *policy_list (TAO_ENV_SINGLE_ARG_DECL); + CORBA::PolicyList *policy_list (ACE_ENV_SINGLE_ARG_DECL); protected: /// Initialize the policy list, demarsharling the policy. - void init_policy_list (TAO_ENV_SINGLE_ARG_DECL); + void init_policy_list (ACE_ENV_SINGLE_ARG_DECL); protected: /// Stores the policy list for the profile of this MProfile. diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i index b93fd987b7d..99264a0695b 100644 --- a/TAO/tao/MProfile.i +++ b/TAO/tao/MProfile.i @@ -253,7 +253,7 @@ TAO_MProfile::add_profile (TAO_Profile *pfile) } ACE_INLINE void -TAO_MProfile::create_policy_list (TAO_ENV_SINGLE_ARG_DECL) +TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->policy_list_, CORBA::PolicyList, diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp index 19f86d55362..2af5c1fb987 100644 --- a/TAO/tao/Marshal.cpp +++ b/TAO/tao/Marshal.cpp @@ -38,9 +38,9 @@ TAO_Marshal_Object::~TAO_Marshal_Object (void) CORBA::TypeCode::traverse_status TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - CORBA::ULong kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); switch (kind) @@ -73,73 +73,73 @@ TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc, case CORBA::tk_enum: { TAO_Marshal_Primitive marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_any: { TAO_Marshal_Any marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_TypeCode: { TAO_Marshal_TypeCode marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_Principal: { TAO_Marshal_Principal marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_objref: { TAO_Marshal_ObjRef marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_struct: { TAO_Marshal_Struct marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_union: { TAO_Marshal_Union marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_string: { TAO_Marshal_String marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_sequence: { TAO_Marshal_Sequence marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_array: { TAO_Marshal_Array marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_alias: { TAO_Marshal_Alias marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_except: { TAO_Marshal_Except marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_wstring: { TAO_Marshal_WString marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } case CORBA::tk_value: { TAO_Marshal_Value marshal; - return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); } } } @@ -148,9 +148,9 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - CORBA::ULong kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); switch (kind) @@ -183,73 +183,73 @@ TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc, case CORBA::tk_enum: { TAO_Marshal_Primitive marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_any: { TAO_Marshal_Any marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_TypeCode: { TAO_Marshal_TypeCode marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_Principal: { TAO_Marshal_Principal marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_objref: { TAO_Marshal_ObjRef marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_struct: { TAO_Marshal_Struct marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_union: { TAO_Marshal_Union marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_string: { TAO_Marshal_String marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_sequence: { TAO_Marshal_Sequence marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_array: { TAO_Marshal_Array marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_alias: { TAO_Marshal_Alias marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_except: { TAO_Marshal_Except marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_wstring: { TAO_Marshal_WString marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } case CORBA::tk_value: { TAO_Marshal_Value marshal; - return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); } } } diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h index 1e1b5aad274..f3e4313f768 100644 --- a/TAO/tao/Marshal.h +++ b/TAO/tao/Marshal.h @@ -73,12 +73,12 @@ public: static CORBA::TypeCode::traverse_status perform_skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// append entry point, it allocates the right kind of Marshal_Object /// and invokes skip on it. @@ -86,13 +86,13 @@ public: perform_append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; /** @@ -110,13 +110,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -135,13 +135,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -160,13 +160,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -185,13 +185,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -210,13 +210,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -235,13 +235,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -260,13 +260,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -285,13 +285,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -310,13 +310,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -335,13 +335,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -360,13 +360,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -385,13 +385,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -410,13 +410,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -435,13 +435,13 @@ public: /// skip operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// append operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: CORBA::Boolean nested_processing_; diff --git a/TAO/tao/Messaging.cpp b/TAO/tao/Messaging.cpp index 3c28211481f..fb164333818 100644 --- a/TAO/tao/Messaging.cpp +++ b/TAO/tao/Messaging.cpp @@ -15,7 +15,7 @@ exception_holder_raise (TAO_Exception_Data *exception_data, CORBA::ULong marshaled_data_length, CORBA::Boolean byte_order, CORBA::Boolean is_system_exception - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_InputCDR _tao_in ((const char*) marshaled_data, marshaled_data_length, @@ -30,7 +30,7 @@ exception_holder_raise (TAO_Exception_Data *exception_data, ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + if (is_system_exception) { CORBA::ULong minor = 0; @@ -41,7 +41,7 @@ exception_holder_raise (TAO_Exception_Data *exception_data, CORBA::COMPLETED_MAYBE)); CORBA::SystemException* exception = TAO_Exceptions::create_system_exception (type_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (exception == 0) @@ -53,9 +53,9 @@ exception_holder_raise (TAO_Exception_Data *exception_data, } exception->minor (minor); exception->completed (CORBA::CompletionStatus (completion)); - + // Raise the exception. - TAO_ENV_RAISE (exception); + ACE_ENV_RAISE (exception); return; } @@ -67,24 +67,24 @@ exception_holder_raise (TAO_Exception_Data *exception_data, { if (ACE_OS::strcmp (type_id.in (), exception_data[i].id) != 0) continue; - + CORBA::Exception *exception = exception_data[i].alloc (); - + if (exception == 0) ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - exception->_tao_decode (_tao_in TAO_ENV_ARG_PARAMETER); + exception->_tao_decode (_tao_in ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Raise the exception. - TAO_ENV_RAISE (exception); - + ACE_ENV_RAISE (exception); + return; } - + // If we couldn't find the right exception, report it as // CORBA::UNKNOWN. - + // @@ It would seem like if the remote exception is a // UserException we can assume that the request was // completed. diff --git a/TAO/tao/Messaging.h b/TAO/tao/Messaging.h index 1f5eec64b81..165e3b31ea4 100644 --- a/TAO/tao/Messaging.h +++ b/TAO/tao/Messaging.h @@ -45,7 +45,7 @@ typedef void (*TAO_Reply_Handler_Skeleton)( TAO_InputCDR &, Messaging::ReplyHandler *, CORBA::ULong reply_status - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); struct TAO_Exception_Data; @@ -66,7 +66,7 @@ namespace TAO_Messaging_Helper CORBA::ULong marshaled_data_length, CORBA::Boolean byte_order, CORBA::Boolean is_system_exception - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); } #endif /* TAO_HAS_AMI_CALLBACK */ diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp index d88fc70ff7b..e828fbc5324 100644 --- a/TAO/tao/MessagingC.cpp +++ b/TAO/tao/MessagingC.cpp @@ -445,10 +445,10 @@ Messaging::RebindPolicy_var::tao_nil (void) ::Messaging::RebindPolicy_ptr Messaging::RebindPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::RebindPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::RebindPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -529,15 +529,15 @@ Messaging::RebindPolicy::~RebindPolicy (void) Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RebindPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RebindPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -719,10 +719,10 @@ Messaging::SyncScopePolicy_var::tao_nil (void) ::Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::SyncScopePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::SyncScopePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -802,15 +802,15 @@ Messaging::SyncScopePolicy::~SyncScopePolicy (void) Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return SyncScopePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return SyncScopePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1077,10 +1077,10 @@ Messaging::RequestPriorityPolicy_var::tao_nil (void) ::Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::RequestPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::RequestPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1161,15 +1161,15 @@ Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void) Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RequestPriorityPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RequestPriorityPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1347,10 +1347,10 @@ Messaging::ReplyPriorityPolicy_var::tao_nil (void) ::Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::ReplyPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::ReplyPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1431,15 +1431,15 @@ Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void) Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ReplyPriorityPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ReplyPriorityPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1621,10 +1621,10 @@ Messaging::RequestStartTimePolicy_var::tao_nil (void) ::Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::RequestStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::RequestStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1705,15 +1705,15 @@ Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void) Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RequestStartTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RequestStartTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1895,10 +1895,10 @@ Messaging::RequestEndTimePolicy_var::tao_nil (void) ::Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::RequestEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::RequestEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1979,15 +1979,15 @@ Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void) Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RequestEndTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RequestEndTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2169,10 +2169,10 @@ Messaging::ReplyStartTimePolicy_var::tao_nil (void) ::Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::ReplyStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::ReplyStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2253,15 +2253,15 @@ Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void) Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ReplyStartTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ReplyStartTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2443,10 +2443,10 @@ Messaging::ReplyEndTimePolicy_var::tao_nil (void) ::Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::ReplyEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::ReplyEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2527,15 +2527,15 @@ Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void) Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ReplyEndTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ReplyEndTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2717,10 +2717,10 @@ Messaging::RelativeRequestTimeoutPolicy_var::tao_nil (void) ::Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::RelativeRequestTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::RelativeRequestTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2801,15 +2801,15 @@ Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void) Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RelativeRequestTimeoutPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RelativeRequestTimeoutPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2991,10 +2991,10 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::tao_nil (void) ::Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3075,15 +3075,15 @@ Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3354,10 +3354,10 @@ Messaging::RoutingPolicy_var::tao_nil (void) ::Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::RoutingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::RoutingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3438,15 +3438,15 @@ Messaging::RoutingPolicy::~RoutingPolicy (void) Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RoutingPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RoutingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3628,10 +3628,10 @@ Messaging::MaxHopsPolicy_var::tao_nil (void) ::Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::MaxHopsPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::MaxHopsPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3712,15 +3712,15 @@ Messaging::MaxHopsPolicy::~MaxHopsPolicy (void) Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return MaxHopsPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return MaxHopsPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3902,10 +3902,10 @@ Messaging::QueueOrderPolicy_var::tao_nil (void) ::Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::QueueOrderPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::QueueOrderPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3986,15 +3986,15 @@ Messaging::QueueOrderPolicy::~QueueOrderPolicy (void) Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return QueueOrderPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return QueueOrderPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4564,10 +4564,10 @@ Messaging::ReplyHandler_var::tao_nil (void) ::Messaging::ReplyHandler_ptr Messaging::ReplyHandler_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::Messaging::ReplyHandler::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::Messaging::ReplyHandler::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4693,7 +4693,7 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::~_TAO_ReplyHandler_Remote_Prox Messaging::_TAO_ReplyHandler_Proxy_Impl& Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::select_proxy ( ::Messaging::ReplyHandler * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -4734,24 +4734,24 @@ void Messaging::ReplyHandler::_tao_any_destructor (void *x) Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return ReplyHandler::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/Messaging/ReplyHandler:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/Messaging/ReplyHandler:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ReplyHandler::_nil ()); if (is_a == 0) return ReplyHandler::_nil (); } - return ReplyHandler::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ReplyHandler::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4808,14 +4808,14 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj) return obj; } -CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/Messaging/ReplyHandler:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type) @@ -5039,7 +5039,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::Priorit { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (Messaging::_tc_PriorityRange TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (Messaging::_tc_PriorityRange ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5207,7 +5207,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::Routing { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (Messaging::_tc_RoutingTypeRange TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (Messaging::_tc_RoutingTypeRange ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5321,7 +5321,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyV { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5412,7 +5412,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyV { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValueSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValueSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5483,7 +5483,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_ _tao_elem = Messaging::ReplyHandler::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (Messaging::_tc_ReplyHandler TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (Messaging::_tc_ReplyHandler ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5665,7 +5665,7 @@ CORBA::Boolean operator>> ( _tao_objref = Messaging::ReplyHandler::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h index 89409f83658..297ce5776fb 100644 --- a/TAO/tao/MessagingC.h +++ b/TAO/tao/MessagingC.h @@ -177,7 +177,7 @@ TAO_NAMESPACE Messaging static RebindPolicy_ptr tao_duplicate (RebindPolicy_ptr); static void tao_release (RebindPolicy_ptr); static RebindPolicy_ptr tao_nil (void); - static RebindPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static RebindPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -232,11 +232,11 @@ TAO_NAMESPACE Messaging static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj); static RebindPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RebindPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RebindPolicy_ptr _nil (void) { @@ -244,7 +244,7 @@ TAO_NAMESPACE Messaging } virtual Messaging::RebindMode rebind_mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -311,7 +311,7 @@ TAO_NAMESPACE Messaging static SyncScopePolicy_ptr tao_duplicate (SyncScopePolicy_ptr); static void tao_release (SyncScopePolicy_ptr); static SyncScopePolicy_ptr tao_nil (void); - static SyncScopePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static SyncScopePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -366,11 +366,11 @@ TAO_NAMESPACE Messaging static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj); static SyncScopePolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static SyncScopePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static SyncScopePolicy_ptr _nil (void) { @@ -378,7 +378,7 @@ TAO_NAMESPACE Messaging } virtual Messaging::SyncScope synchronization ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -495,7 +495,7 @@ TAO_NAMESPACE Messaging static RequestPriorityPolicy_ptr tao_duplicate (RequestPriorityPolicy_ptr); static void tao_release (RequestPriorityPolicy_ptr); static RequestPriorityPolicy_ptr tao_nil (void); - static RequestPriorityPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static RequestPriorityPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -550,11 +550,11 @@ TAO_NAMESPACE Messaging static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj); static RequestPriorityPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RequestPriorityPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RequestPriorityPolicy_ptr _nil (void) { @@ -562,7 +562,7 @@ TAO_NAMESPACE Messaging } virtual Messaging::PriorityRange priority_range ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -625,7 +625,7 @@ TAO_NAMESPACE Messaging static ReplyPriorityPolicy_ptr tao_duplicate (ReplyPriorityPolicy_ptr); static void tao_release (ReplyPriorityPolicy_ptr); static ReplyPriorityPolicy_ptr tao_nil (void); - static ReplyPriorityPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static ReplyPriorityPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -680,11 +680,11 @@ TAO_NAMESPACE Messaging static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj); static ReplyPriorityPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ReplyPriorityPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ReplyPriorityPolicy_ptr _nil (void) { @@ -692,7 +692,7 @@ TAO_NAMESPACE Messaging } virtual Messaging::PriorityRange priority_range ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -759,7 +759,7 @@ TAO_NAMESPACE Messaging static RequestStartTimePolicy_ptr tao_duplicate (RequestStartTimePolicy_ptr); static void tao_release (RequestStartTimePolicy_ptr); static RequestStartTimePolicy_ptr tao_nil (void); - static RequestStartTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static RequestStartTimePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -814,11 +814,11 @@ TAO_NAMESPACE Messaging static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj); static RequestStartTimePolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RequestStartTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RequestStartTimePolicy_ptr _nil (void) { @@ -826,7 +826,7 @@ TAO_NAMESPACE Messaging } virtual TimeBase::UtcT start_time ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -893,7 +893,7 @@ TAO_NAMESPACE Messaging static RequestEndTimePolicy_ptr tao_duplicate (RequestEndTimePolicy_ptr); static void tao_release (RequestEndTimePolicy_ptr); static RequestEndTimePolicy_ptr tao_nil (void); - static RequestEndTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static RequestEndTimePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -948,11 +948,11 @@ TAO_NAMESPACE Messaging static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj); static RequestEndTimePolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RequestEndTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RequestEndTimePolicy_ptr _nil (void) { @@ -960,7 +960,7 @@ TAO_NAMESPACE Messaging } virtual TimeBase::UtcT end_time ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1027,7 +1027,7 @@ TAO_NAMESPACE Messaging static ReplyStartTimePolicy_ptr tao_duplicate (ReplyStartTimePolicy_ptr); static void tao_release (ReplyStartTimePolicy_ptr); static ReplyStartTimePolicy_ptr tao_nil (void); - static ReplyStartTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static ReplyStartTimePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1082,11 +1082,11 @@ TAO_NAMESPACE Messaging static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj); static ReplyStartTimePolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ReplyStartTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ReplyStartTimePolicy_ptr _nil (void) { @@ -1094,7 +1094,7 @@ TAO_NAMESPACE Messaging } virtual TimeBase::UtcT start_time ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1161,7 +1161,7 @@ TAO_NAMESPACE Messaging static ReplyEndTimePolicy_ptr tao_duplicate (ReplyEndTimePolicy_ptr); static void tao_release (ReplyEndTimePolicy_ptr); static ReplyEndTimePolicy_ptr tao_nil (void); - static ReplyEndTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static ReplyEndTimePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1216,11 +1216,11 @@ TAO_NAMESPACE Messaging static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj); static ReplyEndTimePolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ReplyEndTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ReplyEndTimePolicy_ptr _nil (void) { @@ -1228,7 +1228,7 @@ TAO_NAMESPACE Messaging } virtual TimeBase::UtcT end_time ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1295,7 +1295,7 @@ TAO_NAMESPACE Messaging static RelativeRequestTimeoutPolicy_ptr tao_duplicate (RelativeRequestTimeoutPolicy_ptr); static void tao_release (RelativeRequestTimeoutPolicy_ptr); static RelativeRequestTimeoutPolicy_ptr tao_nil (void); - static RelativeRequestTimeoutPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static RelativeRequestTimeoutPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1350,11 +1350,11 @@ TAO_NAMESPACE Messaging static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj); static RelativeRequestTimeoutPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RelativeRequestTimeoutPolicy_ptr _nil (void) { @@ -1362,7 +1362,7 @@ TAO_NAMESPACE Messaging } virtual TimeBase::TimeT relative_expiry ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1429,7 +1429,7 @@ TAO_NAMESPACE Messaging static RelativeRoundtripTimeoutPolicy_ptr tao_duplicate (RelativeRoundtripTimeoutPolicy_ptr); static void tao_release (RelativeRoundtripTimeoutPolicy_ptr); static RelativeRoundtripTimeoutPolicy_ptr tao_nil (void); - static RelativeRoundtripTimeoutPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static RelativeRoundtripTimeoutPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1484,11 +1484,11 @@ TAO_NAMESPACE Messaging static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj); static RelativeRoundtripTimeoutPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RelativeRoundtripTimeoutPolicy_ptr _nil (void) { @@ -1496,7 +1496,7 @@ TAO_NAMESPACE Messaging } virtual TimeBase::TimeT relative_expiry ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1613,7 +1613,7 @@ TAO_NAMESPACE Messaging static RoutingPolicy_ptr tao_duplicate (RoutingPolicy_ptr); static void tao_release (RoutingPolicy_ptr); static RoutingPolicy_ptr tao_nil (void); - static RoutingPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static RoutingPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1668,11 +1668,11 @@ TAO_NAMESPACE Messaging static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj); static RoutingPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RoutingPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RoutingPolicy_ptr _nil (void) { @@ -1680,7 +1680,7 @@ TAO_NAMESPACE Messaging } virtual Messaging::RoutingTypeRange routing_range ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1747,7 +1747,7 @@ TAO_NAMESPACE Messaging static MaxHopsPolicy_ptr tao_duplicate (MaxHopsPolicy_ptr); static void tao_release (MaxHopsPolicy_ptr); static MaxHopsPolicy_ptr tao_nil (void); - static MaxHopsPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static MaxHopsPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1802,11 +1802,11 @@ TAO_NAMESPACE Messaging static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj); static MaxHopsPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static MaxHopsPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static MaxHopsPolicy_ptr _nil (void) { @@ -1814,7 +1814,7 @@ TAO_NAMESPACE Messaging } virtual CORBA::UShort max_hops ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1881,7 +1881,7 @@ TAO_NAMESPACE Messaging static QueueOrderPolicy_ptr tao_duplicate (QueueOrderPolicy_ptr); static void tao_release (QueueOrderPolicy_ptr); static QueueOrderPolicy_ptr tao_nil (void); - static QueueOrderPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static QueueOrderPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1936,11 +1936,11 @@ TAO_NAMESPACE Messaging static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj); static QueueOrderPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static QueueOrderPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static QueueOrderPolicy_ptr _nil (void) { @@ -1948,7 +1948,7 @@ TAO_NAMESPACE Messaging } virtual Messaging::Ordering allowed_orders ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2466,7 +2466,7 @@ TAO_NAMESPACE Messaging static ReplyHandler_ptr tao_duplicate (ReplyHandler_ptr); static void tao_release (ReplyHandler_ptr); static ReplyHandler_ptr tao_nil (void); - static ReplyHandler_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static ReplyHandler_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -2527,11 +2527,11 @@ TAO_NAMESPACE Messaging static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj); static ReplyHandler_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ReplyHandler_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ReplyHandler_ptr _nil (void) { @@ -2542,7 +2542,7 @@ TAO_NAMESPACE Messaging virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2636,7 +2636,7 @@ public: virtual ~_TAO_ReplyHandler_Proxy_Broker (void); virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy ( ReplyHandler *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -2662,7 +2662,7 @@ public: virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy ( ReplyHandler *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i index 620f4b1b7d0..5196d6b3135 100644 --- a/TAO/tao/MessagingC.i +++ b/TAO/tao/MessagingC.i @@ -52,10 +52,10 @@ tao_Messaging_RebindPolicy_nil ( ACE_INLINE Messaging::RebindPolicy_ptr tao_Messaging_RebindPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::RebindPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::RebindPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -106,10 +106,10 @@ tao_Messaging_SyncScopePolicy_nil ( ACE_INLINE Messaging::SyncScopePolicy_ptr tao_Messaging_SyncScopePolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::SyncScopePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::SyncScopePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -305,10 +305,10 @@ tao_Messaging_RequestPriorityPolicy_nil ( ACE_INLINE Messaging::RequestPriorityPolicy_ptr tao_Messaging_RequestPriorityPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::RequestPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::RequestPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -355,10 +355,10 @@ tao_Messaging_ReplyPriorityPolicy_nil ( ACE_INLINE Messaging::ReplyPriorityPolicy_ptr tao_Messaging_ReplyPriorityPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::ReplyPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::ReplyPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -409,10 +409,10 @@ tao_Messaging_RequestStartTimePolicy_nil ( ACE_INLINE Messaging::RequestStartTimePolicy_ptr tao_Messaging_RequestStartTimePolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::RequestStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::RequestStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -463,10 +463,10 @@ tao_Messaging_RequestEndTimePolicy_nil ( ACE_INLINE Messaging::RequestEndTimePolicy_ptr tao_Messaging_RequestEndTimePolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::RequestEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::RequestEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -517,10 +517,10 @@ tao_Messaging_ReplyStartTimePolicy_nil ( ACE_INLINE Messaging::ReplyStartTimePolicy_ptr tao_Messaging_ReplyStartTimePolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::ReplyStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::ReplyStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -571,10 +571,10 @@ tao_Messaging_ReplyEndTimePolicy_nil ( ACE_INLINE Messaging::ReplyEndTimePolicy_ptr tao_Messaging_ReplyEndTimePolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::ReplyEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::ReplyEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -625,10 +625,10 @@ tao_Messaging_RelativeRequestTimeoutPolicy_nil ( ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr tao_Messaging_RelativeRequestTimeoutPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::RelativeRequestTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::RelativeRequestTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -679,10 +679,10 @@ tao_Messaging_RelativeRoundtripTimeoutPolicy_nil ( ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr tao_Messaging_RelativeRoundtripTimeoutPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -878,10 +878,10 @@ tao_Messaging_RoutingPolicy_nil ( ACE_INLINE Messaging::RoutingPolicy_ptr tao_Messaging_RoutingPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::RoutingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::RoutingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -932,10 +932,10 @@ tao_Messaging_MaxHopsPolicy_nil ( ACE_INLINE Messaging::MaxHopsPolicy_ptr tao_Messaging_MaxHopsPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::MaxHopsPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::MaxHopsPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -986,10 +986,10 @@ tao_Messaging_QueueOrderPolicy_nil ( ACE_INLINE Messaging::QueueOrderPolicy_ptr tao_Messaging_QueueOrderPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::QueueOrderPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::QueueOrderPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1826,10 +1826,10 @@ tao_Messaging_ReplyHandler_nil ( ACE_INLINE Messaging::ReplyHandler_ptr tao_Messaging_ReplyHandler_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Messaging::ReplyHandler::_narrow (p TAO_ENV_ARG_PARAMETER); + return Messaging::ReplyHandler::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging_ORBInitializer.cpp index 7d545faa4af..85ccd36c800 100644 --- a/TAO/tao/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging_ORBInitializer.cpp @@ -16,7 +16,7 @@ ACE_RCSID (TAO, void TAO_Messaging_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) @@ -32,18 +32,18 @@ TAO_Messaging_ORBInitializer::pre_init ( void TAO_Messaging_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Messaging_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register the Messaging policy factories. @@ -73,13 +73,13 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( type = TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -87,7 +87,7 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( type = TAO_BUFFERING_CONSTRAINT_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ @@ -95,68 +95,68 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( type = TAO_MESSAGING_REBIND_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_ROUTING_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_MAX_HOPS_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE; info->register_policy_factory (type, this->policy_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/Messaging_ORBInitializer.h b/TAO/tao/Messaging_ORBInitializer.h index d8827062e16..faf82ec7ccb 100644 --- a/TAO/tao/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging_ORBInitializer.h @@ -57,11 +57,11 @@ public: //@{ virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -71,7 +71,7 @@ private: /// Register Messaging policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/tao/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging_PolicyFactory.cpp index 8b7769da9cd..df0babeb44c 100644 --- a/TAO/tao/Messaging_PolicyFactory.cpp +++ b/TAO/tao/Messaging_PolicyFactory.cpp @@ -16,7 +16,7 @@ CORBA::Policy_ptr TAO_Messaging_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { @@ -28,7 +28,7 @@ TAO_Messaging_PolicyFactory::create_policy ( case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE: return TAO_RelativeRoundtripTimeoutPolicy::create ( value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ @@ -37,7 +37,7 @@ TAO_Messaging_PolicyFactory::create_policy ( case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE: return TAO_Sync_Scope_Policy::create (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ @@ -45,7 +45,7 @@ TAO_Messaging_PolicyFactory::create_policy ( case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE: return TAO_Buffering_Constraint_Policy::create (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/Messaging_PolicyFactory.h b/TAO/tao/Messaging_PolicyFactory.h index 61842bb4802..396f261141b 100644 --- a/TAO/tao/Messaging_PolicyFactory.h +++ b/TAO/tao/Messaging_PolicyFactory.h @@ -46,7 +46,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp index d0f1e8c2e60..c544b9e1ee2 100644 --- a/TAO/tao/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging_Policy_i.cpp @@ -25,14 +25,14 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TA } TimeBase::TimeT -TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->relative_expiry_; } CORBA::PolicyType -TAO_RelativeRoundtripTimeoutPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RelativeRoundtripTimeoutPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how this minimizes the @@ -62,10 +62,10 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, { Messaging::RelativeRoundtripTimeoutPolicy_var p = Messaging::RelativeRoundtripTimeoutPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - TimeBase::TimeT t = p->relative_expiry (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT seconds = t / 10000000u; TimeBase::TimeT microseconds = (t % 10000000u) / 10; @@ -93,7 +93,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, CORBA::Policy_ptr TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Future policy implementors: notice how the following code is // exception safe! @@ -124,7 +124,7 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_RelativeRoundtripTimeoutPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_RelativeRoundtripTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is @@ -140,7 +140,7 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_RelativeRoundtripTimeoutPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RelativeRoundtripTimeoutPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -188,7 +188,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) } CORBA::PolicyType -TAO_Sync_Scope_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Sync_Scope_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Messaging::SYNC_SCOPE_POLICY_TYPE; @@ -242,7 +242,7 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core, CORBA::Policy_ptr TAO_Sync_Scope_Policy::create (const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Messaging::SyncScope synchronization; if ((val >>= synchronization) == 0) @@ -269,14 +269,14 @@ TAO_Sync_Scope_Policy::clone (void) const } Messaging::SyncScope -TAO_Sync_Scope_Policy::synchronization (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Sync_Scope_Policy::synchronization (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->synchronization_; } CORBA::Policy_ptr -TAO_Sync_Scope_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Sync_Scope_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Sync_Scope_Policy *servant = 0; @@ -289,7 +289,7 @@ TAO_Sync_Scope_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Sync_Scope_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Sync_Scope_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h index 96c53cbdbd3..835cd50c021 100644 --- a/TAO/tao/Messaging_Policy_i.h +++ b/TAO/tao/Messaging_Policy_i.h @@ -55,22 +55,22 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual TimeBase::TimeT relative_expiry (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Change the CORBA representation to the ACE representation. @@ -118,25 +118,25 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. static CORBA::Policy_ptr create (const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual Messaging::SyncScope synchronization (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void get_synchronization (Messaging::SyncScope &synchronization) const; - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index b2589d0ac54..436dfa6e70a 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -96,20 +96,20 @@ CORBA_NVList::~CORBA_NVList (void) // add an element and just initialize its flags CORBA::NamedValue_ptr CORBA_NVList::add (CORBA::Flags flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element (if necessary) - return this->add_element (flags TAO_ENV_ARG_PARAMETER); + 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER); + CORBA::NamedValue_ptr nv = this->add_element (flags ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (nv) @@ -127,10 +127,10 @@ CORBA::NamedValue_ptr CORBA_NVList::add_value (const char *name, const CORBA::Any &value, CORBA::Flags flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER); + CORBA::NamedValue_ptr nv = this->add_element (flags ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (nv) { @@ -163,11 +163,11 @@ CORBA_NVList::add_value (const char *name, CORBA::NamedValue_ptr CORBA_NVList::add_item_consume (char *name, CORBA::Flags flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER); + CORBA::NamedValue_ptr nv = this->add_element (flags ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (nv) @@ -187,10 +187,10 @@ CORBA::NamedValue_ptr CORBA_NVList::add_value_consume (char * name, CORBA::Any * value, CORBA::Flags flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER); + CORBA::NamedValue_ptr nv = this->add_element (flags ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (nv) @@ -211,7 +211,7 @@ CORBA_NVList::add_value_consume (char * name, //CORBA::Status void -CORBA_NVList::remove (CORBA::ULong /*n*/ TAO_ENV_ARG_DECL_NOT_USED/*env*/) +CORBA_NVList::remove (CORBA::ULong /*n*/ ACE_ENV_ARG_DECL_NOT_USED/*env*/) { // not implemented // @@ (ASG) - TODO @@ -220,9 +220,9 @@ CORBA_NVList::remove (CORBA::ULong /*n*/ TAO_ENV_ARG_DECL_NOT_USED/*env*/) // Helper method CORBA::NamedValue_ptr CORBA_NVList::add_element (CORBA::Flags flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); if (ACE_BIT_DISABLED (flags, @@ -248,9 +248,9 @@ CORBA_NVList::add_element (CORBA::Flags flags // return the item at location n CORBA::NamedValue_ptr -CORBA_NVList::item (CORBA::ULong n TAO_ENV_ARG_DECL) +CORBA_NVList::item (CORBA::ULong n ACE_ENV_ARG_DECL) { - this->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); if (n >= this->max_) // 0 based indexing @@ -266,7 +266,7 @@ void CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, int flag, int &lazy_evaluation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If the list is empty then using lazy evaluation is the only // choice. @@ -280,7 +280,7 @@ CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, { this->_tao_decode (cdr, flag - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return; } ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_); @@ -298,7 +298,7 @@ void CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, TAO_ORB_Core *orb_core, int flag - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_); if (this->incoming_ != 0) @@ -341,7 +341,7 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, (void) TAO_Marshal_Object::perform_append (tc.in (), this->incoming_, &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -368,7 +368,7 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, nv->value ()->_tao_encode (cdr, orb_core - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -376,7 +376,7 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, void CORBA_NVList::_tao_decode (TAO_InputCDR &incoming, int flag - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 3) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n"))); @@ -405,7 +405,7 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming, CORBA::Any_ptr any = nv->value (); any->_tao_decode (incoming - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -423,7 +423,7 @@ CORBA_NVList::_tao_target_alignment (void) } void -CORBA_NVList::evaluate (TAO_ENV_SINGLE_ARG_DECL) +CORBA_NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_); if (this->incoming_ == 0) @@ -434,7 +434,7 @@ CORBA_NVList::evaluate (TAO_ENV_SINGLE_ARG_DECL) this->_tao_decode (*(incoming.get ()), this->incoming_flag_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index 0c56ac91a6f..ee96cea184c 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -181,44 +181,44 @@ public: ~CORBA_NVList (void); /// return the current number of elements in the list - CORBA::ULong count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// add an element and just initialize the flags CORBA_NamedValue_ptr add (CORBA::Flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// add an element and initialize its name and flags CORBA_NamedValue_ptr add_item (const char *, CORBA::Flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// initializes a value, name, and flags CORBA_NamedValue_ptr add_value (const char *, const CORBA::Any &, CORBA::Flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// just like add_item. In addition, memory management of char * name /// is taken over by the NVList CORBA_NamedValue_ptr add_item_consume (char *, CORBA::Flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + 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 CORBA_NamedValue_ptr add_value_consume (char *, CORBA::Any_ptr, CORBA::Flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// retrieve the item at the nth location. Raises Bounds CORBA_NamedValue_ptr item (CORBA::ULong n - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // CORBA::Status /// remove element at index n. Raises Bounds void remove (CORBA::ULong n - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // The pseudo object static methods.. static CORBA_NVList* _duplicate (CORBA_NVList*); @@ -239,19 +239,19 @@ public: void _tao_incoming_cdr (TAO_InputCDR &cdr, int flag, int &lazy_evaluation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Encode the NVList into the CDR stream. <flag> masks the type of /// arguments (IN, OUT or INOUT) that are to be marshaled. void _tao_encode (TAO_OutputCDR &cdr, TAO_ORB_Core *orb_core, int flag - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Decode the NVList arguments from the <cdr> stream. void _tao_decode (TAO_InputCDR &cdr, int flag - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Return the required alignment to marshal the NVList without any @@ -281,11 +281,11 @@ private: /// helper to increase the list size. This is used by all the add_ /// methods of the NVList class CORBA_NamedValue_ptr add_element (CORBA::Flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Lazy evaluation routine to fill up the Anys in the NVList from /// the CDR stream. - void evaluate (TAO_ENV_SINGLE_ARG_DECL); + void evaluate (ACE_ENV_SINGLE_ARG_DECL); private: /// internal list of parameters stored as NamedValues diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i index 29d94e96a7e..81c69a9f738 100644 --- a/TAO/tao/NVList.i +++ b/TAO/tao/NVList.i @@ -247,9 +247,9 @@ CORBA_NVList::CORBA_NVList (void) } ACE_INLINE CORBA::ULong -CORBA_NVList::count (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_NVList::count (ACE_ENV_SINGLE_ARG_DECL) const { - (ACE_const_cast(CORBA_NVList*,this))->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER); + (ACE_const_cast(CORBA_NVList*,this))->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->max_; diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index b342cb27858..6bf5aaffc58 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -136,7 +136,7 @@ void CORBA_ORB::InvalidName::_raise (void) } void CORBA_ORB::InvalidName::_tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (cdr << *this) return; @@ -144,7 +144,7 @@ void CORBA_ORB::InvalidName::_tao_encode (TAO_OutputCDR &cdr } void CORBA_ORB::InvalidName::_tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (cdr >> *this) return; @@ -187,18 +187,18 @@ CORBA_ORB::~CORBA_ORB (void) void CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->orb_core ()->shutdown (wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -CORBA_ORB::destroy (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) { if (this->orb_core () == 0) { @@ -221,7 +221,7 @@ CORBA_ORB::destroy (TAO_ENV_SINGLE_ARG_DECL) this->orb_core ()->orbid ())); } - this->orb_core ()->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Now invalidate the pointer to the ORB_Core that created this @@ -230,55 +230,55 @@ CORBA_ORB::destroy (TAO_ENV_SINGLE_ARG_DECL) } void -CORBA_ORB::run (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ORB::run (ACE_ENV_SINGLE_ARG_DECL) { - this->run (0 TAO_ENV_ARG_PARAMETER); + this->run (0 ACE_ENV_ARG_PARAMETER); } void -CORBA_ORB::run (ACE_Time_Value &tv TAO_ENV_ARG_DECL) +CORBA_ORB::run (ACE_Time_Value &tv ACE_ENV_ARG_DECL) { - this->run (&tv TAO_ENV_ARG_PARAMETER); + this->run (&tv ACE_ENV_ARG_PARAMETER); } void CORBA_ORB::run (ACE_Time_Value *tv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->orb_core ()->run (tv, 0 TAO_ENV_ARG_PARAMETER); + this->orb_core ()->run (tv, 0 ACE_ENV_ARG_PARAMETER); } void -CORBA_ORB::perform_work (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ORB::perform_work (ACE_ENV_SINGLE_ARG_DECL) { - this->perform_work (0 TAO_ENV_ARG_PARAMETER); + this->perform_work (0 ACE_ENV_ARG_PARAMETER); } void -CORBA_ORB::perform_work (ACE_Time_Value &tv TAO_ENV_ARG_DECL) +CORBA_ORB::perform_work (ACE_Time_Value &tv ACE_ENV_ARG_DECL) { - this->perform_work (&tv TAO_ENV_ARG_PARAMETER); + this->perform_work (&tv ACE_ENV_ARG_PARAMETER); } void CORBA_ORB::perform_work (ACE_Time_Value *tv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->orb_core ()->run (tv, 1 TAO_ENV_ARG_PARAMETER); + this->orb_core ()->run (tv, 1 ACE_ENV_ARG_PARAMETER); } CORBA::Boolean -CORBA_ORB::work_pending (ACE_Time_Value &tv TAO_ENV_ARG_DECL) +CORBA_ORB::work_pending (ACE_Time_Value &tv ACE_ENV_ARG_DECL) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int result = this->orb_core_->reactor ()->work_pending (tv); @@ -292,10 +292,10 @@ CORBA_ORB::work_pending (ACE_Time_Value &tv TAO_ENV_ARG_DECL) } CORBA::Boolean -CORBA_ORB::work_pending (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ORB::work_pending (ACE_ENV_SINGLE_ARG_DECL) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int result = this->orb_core_->reactor ()->work_pending (); @@ -313,7 +313,7 @@ CORBA_ORB::work_pending (TAO_ENV_SINGLE_ARG_DECL) void CORBA_ORB::create_list (CORBA::Long count, CORBA::NVList_ptr &new_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX); @@ -351,7 +351,7 @@ CORBA_ORB::create_list (CORBA::Long count, void CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Dynamic_Adapter *dynamic_adapter = ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance ( @@ -359,12 +359,12 @@ CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &list ); dynamic_adapter->create_exception_list (list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void CORBA_ORB::create_environment (CORBA::Environment_ptr &environment - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_NEW_THROW_EX (environment, CORBA::Environment (), @@ -377,7 +377,7 @@ CORBA_ORB::create_environment (CORBA::Environment_ptr &environment void CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &nv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_NEW_THROW_EX (nv, CORBA::NamedValue, @@ -395,7 +395,7 @@ CORBA::Boolean CORBA_ORB::get_service_information ( CORBA::ServiceType /* service_type */, CORBA::ServiceInformation_out /* service_information */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA_SystemException::_tao_minor_code ( @@ -407,7 +407,7 @@ CORBA_ORB::get_service_information ( void CORBA_ORB::create_context_list (CORBA::ContextList_ptr & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA_SystemException::_tao_minor_code ( @@ -418,7 +418,7 @@ CORBA_ORB::create_context_list (CORBA::ContextList_ptr & void CORBA_ORB::get_default_context (CORBA::Context_ptr & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA_SystemException::_tao_minor_code ( @@ -429,7 +429,7 @@ CORBA_ORB::get_default_context (CORBA::Context_ptr & void CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA_SystemException::_tao_minor_code ( @@ -440,7 +440,7 @@ CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq & void CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA_SystemException::_tao_minor_code ( @@ -451,7 +451,7 @@ CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq & void CORBA_ORB::get_next_response (CORBA_Request_ptr & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA_SystemException::_tao_minor_code ( @@ -461,7 +461,7 @@ CORBA_ORB::get_next_response (CORBA_Request_ptr & } CORBA::Boolean -CORBA_ORB::poll_next_response (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ORB::poll_next_response (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA_SystemException::_tao_minor_code ( @@ -478,7 +478,7 @@ CORBA_ORB::create_struct_tc ( const char *id, const char *name, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -496,7 +496,7 @@ CORBA_ORB::create_struct_tc ( return adapter->create_struct_tc (id, name, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -505,7 +505,7 @@ CORBA_ORB::create_union_tc ( const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -524,7 +524,7 @@ CORBA_ORB::create_union_tc ( name, discriminator_type, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -532,7 +532,7 @@ CORBA_ORB::create_enum_tc ( const char *id, const char *name, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -550,7 +550,7 @@ CORBA_ORB::create_enum_tc ( return adapter->create_enum_tc (id, name, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -558,7 +558,7 @@ CORBA_ORB::create_alias_tc ( const char *id, const char *name, CORBA::TypeCode_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -576,7 +576,7 @@ CORBA_ORB::create_alias_tc ( return adapter->create_alias_tc (id, name, original_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -584,7 +584,7 @@ CORBA_ORB::create_exception_tc ( const char *id, const char *name, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -602,14 +602,14 @@ CORBA_ORB::create_exception_tc ( return adapter->create_exception_tc (id, name, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -626,13 +626,13 @@ CORBA_ORB::create_interface_tc ( return adapter->create_interface_tc (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_string_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -648,13 +648,13 @@ CORBA_ORB::create_string_tc ( } return adapter->create_string_tc (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_wstring_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -670,14 +670,14 @@ CORBA_ORB::create_wstring_tc ( } return adapter->create_wstring_tc (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -694,14 +694,14 @@ CORBA_ORB::create_fixed_tc ( return adapter->create_fixed_tc (digits, scale - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -718,14 +718,14 @@ CORBA_ORB::create_sequence_tc ( return adapter->create_sequence_tc (bound, element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -742,7 +742,7 @@ CORBA_ORB::create_array_tc ( return adapter->create_array_tc (length, element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -752,7 +752,7 @@ CORBA_ORB::create_value_tc ( CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA_ValueMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -772,7 +772,7 @@ CORBA_ORB::create_value_tc ( type_modifier, concrete_base, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -780,7 +780,7 @@ CORBA_ORB::create_value_box_tc ( const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -798,14 +798,14 @@ CORBA_ORB::create_value_box_tc ( return adapter->create_value_box_tc (id, name, boxed_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_native_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -822,13 +822,13 @@ CORBA_ORB::create_native_tc ( return adapter->create_native_tc (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_recursive_tc ( const char *id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -844,14 +844,14 @@ CORBA_ORB::create_recursive_tc ( } return adapter->create_recursive_tc (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_abstract_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -868,14 +868,14 @@ CORBA_ORB::create_abstract_interface_tc ( return adapter->create_abstract_interface_tc (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_ORB::create_local_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -892,7 +892,7 @@ CORBA_ORB::create_local_interface_tc ( return adapter->create_local_interface_tc (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // **************************************************************** @@ -900,19 +900,19 @@ CORBA_ORB::create_local_interface_tc ( #endif /* TAO_HAS_MINIMUM_CORBA */ CORBA_Object_ptr -CORBA_ORB::resolve_root_poa (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ORB::resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL) { - return this->orb_core_->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->orb_core_->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Object_ptr -CORBA_ORB::resolve_poa_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA_ORB::resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->orb_core_->poa_current (); } CORBA_Object_ptr -CORBA_ORB::resolve_policy_manager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA_ORB::resolve_policy_manager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -933,7 +933,7 @@ CORBA_ORB::resolve_policy_manager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA_Object_ptr -CORBA_ORB::resolve_policy_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA_ORB::resolve_policy_current (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -950,7 +950,7 @@ CORBA_ORB::resolve_policy_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Object_ptr CORBA_ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *env_service_ior [] = { @@ -988,7 +988,7 @@ CORBA_ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id if (ACE_OS::strcmp (service_ior.c_str (), "") != 0) { return_value = - this->string_to_object (service_ior.c_str () TAO_ENV_ARG_PARAMETER); + this->string_to_object (service_ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Object::_nil ()); // Return ior. @@ -1054,45 +1054,45 @@ CORBA_ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id CORBA_Object_ptr CORBA_ORB::resolve_initial_references (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return this->resolve_initial_references (name, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_Object_ptr CORBA_ORB::resolve_initial_references (const char *name, ACE_Time_Value *timeout - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0) - return this->resolve_root_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->resolve_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0) - return this->resolve_poa_current (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->resolve_poa_current (ACE_ENV_SINGLE_ARG_PARAMETER); else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0) - return this->resolve_policy_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->resolve_policy_manager (ACE_ENV_SINGLE_ARG_PARAMETER); else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYCURRENT) == 0) - return this->resolve_policy_current (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->resolve_policy_current (ACE_ENV_SINGLE_ARG_PARAMETER); else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0) - return this->orb_core ()->resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->orb_core ()->resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_PARAMETER); else if (ACE_OS::strcmp (name, TAO_OBJID_IORTABLE) == 0) - return this->orb_core ()->resolve_ior_table (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->orb_core ()->resolve_ior_table (ACE_ENV_SINGLE_ARG_PARAMETER); else if (ACE_OS::strcmp (name, TAO_OBJID_DYNANYFACTORY) == 0) - return this->orb_core ()->resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->orb_core ()->resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_PARAMETER); else if (ACE_OS::strcmp (name, TAO_OBJID_TYPECODEFACTORY) == 0) - return this->orb_core ()->resolve_typecodefactory (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->orb_core ()->resolve_typecodefactory (ACE_ENV_SINGLE_ARG_PARAMETER); // ----------------------------------------------------------------- @@ -1102,7 +1102,7 @@ CORBA_ORB::resolve_initial_references (const char *name, CORBA::Object_var result = this->orb_core ()->object_ref_table ().resolve_initial_references ( name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (!CORBA::is_nil (result.in ())) @@ -1117,7 +1117,7 @@ CORBA_ORB::resolve_initial_references (const char *name, /// Is the service name in the IOR Table. if (this->orb_core_->init_ref_map ()->find (object_id, ior) == 0) return this->string_to_object (ior.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); /// May be trying the explicitly specified services and the well /// known services should be tried first before falling on to default @@ -1129,7 +1129,7 @@ CORBA_ORB::resolve_initial_references (const char *name, if (ACE_OS::strcmp (name, TAO_OBJID_NAMESERVICE) == 0) { result = this->resolve_service (NAMESERVICE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (!CORBA::is_nil (result.in ())) @@ -1138,7 +1138,7 @@ CORBA_ORB::resolve_initial_references (const char *name, else if (ACE_OS::strcmp (name, TAO_OBJID_TRADINGSERVICE) == 0) { result = this->resolve_service (TRADINGSERVICE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (!CORBA::is_nil (result.in ())) @@ -1147,7 +1147,7 @@ CORBA_ORB::resolve_initial_references (const char *name, else if (ACE_OS::strcmp (name, TAO_OBJID_IMPLREPOSERVICE) == 0) { result = this->resolve_service (IMPLREPOSERVICE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (!CORBA::is_nil (result.in ())) @@ -1156,7 +1156,7 @@ CORBA_ORB::resolve_initial_references (const char *name, else if (ACE_OS::strcmp (name, TAO_OBJID_INTERFACEREP) == 0) { result = this->resolve_service (INTERFACEREPOSERVICE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (!CORBA::is_nil (result.in ())) @@ -1166,7 +1166,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 TAO_ENV_ARG_PARAMETER); + result = this->orb_core ()->resolve_rir (name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (!CORBA::is_nil (result.in ())) @@ -1179,7 +1179,7 @@ CORBA_ORB::resolve_initial_references (const char *name, void CORBA_ORB::register_initial_reference (const char * id, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (id == 0) ACE_THROW (CORBA::ORB::InvalidName ()); @@ -1188,27 +1188,27 @@ CORBA_ORB::register_initial_reference (const char * id, TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table (); - table.register_initial_reference (id, obj TAO_ENV_ARG_PARAMETER); + table.register_initial_reference (id, obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA_ORB_ObjectIdList_ptr -CORBA_ORB::list_initial_services (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ORB::list_initial_services (ACE_ENV_SINGLE_ARG_DECL) { - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return - this->orb_core ()->list_initial_references (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_core ()->list_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER); } void -CORBA_ORB::check_shutdown (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) { if (this->orb_core () != 0) { - this->orb_core ()->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_core ()->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -1228,7 +1228,7 @@ CORBA_ORB::check_shutdown (TAO_ENV_SINGLE_ARG_DECL) // **************************************************************** void -CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL) +CORBA_ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) { // This method should be invoked atomically. It is the caller's // responsibility to ensure that this condition is satisfied. @@ -1247,7 +1247,7 @@ CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL) TAO_TypeCodes::init (); // initialize the system exceptions - TAO_Exceptions::init (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Verify some of the basic implementation requirements. This test @@ -1296,7 +1296,7 @@ CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL) tmp_cf_initializer; PortableInterceptor::register_orb_initializer (cf_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // ------------------------------------------------------------- @@ -1322,7 +1322,7 @@ CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL) orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -1344,7 +1344,7 @@ CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL) pi_initializer = temp_pi_initializer; PortableInterceptor::register_orb_initializer (pi_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ } @@ -1412,7 +1412,7 @@ CORBA::ORB_init (int &argc, if (TAO_Singleton_Manager::instance ()->init () == -1) return CORBA::ORB::_nil (); - CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); // Make sure the following is done after the global ORB @@ -1551,11 +1551,11 @@ CORBA::ORB_init (int &argc, // Call the ORBInitializer::pre_init() on each registered ORB // initializer. TAO_ORBInitializer_Registry::instance ()->pre_init (orb_init_info.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); // Initialize the ORB Core instance. - result = safe_oc->init (argc, argv TAO_ENV_ARG_PARAMETER); + result = safe_oc->init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); // Check for errors and return nil pseudo-reference on error. @@ -1570,7 +1570,7 @@ CORBA::ORB_init (int &argc, // Call the ORBInitializer::post_init() on each registered ORB // initializer. TAO_ORBInitializer_Registry::instance ()->post_init (orb_init_info.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); // Invalidate the ORBInitInfo instance to prevent future @@ -1599,10 +1599,10 @@ CORBA::ORB_init (int &argc, // Object reference stringification. char * CORBA_ORB::object_to_string (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!CORBA::is_nil (obj) && obj->_is_local ()) @@ -1730,7 +1730,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return profile->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); } } @@ -1739,10 +1739,10 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj CORBA::Object_ptr CORBA_ORB::string_to_object (const char *str - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method should not be called if the ORB has been shutdown. - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Check for NULL pointer @@ -1761,7 +1761,7 @@ CORBA_ORB::string_to_object (const char *str { return ior_parser->parse_string (str, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -1769,15 +1769,15 @@ CORBA_ORB::string_to_object (const char *str ior_prefix, sizeof ior_prefix - 1) == 0) return this->ior_string_to_object (str + sizeof ior_prefix - 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else - return this->url_ior_string_to_object (str TAO_ENV_ARG_PARAMETER); + return this->url_ior_string_to_object (str ACE_ENV_ARG_PARAMETER); } // **************************************************************** char * -CORBA_ORB::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA_ORB::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return CORBA::string_dup (this->orb_core_->orbid ()); } @@ -1787,9 +1787,9 @@ CORBA_ORB::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr CORBA_ORB::create_policy (CORBA::PolicyType type, const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); /// Attempt to obtain the policy from the policy factory registry. @@ -1797,7 +1797,7 @@ CORBA_ORB::create_policy (CORBA::PolicyType type, this->orb_core_->policy_factory_registry ()->create_policy ( type, val - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // Destringify OMG-specified "IOR" string. @@ -1807,7 +1807,7 @@ CORBA_ORB::create_policy (CORBA::PolicyType type, CORBA::Object_ptr CORBA_ORB::ior_string_to_object (const char *str - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Unhex the bytes, and make a CDR deencapsulation stream from the // resulting data. @@ -1866,7 +1866,7 @@ CORBA_ORB::ior_string_to_object (const char *str CORBA::Object_ptr CORBA_ORB::url_ior_string_to_object (const char* str - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_MProfile mprofile; // It is safe to declare this on the stack since the contents of @@ -1879,7 +1879,7 @@ CORBA_ORB::url_ior_string_to_object (const char* str this->orb_core_->connector_registry ()->make_mprofile ( str, mprofile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Return nil. @@ -1896,7 +1896,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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); TAO_Stub_Auto_Ptr safe_objdata (data); @@ -1991,7 +1991,7 @@ CORBA::ValueFactory_ptr CORBA_ORB::register_value_factory ( const char *repository_id, CORBA::ValueFactory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // %! guard, and ACE_Null_Mutex in the map // do _add_ref here not in map->rebind @@ -2020,7 +2020,7 @@ CORBA_ORB::register_value_factory ( void CORBA_ORB::unregister_value_factory (const char * /* repository_id */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_ERROR((LM_ERROR, ACE_TEXT ("(%N:%l) function not implemented\n"))); // %! TODO @@ -2028,7 +2028,7 @@ CORBA_ORB::unregister_value_factory (const char * /* repository_id */ CORBA::ValueFactory_ptr CORBA_ORB::lookup_value_factory (const char *repository_id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // %! guard // do _add_ref here not in map->find diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 9c28220c8cc..3e0e8f120d6 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -88,9 +88,9 @@ public: virtual void _raise (void); virtual void _tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED) const; + ACE_ENV_ARG_DECL_NOT_USED) const; virtual void _tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// = TAO extension static InvalidName* _downcast (CORBA_Exception *ex); @@ -118,7 +118,7 @@ public: static CORBA::ORB_ptr _nil (void); /// Return this ORB's ORBid. - char * id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + char * id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * Turn a string-ified object reference back into an object pointer. @@ -126,7 +126,7 @@ public: * but not necessarily locally. */ CORBA::Object_ptr string_to_object (const char *str - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Turn an object reference into a string. Each type of ORB, @@ -136,7 +136,7 @@ public: * argument. */ char * object_to_string (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #ifdef TAO_HAS_VALUETYPE @@ -144,12 +144,12 @@ public: CORBA::ValueFactory_ptr register_value_factory ( const char *repository_id, CORBA::ValueFactory_ptr factory - TAO_ENV_ARG_DECL_WITH_DEFAULTS ); + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); void unregister_value_factory (const char * repository_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS ); + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); CORBA::ValueFactory_ptr lookup_value_factory ( const char *repository_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS ); + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); #endif /* TAO_HAS_VALUETYPE */ #if (TAO_HAS_MINIMUM_CORBA == 0) @@ -163,40 +163,40 @@ public: void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void create_named_value (CORBA::NamedValue_ptr &nmval - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void create_exception_list (CORBA::ExceptionList_ptr &exclist - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void create_environment (CORBA::Environment_ptr &new_env - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void get_default_context (CORBA::Context_ptr &ctx - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean get_service_information (CORBA::ServiceType service_type, CORBA::ServiceInformation_out service_information - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &req - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &req - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void get_next_response (CORBA_Request_ptr &req - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); - CORBA::Boolean poll_next_response (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::Boolean poll_next_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The ORB TypeCode creation functions. @@ -204,7 +204,7 @@ public: const char *id, const char *name, const CORBA::StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -213,7 +213,7 @@ public: const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA::UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -221,7 +221,7 @@ public: const char *id, const char *name, const CORBA::EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -229,7 +229,7 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -237,47 +237,47 @@ public: const char *id, const char *name, const CORBA::StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -287,7 +287,7 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -295,27 +295,27 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_recursive_tc ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -323,7 +323,7 @@ public: CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, const char *ame - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -337,7 +337,7 @@ public: * If an error occurs during initialization or at run-time, a CORBA * system exception will be thrown. */ - void run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * Instructs the ORB to initialize itself and run its event loop in @@ -348,7 +348,7 @@ public: * spent in this call. **/ void run (ACE_Time_Value &tv - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Instructs the ORB to initialize itself and run its event loop in @@ -361,17 +361,17 @@ public: * and does not block. **/ void run (ACE_Time_Value *tv - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Returns an indication of whether the ORB needs to perform some /// work. - CORBA::Boolean work_pending (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::Boolean work_pending (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Returns an indication of whether the ORB needs to perform some work /// but will look for work pending for no more than the specified time. /// This is useful for implementing an event loop with an idle timeout. CORBA::Boolean work_pending (ACE_Time_Value &tv - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * This operation performs an implementation-defined unit of work. @@ -379,11 +379,11 @@ public: * not present; this behavior can be modified by passing an * appropriate <ACE_Time_Value> as described in run(). **/ - void perform_work (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void perform_work (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); void perform_work (ACE_Time_Value & - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void perform_work (ACE_Time_Value * - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * This operation instructs the ORB to shut down. Shutting down the @@ -394,7 +394,7 @@ public: * has completed. */ void shutdown (CORBA::Boolean wait_for_completion = 0 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Explicitly destroy the ORB, releasing any resources. Note that @@ -407,10 +407,10 @@ public: * The results of multi-threaded applications, trying to destroy () * 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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_Object_ptr resolve_initial_references (const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * This method acts as a mini-bootstrapping Naming Service, which is @@ -428,34 +428,34 @@ public: */ CORBA_Object_ptr resolve_initial_references (const char *name, ACE_Time_Value *timeout - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Register an object reference with the ORB. void register_initial_reference ( const char * id, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Returns a sequence of ObjectIds that lists which objects have /// references available via the initial references mechanism. CORBA_ORB_ObjectIdList_ptr list_initial_services ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // ---------------------------------------------------------------- // = TAO-specific extensions to the CORBA specification. // ---------------------------------------------------------------- /// Resolve the POA. - CORBA_Object_ptr resolve_root_poa (TAO_ENV_SINGLE_ARG_DECL); + CORBA_Object_ptr resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL); /// Initialize the ORB globals correctly, i.e., only when they /// haven't been initialized yet. - static void init_orb_globals (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + static void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // The function used by tao to handle the "unexpected" exceptions, // It raises CORBA::UNKNOWN. @@ -502,30 +502,30 @@ protected: ~CORBA_ORB (void); /// Resolve the POA current. - CORBA_Object_ptr resolve_poa_current (TAO_ENV_SINGLE_ARG_DECL); + CORBA_Object_ptr resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL); /// Resolve the Policy Manager for this ORB. - CORBA_Object_ptr resolve_policy_manager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + CORBA_Object_ptr resolve_policy_manager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// Resolve the Policy Current for this thread. - CORBA_Object_ptr resolve_policy_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + CORBA_Object_ptr resolve_policy_current (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// Resolve the given service based on the service ID. CORBA::Object_ptr resolve_service (TAO_MCAST_SERVICEID service_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Convert an OMG IOR into an object reference. CORBA::Object_ptr ior_string_to_object (const char* ior - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Convert an URL style IOR into an object reference. CORBA::Object_ptr url_ior_string_to_object (const char* ior - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Check if ORB has shutdown. If it has, throw an exception. - void check_shutdown (TAO_ENV_SINGLE_ARG_DECL); + void check_shutdown (ACE_ENV_SINGLE_ARG_DECL); /// Set the timeout value void set_timeout (ACE_Time_Value *timeout); @@ -556,7 +556,7 @@ private: // = NON-PROVIDED METHODS CORBA_ORB (const CORBA_ORB &); CORBA_ORB &operator= (const CORBA_ORB &); - + /// Timeout value ACE_Time_Value *timeout_; diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp index ef8173d34cc..b856adf641f 100644 --- a/TAO/tao/ORBInitInfo.cpp +++ b/TAO/tao/ORBInitInfo.cpp @@ -34,10 +34,10 @@ TAO_ORBInitInfo::~TAO_ORBInitInfo (void) } CORBA::StringSeq * -TAO_ORBInitInfo::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // In accordance with the C++ mapping for sequences, it is up to the @@ -65,10 +65,10 @@ TAO_ORBInitInfo::arguments (TAO_ENV_SINGLE_ARG_DECL) } char * -TAO_ORBInitInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // In accordance with the C++ mapping for strings, return a copy. @@ -77,7 +77,7 @@ TAO_ORBInitInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL) } IOP::CodecFactory_ptr -TAO_ORBInitInfo::codec_factory (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // The CodecFactory is stateless and reentrant, so share a single @@ -109,11 +109,11 @@ void TAO_ORBInitInfo::register_initial_reference ( const char * id, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (id == 0) @@ -124,18 +124,18 @@ TAO_ORBInitInfo::register_initial_reference ( TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table (); - table.register_initial_reference (id, obj TAO_ENV_ARG_PARAMETER); + table.register_initial_reference (id, obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Object_ptr TAO_ORBInitInfo::resolve_initial_references ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (id == 0) @@ -150,22 +150,22 @@ TAO_ORBInitInfo::resolve_initial_references ( // mechanism. return this->orb_core_->orb ()->resolve_initial_references (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ORBInitInfo::add_client_request_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)) { # if TAO_HAS_INTERCEPTORS == 1 - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->orb_core_->add_interceptor (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_UNUSED_ARG (interceptor); ACE_THROW (CORBA::NO_IMPLEMENT ( @@ -179,16 +179,16 @@ TAO_ORBInitInfo::add_client_request_interceptor ( void TAO_ORBInitInfo::add_server_request_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)) { # if TAO_HAS_INTERCEPTORS == 1 - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->orb_core_->add_interceptor (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_UNUSED_ARG (interceptor); @@ -203,22 +203,22 @@ TAO_ORBInitInfo::add_server_request_interceptor ( void TAO_ORBInitInfo::add_ior_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->orb_core_->add_interceptor (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } PortableInterceptor::SlotId -TAO_ORBInitInfo::allocate_slot_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); #if TAO_HAS_INTERCEPTORS == 1 @@ -237,10 +237,10 @@ void TAO_ORBInitInfo::register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_PolicyFactory_Registry *registry = @@ -248,15 +248,15 @@ TAO_ORBInitInfo::register_policy_factory ( registry->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } size_t TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); size_t slot_id = 0; @@ -276,7 +276,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup } void -TAO_ORBInitInfo::check_validity (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) { if (this->orb_core_ == 0) { @@ -293,15 +293,15 @@ TAO_ORBInitInfo::check_validity (TAO_ENV_SINGLE_ARG_DECL) TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_ORBInitInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TAO_ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -390,10 +390,10 @@ tao_TAO_ORBInitInfo_nil ( TAO_ORBInitInfo_ptr tao_TAO_ORBInitInfo_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -517,10 +517,10 @@ TAO_ORBInitInfo_var::nil (void) TAO_ORBInitInfo_ptr TAO_ORBInitInfo_var::narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h index 5081a25a667..31cddd57891 100644 --- a/TAO/tao/ORBInitInfo.h +++ b/TAO/tao/ORBInitInfo.h @@ -79,18 +79,18 @@ public: /// Return the argument vector for the ORB currently being /// initialized as a string sequence. virtual CORBA::StringSeq * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the ORBid for the ORB currently being initialized. virtual char * orb_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the CodecFactory for the ORB currently being /// initialized. virtual IOP::CodecFactory_ptr codec_factory ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Register a mapping between a string and a corresponding object @@ -106,7 +106,7 @@ public: virtual void register_initial_reference ( const char * id, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName)); @@ -115,7 +115,7 @@ public: /// since the ORB may not be fully initialized yet. virtual CORBA::Object_ptr resolve_initial_references ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName)); @@ -123,7 +123,7 @@ public: /// being initialized. virtual void add_client_request_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)); @@ -131,7 +131,7 @@ public: /// being initialized. virtual void add_server_request_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)); @@ -139,14 +139,14 @@ public: /// initialized. virtual void add_ior_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)); /// Reserve a slot in table found within the /// PortableInterceptor::Current object. virtual PortableInterceptor::SlotId allocate_slot_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Register a policy factory of the given policy type with the ORB @@ -154,7 +154,7 @@ public: virtual void register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -178,7 +178,7 @@ public: */ size_t allocate_tss_slot_id ( ACE_CLEANUP_FUNC cleanup - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a pointer to the ORB Core associated with the ORB being @@ -206,12 +206,12 @@ public: static TAO_ORBInitInfo_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_ORBInitInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_ORBInitInfo_ptr _nil (void) @@ -233,7 +233,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 (TAO_ENV_SINGLE_ARG_DECL); + void check_validity (ACE_ENV_SINGLE_ARG_DECL); private: @@ -293,7 +293,7 @@ public: static TAO_ORBInitInfo_ptr nil (void); static TAO_ORBInitInfo_ptr narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * upcast (void *); diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 8ffb366b552..bcaa3b1bfc2 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -17,7 +17,7 @@ ACE_RCSID(tao, ORBInitializer_Registry, "$Id$") void PortableInterceptor::register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Using ACE_Static_Object_Lock::instance() precludes // <register_orb_initializer> from being called within a static @@ -33,7 +33,7 @@ PortableInterceptor::register_orb_initializer ( ACE_TEXT ("Unable to pre-initialize TAO\n"))); } - CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Make sure the following is done after the global ORB @@ -41,7 +41,7 @@ PortableInterceptor::register_orb_initializer ( TAO_ORBInitializer_Registry::instance ()->register_orb_initializer ( init - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // ------------------------------------------------------------------ @@ -61,7 +61,7 @@ TAO_ORBInitializer_Registry::~TAO_ORBInitializer_Registry (void) void TAO_ORBInitializer_Registry::register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (init)) { @@ -89,13 +89,13 @@ TAO_ORBInitializer_Registry::register_orb_initializer ( void TAO_ORBInitializer_Registry::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t initializer_count = this->initializers_.size (); for (size_t i = 0; i < initializer_count; ++i) { this->initializers_[i]->pre_init (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -103,13 +103,13 @@ TAO_ORBInitializer_Registry::pre_init ( void TAO_ORBInitializer_Registry::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t initializer_count = this->initializers_.size (); for (size_t i = 0; i < initializer_count; ++i) { this->initializers_[i]->post_init (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h index fe424016056..8badb87e55e 100644 --- a/TAO/tao/ORBInitializer_Registry.h +++ b/TAO/tao/ORBInitializer_Registry.h @@ -36,7 +36,7 @@ class TAO_Export TAO_ORBInitializer_Registry friend class TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>; friend void PortableInterceptor::register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); friend CORBA::ORB_ptr CORBA::ORB_init (int &, char *argv[], const char *, @@ -55,17 +55,17 @@ protected: ///< array. void register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Begin initialization of all registered ORBInitializers before /// the ORB itself is initialized. void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Complete initialization of all registered ORBInitializers after /// the ORB has been initialized. void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return a unique singleton instance. static TAO_ORBInitializer_Registry *instance (void); diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index d4e9cb04490..5370f0b2929 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -255,7 +255,7 @@ TAO_ORB_Core::default_buffering_constraint (void) const int -TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL) +TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) { // 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 @@ -391,7 +391,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL) // All preconnect or endpoint strings should be of the above form(s). set_endpoint_helper (current_arg - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); arg_shifter.consume_arg (); } else if ((current_arg = arg_shifter.get_the_parameter @@ -781,7 +781,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL) // used. set_endpoint_helper (current_arg - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); arg_shifter.consume_arg (); } else if ((current_arg = arg_shifter.get_the_parameter @@ -1018,10 +1018,10 @@ TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL) // Set ORB-level policy defaults. TAO_Protocols_Hooks *tph = - this->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - int status = tph->set_default_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + int status = tph->set_default_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (status != 0) @@ -1050,7 +1050,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL) // Look for BiDirectional library here. If the user has svc.conf // file, load the library at this point. - int ret = this->bidirectional_giop_init (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->bidirectional_giop_init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) @@ -1074,7 +1074,7 @@ TAO_ORB_Core::fini (void) { // Shutdown the ORB and block until the shutdown is complete. this->shutdown (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1301,7 +1301,7 @@ TAO_ORB_Core::set_protocols_hooks (const char *protocols_hooks) } TAO_Protocols_Hooks * -TAO_ORB_Core::get_protocols_hooks (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::get_protocols_hooks (ACE_ENV_SINGLE_ARG_DECL) { // Check if there is a cached reference. if (this->protocols_hooks_ != 0) @@ -1314,13 +1314,13 @@ TAO_ORB_Core::get_protocols_hooks (TAO_ENV_SINGLE_ARG_DECL) // Initialize the protocols hooks instance. this->protocols_hooks_->init_hooks (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return this->protocols_hooks_; } int -TAO_ORB_Core::bidirectional_giop_init (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::bidirectional_giop_init (ACE_ENV_SINGLE_ARG_DECL) { if (this->bidir_adapter_ == 0) { @@ -1332,7 +1332,7 @@ TAO_ORB_Core::bidirectional_giop_init (TAO_ENV_SINGLE_ARG_DECL) return this->bidir_adapter_->activate (this->orb_.in (), 0, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else return 0; } @@ -1351,14 +1351,14 @@ TAO_ORB_Core::services_callbacks_init (void) int TAO_ORB_Core::service_raise_comm_failure (TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->ft_service_.service_callback ()) { return this->ft_service_.service_callback ()-> raise_comm_failure (invoke, profile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } invoke->close_connection (); @@ -1374,14 +1374,14 @@ TAO_ORB_Core::service_raise_comm_failure (TAO_GIOP_Invocation *invoke, int TAO_ORB_Core::service_raise_transient_failure (TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->ft_service_.service_callback ()) { return this->ft_service_.service_callback ()-> raise_transient_failure (invoke, profile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_THROW_RETURN (CORBA::TRANSIENT ( @@ -1398,7 +1398,7 @@ TAO_ORB_Core::service_context_list ( TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean restart - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ We look at the services if they are loaded. But if more // services offer this feature we may want to keep expanding the @@ -1409,14 +1409,14 @@ TAO_ORB_Core::service_context_list ( this->ft_service_.service_callback ()->service_context_list (stub, service_context.service_info (), restart - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } this->protocols_hooks_->rt_service_context (stub, service_context, restart - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1466,7 +1466,7 @@ TAO_ORB_Core::inherit_from_parent_thread ( } CORBA::Object_ptr -TAO_ORB_Core::root_poa (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->root_poa_.in ())) return CORBA::Object::_duplicate (this->root_poa_.in ()); @@ -1489,12 +1489,12 @@ TAO_ORB_Core::root_poa (TAO_ENV_SINGLE_ARG_DECL) // @@ Not exception safe TAO_Adapter *poa_adapter = factory->create (this); - poa_adapter->open (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); this->root_poa_ = poa_adapter->root (); - this->adapter_registry_.insert (poa_adapter TAO_ENV_ARG_PARAMETER); + this->adapter_registry_.insert (poa_adapter ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return CORBA::Object::_duplicate (this->root_poa_.in ()); @@ -1518,13 +1518,13 @@ TAO_ORB_Core::poa_adapter (void) TAO_Stub * TAO_ORB_Core::create_stub (const char *repository_id, const TAO_MProfile &profiles - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Stub *retval = this->stub_factory ()->create_stub (repository_id, profiles, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN(0); return retval; } @@ -1542,11 +1542,11 @@ TAO_Stub * TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile, const char *type_id, CORBA::PolicyList *policy_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { /// Initialize a TAO_Stub object with the mprofile thats passed. TAO_Stub *stub = - this->create_stub (type_id, mprofile TAO_ENV_ARG_PARAMETER); + this->create_stub (type_id, mprofile ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (stub); stub->base_profiles ().policy_list (policy_list); @@ -1660,7 +1660,7 @@ TAO_ORB_Core::lf_strategy (void) int TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level >= 3) ACE_DEBUG ((LM_DEBUG, @@ -1668,7 +1668,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, // This method should only be called by servers, so now we set up // for listening! - int ret = this->open (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->open (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) @@ -1765,16 +1765,16 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, void TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->has_shutdown () == 0) { this->adapter_registry_.check_close (wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->adapter_registry_.close (wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Set the shutdown flag @@ -1794,7 +1794,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion tm->wait (); // Invoke Interceptor::destroy() on all registered interceptors. - this->destroy_interceptors (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Explicitly destroy the object reference table since it @@ -1805,7 +1805,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion } void -TAO_ORB_Core::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL) { // // All destroy() should do is (a) call shutdown() and (b) unbind() @@ -1822,7 +1822,7 @@ TAO_ORB_Core::destroy (TAO_ENV_SINGLE_ARG_DECL) // // Shutdown the ORB and block until the shutdown is complete. - this->shutdown (1 TAO_ENV_ARG_PARAMETER); + this->shutdown (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now remove it from the ORB table so that it's ORBid may be @@ -1835,7 +1835,7 @@ TAO_ORB_Core::destroy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_ORB_Core::destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) { size_t len = 0; @@ -1846,7 +1846,7 @@ TAO_ORB_Core::destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL) len = client_interceptors.size (); for (size_t i = 0; i < len; ++i) { - client_interceptors[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + client_interceptors[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -1856,7 +1856,7 @@ TAO_ORB_Core::destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL) len = server_interceptors.size (); for (size_t j = 0; j < len; ++j) { - server_interceptors[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + server_interceptors[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -1867,14 +1867,14 @@ TAO_ORB_Core::destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL) len = ior_interceptors.size (); for (size_t k = 0; k < len; ++k) { - ior_interceptors[k]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ior_interceptors[k]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } // Set up listening endpoints. int -TAO_ORB_Core::open (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::open (ACE_ENV_SINGLE_ARG_DECL) { // Double check pattern if (this->open_called_ == 1) @@ -1888,7 +1888,7 @@ TAO_ORB_Core::open (TAO_ENV_SINGLE_ARG_DECL) /// Open the Acceptor Registry. int ret= this->lane_resources ().open_acceptor_registry (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) @@ -1906,7 +1906,7 @@ TAO_ORB_Core::lane_resources (void) } void -TAO_ORB_Core::resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance ("TypeCodeFactory_Loader"); @@ -1920,11 +1920,11 @@ TAO_ORB_Core::resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::ORB::InvalidName ()); } this->typecode_factory_ = - loader->create_object (this->orb_.in (), 0, 0 TAO_ENV_ARG_PARAMETER); + loader->create_object (this->orb_.in (), 0, 0 ACE_ENV_ARG_PARAMETER); } void -TAO_ORB_Core::resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance ("DynamicAny_Loader"); @@ -1938,11 +1938,11 @@ TAO_ORB_Core::resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::ORB::InvalidName ()); } this->dynany_factory_ = - loader->create_object (this->orb_.in (), 0, 0 TAO_ENV_ARG_PARAMETER); + loader->create_object (this->orb_.in (), 0, 0 ACE_ENV_ARG_PARAMETER); } void -TAO_ORB_Core::resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL) { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance ("IORManip_Loader"); @@ -1957,11 +1957,11 @@ TAO_ORB_Core::resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::ORB::InvalidName ()); } this->ior_manip_factory_ = - loader->create_object (this->orb_.in (), 0, 0 TAO_ENV_ARG_PARAMETER); + loader->create_object (this->orb_.in (), 0, 0 ACE_ENV_ARG_PARAMETER); } void -TAO_ORB_Core::resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL) { TAO_Adapter_Factory *factory = ACE_Dynamic_Service<TAO_Adapter_Factory>::instance ("TAO_IORTable"); @@ -1977,10 +1977,10 @@ TAO_ORB_Core::resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL) // @@ Not exception safe TAO_Adapter *iortable_adapter = factory->create (this); - this->adapter_registry_.insert (iortable_adapter TAO_ENV_ARG_PARAMETER); + this->adapter_registry_.insert (iortable_adapter ACE_ENV_ARG_PARAMETER); ACE_CHECK; - iortable_adapter->open (TAO_ENV_SINGLE_ARG_PARAMETER); + iortable_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->ior_table_ = iortable_adapter->root (); @@ -1988,7 +1988,7 @@ TAO_ORB_Core::resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL) int TAO_ORB_Core::set_endpoint_helper (const char *current_arg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_CString endpts (current_arg); @@ -2011,7 +2011,7 @@ TAO_ORB_Core::set_endpoint_helper (const char *current_arg CORBA::Object_ptr TAO_ORB_Core::resolve_rir (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the table of initial references specified through // -ORBInitRef. @@ -2061,14 +2061,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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return CORBA::Object::_nil (); } CORBA::ORB::ObjectIdList_ptr -TAO_ORB_Core::list_initial_references (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL) { // Unsupported initial services should NOT be included in the below list! const char *initial_services[] = { TAO_LIST_OF_INITIAL_SERVICES }; @@ -2495,7 +2495,7 @@ TAO_ORB_Core::implrepo_service (void) ACE_TRY_NEW_ENV { - CORBA::Object_var temp = this->orb_->resolve_initial_references ("ImplRepoService" TAO_ENV_ARG_PARAMETER); + CORBA::Object_var temp = this->orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::Object::_nil ()); @@ -2774,10 +2774,10 @@ TAO_ORB_Core_instance (void) CORBA::ORB_var orb; int argc = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2794,7 +2794,7 @@ TAO_ORB_Core_instance (void) int TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Stub *stub = object->_stubobj (); @@ -2806,7 +2806,7 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object int collocated = orb_core->collocation_resolver ().is_collocated (object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (collocated) diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 1021afbeb50..e346e997e99 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -250,7 +250,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 (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr root_poa (ACE_ENV_SINGLE_ARG_DECL); /// Get the adapter registry TAO_Adapter_Registry *adapter_registry (void); @@ -278,7 +278,7 @@ public: * No-Collocation is a special case of collocation. */ static int collocation_strategy (CORBA::Object_ptr object - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@} /** @@ -408,7 +408,7 @@ public: const char *poa_factory_directive); /// Gets the value of TAO_ORB_Core::protocols_hooks__ - TAO_Protocols_Hooks * get_protocols_hooks (TAO_ENV_SINGLE_ARG_DECL); + TAO_Protocols_Hooks * get_protocols_hooks (ACE_ENV_SINGLE_ARG_DECL); /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_. static void dynamic_adapter_name (const char *name); @@ -630,20 +630,20 @@ public: /// Run the event loop. int run (ACE_Time_Value *tv, int perform_work - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// End the event loop void shutdown (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Get the shutdown flag value int has_shutdown (void); /// Shutdown the ORB and free resources - void destroy (TAO_ENV_SINGLE_ARG_DECL); + void destroy (ACE_ENV_SINGLE_ARG_DECL); /// Check if ORB has shutdown. If it has, throw an exception. - void check_shutdown (TAO_ENV_SINGLE_ARG_DECL); + void check_shutdown (ACE_ENV_SINGLE_ARG_DECL); /// Returns the <timeout> value used by the server threads to poll /// the shutdown flag. If the return value is zero then the server @@ -655,7 +655,7 @@ public: TAO_Stub *create_stub_object (TAO_MProfile &mprofile, const char *type_id, CORBA::PolicyList *policy_list - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Factory method that create the "right" Stub depending on /// wheather RTCORBA is loaded or not. The factory used to create @@ -663,7 +663,7 @@ public: /// on the fact that RTCORBA is being used or not. TAO_Stub *create_stub (const char *repository_id, const TAO_MProfile &profiles - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Create a new object, use the adapter registry to create a /// collocated object, if not possible then create a regular @@ -680,37 +680,37 @@ public: //@} /// Resolve the TypeCodeFactory DLL. - CORBA::Object_ptr resolve_typecodefactory (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL); /// Resolve the Dynamic Any Factory - CORBA::Object_ptr resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL); /// Resolve the IOR Manipulation reference for this ORB. - CORBA::Object_ptr resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + CORBA::Object_ptr resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// Resolve the IOR Table reference for this ORB. - CORBA::Object_ptr resolve_ior_table (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + CORBA::Object_ptr resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// Resolve an initial reference via the -ORBInitRef and // -ORBDefaultInitRef options. CORBA::Object_ptr resolve_rir (const char *name - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Resolve the RT ORB reference for this ORB. - CORBA::Object_ptr resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_rt_orb (ACE_ENV_SINGLE_ARG_DECL); /// Resolve the RT Current flyweight for this ORB. /// Return server_id string. const char *server_id (void) const; - CORBA::Object_ptr resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_rt_current (ACE_ENV_SINGLE_ARG_DECL); /// Set/Get the current PortableGroup POA hooks. TAO_POA_PortableGroup_Hooks *portable_group_poa_hooks (void) const; void portable_group_poa_hooks(TAO_POA_PortableGroup_Hooks *poa_hooks); /// List all the service known by the ORB - CORBA_ORB_ObjectIdList_ptr list_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + CORBA_ORB_ObjectIdList_ptr list_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// Reference counting... CORBA::ULong _incr_refcnt (void); @@ -769,7 +769,7 @@ public: void service_context_list (TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean retstart - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return a reference to the Fault Tolerant service object. TAO_Fault_Tolerance_Service &fault_tolerance_service (void); @@ -779,14 +779,14 @@ public: /// this case. int service_raise_comm_failure (TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL); + 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 /// for this case. int service_raise_transient_failure (TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Hook for logging of messages by the Logging & Recovery service /// of an FT service. @@ -821,12 +821,12 @@ public: /// Register a client request interceptor. void add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Register a server request interceptor. void add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return the array of client-side interceptors specific to this /// ORB. @@ -843,7 +843,7 @@ public: /// Register an IOR interceptor. void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return the array of IOR interceptors specific to this ORB. TAO_IORInterceptor_List::TYPE & ior_interceptors (void); @@ -852,7 +852,7 @@ public: /// Set up the ORB Core's acceptor to listen on the /// previously-specified port for requests. Returns -1 on failure, /// otherwise 0. - int open (TAO_ENV_SINGLE_ARG_DECL); + int open (ACE_ENV_SINGLE_ARG_DECL); /// Return the underlying transport cache TAO_Transport_Cache_Manager *transport_cache (void); @@ -902,7 +902,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 TAO_ENV_ARG_DECL); + int init (int &argc, char **argv ACE_ENV_ARG_DECL); /// Final termination hook, typically called by CORBA::ORB's /// destructor. @@ -923,17 +923,17 @@ protected: ACE_Lock *lock); /// Obtain and cache the dynamic any factory object reference. - void resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_DECL); + void resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL); /// Obtain and cache the dynamic any factory object reference. - void resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_DECL); + void resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL); /// Obtain and cache the IORManipulation factory object reference. - void resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_DECL); + void resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL); /// Search the Dynamic service list for BiDirectional options that /// can be dynamically loaded. - int bidirectional_giop_init (TAO_ENV_SINGLE_ARG_DECL); + int bidirectional_giop_init (ACE_ENV_SINGLE_ARG_DECL); /// Search the Dynamic service list for well known services that has /// callbacks which can be dynamically loaded. @@ -941,13 +941,13 @@ protected: /// Helper method that invokes Interceptor::destroy() on all /// registered interceptors when ORB::destroy() is called. - void destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL); + void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); /// 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 char *current_arg - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: @@ -958,7 +958,7 @@ private: //@} /// Obtain and cache the dynamic any factory object reference. - void resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL); + void resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL); /// Try to create a new collocated object, using <other_orb> as the /// target ORB. If not possible return 0. diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 3bc0cb09cd5..0dde8aad846 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -357,7 +357,7 @@ TAO_ORB_Core::has_shutdown (void) } ACE_INLINE void -TAO_ORB_Core::check_shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) { if (this->has_shutdown ()) { @@ -391,13 +391,13 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_typecodefactory (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->typecode_factory_)) { - this->resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } return CORBA::Object::_duplicate (this->typecode_factory_); @@ -422,39 +422,39 @@ TAO_ORB_Core::portable_group_poa_hooks(TAO_POA_PortableGroup_Hooks *poa_hooks) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->dynany_factory_)) { - this->resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } return CORBA::Object::_duplicate (this->dynany_factory_); } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->ior_manip_factory_)) { - this->resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } return CORBA::Object::_duplicate (this->ior_manip_factory_); } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_ior_table (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->ior_table_)) { - this->resolve_ior_table_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->resolve_ior_table_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } return CORBA::Object::_duplicate (this->ior_table_); @@ -505,7 +505,7 @@ TAO_ORB_Core::poa_current (void) { // @@ This is a hack. FIXME! // This forces the POACurrent to be initialized. - CORBA::Object_var root = this->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var root = this->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -549,7 +549,7 @@ TAO_ORB_Core::default_environment (CORBA_Environment *env) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_rt_orb (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->rt_orb_.in ())) { @@ -561,7 +561,7 @@ TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL) this->rt_orb_ = this->object_ref_table ().resolve_initial_references ( TAO_OBJID_RTORB - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } } @@ -570,7 +570,7 @@ TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Core::resolve_rt_current (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->rt_current_.in ())) { @@ -582,7 +582,7 @@ TAO_ORB_Core::resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL) this->rt_current_ = this->object_ref_table ().resolve_initial_references ( TAO_OBJID_RTCURRENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } } @@ -611,19 +611,19 @@ TAO_ORB_Core::pi_current (TAO_PICurrent *current) ACE_INLINE void TAO_ORB_Core::add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->client_request_interceptors_.add_interceptor (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_ORB_Core::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->server_request_interceptors_.add_interceptor (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // ------ @@ -650,10 +650,10 @@ TAO_ORB_Core::server_request_interceptors (void) ACE_INLINE void TAO_ORB_Core::add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->ior_interceptors_.add_interceptor (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE TAO_IORInterceptor_List::TYPE & diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 0c0db0bd8da..611f44e72d6 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -85,7 +85,7 @@ CORBA_Object::_servant (void) const CORBA::Boolean CORBA_Object::_is_a (const char *type_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // NOTE: if istub->type_id is nonzero and we have local knowledge of // it, we can answer this question without a costly remote call. @@ -115,11 +115,11 @@ CORBA_Object::_is_a (const char *type_id // Get the right Proxy Implementation. TAO_Object_Proxy_Impl &the_proxy = - this->proxy_broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->proxy_broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Preform the Call. - _tao_retval = the_proxy._is_a (this, type_id TAO_ENV_ARG_PARAMETER); + _tao_retval = the_proxy._is_a (this, type_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return _tao_retval; @@ -148,10 +148,10 @@ CORBA_Object::_is_local (void) const CORBA::ULong CORBA_Object::_hash (CORBA::ULong maximum - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->protocol_proxy_ != 0) - return this->protocol_proxy_->hash (maximum TAO_ENV_ARG_PARAMETER); + return this->protocol_proxy_->hash (maximum ACE_ENV_ARG_PARAMETER); else // @@ I really don't know how to support this for // a locality constrained object. -- nw. @@ -166,7 +166,7 @@ CORBA_Object::_hash (CORBA::ULong maximum CORBA::Boolean CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (()) { if (other_obj == this) @@ -183,7 +183,7 @@ CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj // TAO's extensions TAO_ObjectKey * -CORBA::Object::_key (TAO_ENV_SINGLE_ARG_DECL) +CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL) { if (this->_stubobj () && this->_stubobj ()->profile_in_use ()) return this->_stubobj ()->profile_in_use ()->_key (); @@ -255,7 +255,7 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx, CORBA::NamedValue_ptr result, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Since we don't really support Context, anything but a null pointer // is a no-no. @@ -280,7 +280,7 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx, 0, request, req_flags - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -293,7 +293,7 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx, CORBA::ContextList_ptr, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Since we don't really support Context, anything but a null pointer // is a no-no. @@ -318,13 +318,13 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx, exceptions, request, req_flags - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Request_ptr CORBA_Object::_request (const char *operation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->protocol_proxy_) { @@ -337,7 +337,7 @@ CORBA_Object::_request (const char *operation this, this->protocol_proxy_->orb_core ()->orb (), operation - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -352,17 +352,17 @@ CORBA_Object::_request (const char *operation // the latter case, return FALSE. CORBA::Boolean -CORBA_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL) +CORBA_Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean _tao_retval = 0; // Get the right Proxy. TAO_Object_Proxy_Impl &the_proxy = - this->proxy_broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->proxy_broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Perform the Call. - _tao_retval = the_proxy._non_existent (this TAO_ENV_ARG_PARAMETER); + _tao_retval = the_proxy._non_existent (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return _tao_retval; @@ -370,19 +370,19 @@ CORBA_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL) CORBA_InterfaceDef_ptr -CORBA_Object::_get_interface (TAO_ENV_SINGLE_ARG_DECL) +CORBA_Object::_get_interface (ACE_ENV_SINGLE_ARG_DECL) { // Get the right Proxy. TAO_Object_Proxy_Impl &the_proxy = - this->proxy_broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->proxy_broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Perform the Call. - return the_proxy._get_interface (this TAO_ENV_ARG_PARAMETER); + return the_proxy._get_interface (this ACE_ENV_ARG_PARAMETER); } CORBA::ImplementationDef_ptr -CORBA_Object::_get_implementation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA_Object::_get_implementation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } @@ -400,10 +400,10 @@ CORBA_Object::_get_implementation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr CORBA_Object::_get_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->protocol_proxy_) - return this->protocol_proxy_->get_policy (type TAO_ENV_ARG_PARAMETER); + return this->protocol_proxy_->get_policy (type ACE_ENV_ARG_PARAMETER); else ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ()); } @@ -411,10 +411,10 @@ CORBA_Object::_get_policy ( CORBA::Policy_ptr CORBA_Object::_get_client_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->protocol_proxy_) - return this->_stubobj ()->get_client_policy (type TAO_ENV_ARG_PARAMETER); + return this->_stubobj ()->get_client_policy (type ACE_ENV_ARG_PARAMETER); else ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ()); } @@ -423,7 +423,7 @@ CORBA::Object_ptr CORBA_Object::_set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!this->protocol_proxy_) ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ()); @@ -431,7 +431,7 @@ CORBA_Object::_set_policy_overrides ( TAO_Stub* stub = this->protocol_proxy_->set_policy_overrides (policies, set_add - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -455,34 +455,34 @@ CORBA_Object::_set_policy_overrides ( CORBA::PolicyList * CORBA_Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->protocol_proxy_) - return this->protocol_proxy_->get_policy_overrides (types TAO_ENV_ARG_PARAMETER); + return this->protocol_proxy_->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); else ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CORBA::Boolean CORBA_Object::_validate_connection (CORBA::PolicyList_out inconsistent_policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { inconsistent_policies = 0; #if (TAO_HAS_MINIMUM_CORBA == 1) - TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #else // If the object is collocated then use non_existent to see whether // it's there. if (this->is_collocated_) - return !(this->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER)); + return !(this->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER)); if (this->protocol_proxy_) return this->protocol_proxy_->validate_connection (inconsistent_policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -592,12 +592,12 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x) TAO_Stub *objdata = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { objdata = orb_core->create_stub (type_hint.in (), mp - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index c1c99e1d7b1..e17ee867a90 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -52,9 +52,9 @@ public: /// No-op it is just here to simplify some templates. ACE_INLINE_FOR_GNUC static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Object_ptr _unchecked_narrow (CORBA_Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Used in the implementation of CORBA::Any static void _tao_any_destructor (void*); @@ -70,7 +70,7 @@ public: /// determine if we are of the type specified by the "logical_type_id" virtual CORBA::Boolean _is_a (const char *logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// The repository ID for the most derived class, this is an /// implementation method and does no remote invocations! @@ -86,17 +86,17 @@ public: #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// This method is deprecated in the CORBA 2.2 spec, we just return 0 /// every time. virtual CORBA::ImplementationDef_ptr _get_implementation ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Get info about the object from the Interface Repository. virtual CORBA_InterfaceDef_ptr _get_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // DII operations to create a request. @@ -111,7 +111,7 @@ public: CORBA::NamedValue_ptr result, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void _create_request (CORBA::Context_ptr ctx, const char *operation, @@ -121,7 +121,7 @@ public: CORBA::ContextList_ptr ctxtlist, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // The default implementation of this method uses the same simple, // multi-protocol remote invocation interface as is assumed by the @@ -129,7 +129,7 @@ public: /// DII operation to create a request. virtual CORBA::Request_ptr _request (const char *operation - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -137,24 +137,24 @@ public: CORBA::Policy_ptr _get_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Policy_ptr _get_client_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Object_ptr _set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::PolicyList * _get_policy_overrides ( const CORBA::PolicyTypeSeq & types - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean _validate_connection ( CORBA::PolicyList_out inconsistent_policies - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -167,7 +167,7 @@ public: * implementation. */ virtual CORBA::ULong _hash (CORBA::ULong maximum - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Try to determine if this object is the same as <other_obj>. This @@ -176,12 +176,12 @@ public: * protocols are in use) there is no default implementation. */ virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (()); /// Return the object key as an out parameter. Caller should release /// return value when finished with it. - virtual TAO_ObjectKey *_key (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL); /** * Return a reference to the object key of profile in-use. @@ -296,7 +296,7 @@ public: static CORBA::Object_ptr tao_duplicate (CORBA::Object_ptr); static void tao_release (CORBA::Object_ptr); static CORBA::Object_ptr tao_nil (void); - static CORBA::Object_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CORBA::Object_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index 3e5d8b7b77b..16661b8d8c8 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -75,7 +75,7 @@ CORBA_Object::_nil (void) } ACE_INLINE CORBA_Object_ptr -CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL_NOT_USED) +CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return CORBA::Object::_nil (); @@ -91,9 +91,9 @@ CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL_NOT_USED) } ACE_INLINE CORBA_Object_ptr -CORBA_Object::_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL) +CORBA_Object::_narrow (CORBA_Object_ptr obj ACE_ENV_ARG_DECL) { - return CORBA_Object::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_Object::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } ACE_INLINE TAO_Stub * @@ -221,7 +221,7 @@ CORBA_Object_var::tao_nil (void) ACE_INLINE CORBA_Object_ptr CORBA_Object_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return CORBA_Object::_duplicate (p); diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp index c1eb1715d19..83732dce984 100644 --- a/TAO/tao/ObjectIDList.cpp +++ b/TAO/tao/ObjectIDList.cpp @@ -152,7 +152,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList * ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equal (CORBA::ORB::_tc_ObjectIdList TAO_ENV_ARG_PARAMETER)) return 0; // not equal + if (!type->equal (CORBA::ORB::_tc_ObjectIdList ACE_ENV_ARG_PARAMETER)) return 0; // not equal ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp index a9bbdd9e4d0..ff7ab25da80 100644 --- a/TAO/tao/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjectReferenceTemplateC.cpp @@ -981,7 +981,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplateSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplateSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h index 9b8c3ad6e60..6400de87624 100644 --- a/TAO/tao/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjectReferenceTemplateC.h @@ -173,7 +173,7 @@ TAO_NAMESPACE PortableInterceptor static const char* _tao_obv_static_repository_id (); virtual CORBA::Object_ptr make_object ( - const char *, const PortableInterceptor::ObjectId & TAO_ENV_ARG_DECL_WITH_DEFAULTS + const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; @@ -287,13 +287,13 @@ TAO_NAMESPACE PortableInterceptor virtual const char* _tao_obv_repository_id () const; static const char* _tao_obv_static_repository_id (); - virtual char * server_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - virtual char * orb_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - virtual ::PortableInterceptor::AdapterName * adapter_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + virtual ::PortableInterceptor::AdapterName * adapter_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index 5f2625b854f..3b26175c4be 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -47,7 +47,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv [] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h index f6e116cffbd..27c0420a9d9 100644 --- a/TAO/tao/Object_Proxy_Broker.h +++ b/TAO/tao/Object_Proxy_Broker.h @@ -35,7 +35,7 @@ public: virtual ~TAO_Object_Proxy_Broker (void); virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; protected: TAO_Object_Proxy_Broker (void); diff --git a/TAO/tao/Object_Proxy_Impl.h b/TAO/tao/Object_Proxy_Impl.h index 2770d12355d..e68da1f582e 100644 --- a/TAO/tao/Object_Proxy_Impl.h +++ b/TAO/tao/Object_Proxy_Impl.h @@ -37,16 +37,16 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; #if (TAO_HAS_MINIMUM_CORBA == 0) virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual CORBA_InterfaceDef_ptr _get_interface ( const CORBA::Object_ptr target - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) = 0; #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index 1eba31d8864..00a130ed689 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -33,7 +33,7 @@ void TAO_Object_Ref_Table::register_initial_reference ( const char *id, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (id == 0) ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 27, @@ -76,7 +76,7 @@ TAO_Object_Ref_Table::register_initial_reference ( CORBA::Object_ptr TAO_Object_Ref_Table::resolve_initial_references ( const char *id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return this->find (id); // Returns a duplicate. } diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index 4dbcc29560b..475a78b8ba3 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -62,13 +62,13 @@ public: /// ID to it. void register_initial_reference (const char * id, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return the object reference associated with the given ID. /// A duplicate is returned. CORBA::Object_ptr resolve_initial_references ( const char * id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Explicitly destroy the contents of the object reference table. void destroy (void); diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index cc2c749821f..1e4ff14dd8b 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -145,7 +145,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_ { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (CORBA::_tc_OctetSeq TAO_ENV_ARG_PARAMETER); + type->equivalent (CORBA::_tc_OctetSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp index a431ce73a75..4c2e6056e73 100644 --- a/TAO/tao/PICurrent.cpp +++ b/TAO/tao/PICurrent.cpp @@ -32,11 +32,11 @@ TAO_PICurrent::~TAO_PICurrent (void) CORBA::Any * TAO_PICurrent::get_slot (PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { - this->check_validity (id TAO_ENV_ARG_PARAMETER); + this->check_validity (id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_PICurrent_Impl *impl = this->tsc (); @@ -48,17 +48,17 @@ TAO_PICurrent::get_slot (PortableInterceptor::SlotId id 0); } - return impl->get_slot (id TAO_ENV_ARG_PARAMETER); + return impl->get_slot (id ACE_ENV_ARG_PARAMETER); } void TAO_PICurrent::set_slot (PortableInterceptor::SlotId id, const CORBA::Any & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { - this->check_validity (id TAO_ENV_ARG_PARAMETER); + this->check_validity (id ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_PICurrent_Impl *impl = this->tsc (); @@ -69,7 +69,7 @@ TAO_PICurrent::set_slot (PortableInterceptor::SlotId id, CORBA::COMPLETED_NO)); } - impl->set_slot (id, data TAO_ENV_ARG_PARAMETER); + impl->set_slot (id, data ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -109,7 +109,7 @@ TAO_PICurrent_Impl::~TAO_PICurrent_Impl (void) CORBA::Any * TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -155,7 +155,7 @@ TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id void TAO_PICurrent_Impl::set_slot (PortableInterceptor::SlotId id, const CORBA::Any & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -241,13 +241,13 @@ TAO_PICurrent_Impl::copy (TAO_PICurrent_Impl &rhs, CORBA::Boolean deep_copy) this->slot_table_.size (new_size); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { for (size_t i = 0; i < new_size; ++i) { this->slot_table_[i] = - rhs.get_slot (i TAO_ENV_ARG_PARAMETER); // Deep copy + rhs.get_slot (i ACE_ENV_ARG_PARAMETER); // Deep copy ACE_TRY_CHECK; } } diff --git a/TAO/tao/PICurrent.h b/TAO/tao/PICurrent.h index 0965b8cd2b9..df2e38aa217 100644 --- a/TAO/tao/PICurrent.h +++ b/TAO/tao/PICurrent.h @@ -70,14 +70,14 @@ public: /// Retrieve information stored in the slot table at the given /// SlotId. virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 id, const CORBA::Any & data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); //@} @@ -98,7 +98,7 @@ public: /// Verify the validity of the given SlotId. void check_validity (const PortableInterceptor::SlotId &id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: @@ -165,14 +165,14 @@ public: /// Retrieve information stored in the slot table at the given /// SlotId. CORBA::Any * get_slot (PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL) + 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 id, const CORBA::Any & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); diff --git a/TAO/tao/PICurrent.inl b/TAO/tao/PICurrent.inl index 2c03f3722b0..7e25c8d110e 100644 --- a/TAO/tao/PICurrent.inl +++ b/TAO/tao/PICurrent.inl @@ -10,7 +10,7 @@ TAO_PICurrent::slot_count (void) const ACE_INLINE void TAO_PICurrent::check_validity (const PortableInterceptor::SlotId &id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // No need to acquire a lock for this check. At this point, these // attributes are read only. diff --git a/TAO/tao/PICurrent_ORBInitializer.cpp b/TAO/tao/PICurrent_ORBInitializer.cpp index 51cd34636d2..af5285453ba 100644 --- a/TAO/tao/PICurrent_ORBInitializer.cpp +++ b/TAO/tao/PICurrent_ORBInitializer.cpp @@ -17,11 +17,11 @@ ACE_RCSID (TAO, void TAO_PICurrent_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORBInitInfo_var tao_info = - TAO_ORBInitInfo::_narrow (info TAO_ENV_ARG_PARAMETER); + TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_ORB_Core *orb_core = tao_info->orb_core (); @@ -42,7 +42,7 @@ TAO_PICurrent_ORBInitializer::pre_init ( // instance between all ORBs. info->register_initial_reference ("PICurrent", current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Cache the downcasted pointer in the ORB Core. @@ -52,7 +52,7 @@ TAO_PICurrent_ORBInitializer::pre_init ( void TAO_PICurrent_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/PICurrent_ORBInitializer.h b/TAO/tao/PICurrent_ORBInitializer.h index e64715c7840..3d93a3d2eb6 100644 --- a/TAO/tao/PICurrent_ORBInitializer.h +++ b/TAO/tao/PICurrent_ORBInitializer.h @@ -61,11 +61,11 @@ public: */ //@{ virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp index 4eacefda599..66f0d3b99f2 100644 --- a/TAO/tao/Pluggable.cpp +++ b/TAO/tao/Pluggable.cpp @@ -38,7 +38,7 @@ TAO_Connector::~TAO_Connector (void) int TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method utilizes the "Template Method" design pattern to // parse the given URL style IOR for the protocol being used @@ -170,14 +170,14 @@ TAO_Connector::make_mprofile (const char *string, // or // `endpoint/object_key' - TAO_Profile *profile = this->make_profile (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Profile *profile = this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // 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 () TAO_ENV_ARG_PARAMETER); + profile->parse_string (endpoint.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Give up ownership of the profile. diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h index d57c7ac83b4..b4e66e6f86a 100644 --- a/TAO/tao/Pluggable.h +++ b/TAO/tao/Pluggable.h @@ -161,7 +161,7 @@ public: /// MProfile. int make_mprofile (const char *ior, TAO_MProfile &mprofile - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Initialize object and register with reactor. virtual int open (TAO_ORB_Core *orb_core) = 0; @@ -176,7 +176,7 @@ public: */ virtual int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Initial set of connections to be established. virtual int preconnect (const char *preconnections) = 0; @@ -195,7 +195,7 @@ public: protected: /// Create a profile with a given endpoint. - virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL) = 0; /// Set the ORB Core pointer void orb_core (TAO_ORB_Core *orb_core); diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index bb044d3e0e1..adff3529778 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -119,7 +119,7 @@ void CORBA::PolicyError::_raise () void CORBA::PolicyError::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -132,7 +132,7 @@ void CORBA::PolicyError::_tao_encode ( void CORBA::PolicyError::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -315,7 +315,7 @@ void CORBA_InvalidPolicies::_raise () void CORBA_InvalidPolicies::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -328,7 +328,7 @@ void CORBA_InvalidPolicies::_tao_encode ( void CORBA_InvalidPolicies::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -388,10 +388,10 @@ tao_CORBA_Policy_nil ( CORBA::Policy_ptr tao_CORBA_Policy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA::Policy::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA::Policy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -515,10 +515,10 @@ CORBA_Policy_var::tao_nil (void) ::CORBA::Policy_ptr CORBA_Policy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA::Policy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA::Policy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -596,21 +596,21 @@ public: TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -626,30 +626,30 @@ private: TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -657,13 +657,13 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (TAO_ENV_SINGLE_A CORBA::Any * -TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -685,21 +685,21 @@ public: TAO_ClientRequestInfo_CORBA_Policy_copy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -715,30 +715,30 @@ private: TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -746,13 +746,13 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * -TAO_ClientRequestInfo_CORBA_Policy_copy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -774,21 +774,21 @@ public: TAO_ClientRequestInfo_CORBA_Policy_destroy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -802,30 +802,30 @@ private: TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -833,13 +833,13 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * -TAO_ClientRequestInfo_CORBA_Policy_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -861,7 +861,7 @@ CORBA_TAO_Policy_Remote_Proxy_Impl::CORBA_TAO_Policy_Remote_Proxy_Impl (void) CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -903,7 +903,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -919,7 +919,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -931,17 +931,17 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -958,7 +958,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -985,7 +985,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -995,12 +995,12 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1011,7 +1011,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1027,7 +1027,7 @@ return _tao_retval; CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1070,7 +1070,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( TAO_ClientRequestInfo_CORBA_Policy_copy ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -1086,7 +1086,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1098,17 +1098,17 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1125,7 +1125,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1153,7 +1153,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1163,12 +1163,12 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1179,7 +1179,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1195,7 +1195,7 @@ return _tao_safe_retval._retn (); void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1237,7 +1237,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( TAO_ClientRequestInfo_CORBA_Policy_destroy ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -1253,7 +1253,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1265,17 +1265,17 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1291,7 +1291,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1305,7 +1305,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1315,12 +1315,12 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1331,7 +1331,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1386,7 +1386,7 @@ CORBA_TAO_Policy_Remote_Proxy_Broker::~CORBA_TAO_Policy_Remote_Proxy_Broker (voi CORBA_TAO_Policy_Proxy_Impl& CORBA_TAO_Policy_Remote_Proxy_Broker::select_proxy ( ::CORBA::Policy * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -1427,24 +1427,24 @@ void CORBA_Policy::_tao_any_destructor (void *x) CORBA::Policy_ptr CORBA_Policy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_Policy::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0" TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Policy::_nil ()); if (is_a == 0) return CORBA_Policy::_nil (); } - return CORBA_Policy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_Policy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA::Policy_ptr CORBA_Policy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1501,14 +1501,14 @@ CORBA_Policy::_duplicate (CORBA_Policy_ptr obj) return obj; } -CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type) @@ -1558,53 +1558,53 @@ CORBA_Policy::_tao_scope (void) const } CORBA::PolicyType CORBA_Policy::policy_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA_TAO_Policy_Proxy_Impl &proxy = - this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.policy_type ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::Policy_ptr CORBA_Policy::copy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA_TAO_Policy_Proxy_Impl &proxy = - this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.copy ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void CORBA::Policy::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA_TAO_Policy_Proxy_Impl &proxy = - this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.destroy ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1681,11 +1681,11 @@ void CORBA::Policy::destroy ( _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, target); - *tmp = CORBA::Policy::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = CORBA::Policy::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1870,10 +1870,10 @@ tao_CORBA_PolicyManager_nil ( CORBA_PolicyManager_ptr tao_CORBA_PolicyManager_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_PolicyManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1997,10 +1997,10 @@ CORBA_PolicyManager_var::tao_nil (void) ::CORBA_PolicyManager_ptr CORBA_PolicyManager_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_PolicyManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2082,15 +2082,15 @@ CORBA_PolicyManager::~CORBA_PolicyManager (void) CORBA_PolicyManager_ptr CORBA_PolicyManager::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA::PolicyManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA::PolicyManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2167,10 +2167,10 @@ tao_CORBA_PolicyCurrent_nil ( CORBA_PolicyCurrent_ptr tao_CORBA_PolicyCurrent_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_PolicyCurrent::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2294,10 +2294,10 @@ CORBA_PolicyCurrent_var::tao_nil (void) ::CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_PolicyCurrent::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2379,15 +2379,15 @@ CORBA_PolicyCurrent::~CORBA_PolicyCurrent (void) CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_PolicyCurrent::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_PolicyCurrent::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2501,7 +2501,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyError { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyError TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyError ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2591,7 +2591,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InvalidPolic { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2664,7 +2664,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Policy_ptr &_tao_ _tao_elem = CORBA::Policy::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2747,7 +2747,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyList { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2838,7 +2838,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyTypeS { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyTypeSeq TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyTypeSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -2901,7 +2901,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType & { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -3004,7 +3004,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA::Policy::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 3b762cf53c6..0480c095dca 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -86,12 +86,12 @@ public: virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA_PolicyError *_downcast (CORBA::Exception *); @@ -219,12 +219,12 @@ public: virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA_InvalidPolicies *_downcast (CORBA::Exception *); @@ -270,7 +270,7 @@ public: static CORBA_Policy_ptr tao_duplicate (CORBA_Policy_ptr); static void tao_release (CORBA_Policy_ptr); static CORBA_Policy_ptr tao_nil (void); - static CORBA_Policy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CORBA_Policy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -333,11 +333,11 @@ class TAO_Export CORBA_Policy static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj); static CORBA_Policy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Policy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Policy_ptr _nil (void) { @@ -347,21 +347,21 @@ class TAO_Export CORBA_Policy static void _tao_any_destructor (void*); virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -369,7 +369,7 @@ class TAO_Export CORBA_Policy virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -428,7 +428,7 @@ class TAO_Export CORBA_Policy virtual CORBA::PolicyType policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -436,7 +436,7 @@ class TAO_Export CORBA_Policy virtual CORBA::Policy_ptr copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -444,7 +444,7 @@ class TAO_Export CORBA_Policy virtual void destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -474,7 +474,7 @@ public: virtual CORBA::PolicyType policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -482,7 +482,7 @@ public: virtual CORBA::Policy_ptr copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -490,7 +490,7 @@ virtual CORBA::Policy_ptr copy ( virtual void destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -520,7 +520,7 @@ public: virtual ~CORBA_TAO_Policy_Proxy_Broker (void); virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy ( CORBA_Policy *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) = 0; protected: @@ -546,7 +546,7 @@ public: virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy ( CORBA_Policy *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -599,7 +599,7 @@ public: virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void *src) const; @@ -894,7 +894,7 @@ public: static CORBA_PolicyManager_ptr tao_duplicate (CORBA_PolicyManager_ptr); static void tao_release (CORBA_PolicyManager_ptr); static CORBA_PolicyManager_ptr tao_nil (void); - static CORBA_PolicyManager_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CORBA_PolicyManager_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -949,11 +949,11 @@ public: static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj); static CORBA_PolicyManager_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_PolicyManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_PolicyManager_ptr _nil (void) { @@ -962,7 +962,7 @@ public: virtual CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -971,7 +971,7 @@ public: virtual void set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1024,7 +1024,7 @@ public: static CORBA_PolicyCurrent_ptr tao_duplicate (CORBA_PolicyCurrent_ptr); static void tao_release (CORBA_PolicyCurrent_ptr); static CORBA_PolicyCurrent_ptr tao_nil (void); - static CORBA_PolicyCurrent_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CORBA_PolicyCurrent_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -1079,11 +1079,11 @@ public: static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj); static CORBA_PolicyCurrent_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_PolicyCurrent_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_PolicyCurrent_ptr _nil (void) { diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp index 063df75db86..bb117836e1b 100644 --- a/TAO/tao/PolicyFactory_Registry.cpp +++ b/TAO/tao/PolicyFactory_Registry.cpp @@ -27,7 +27,7 @@ void TAO_PolicyFactory_Registry::register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (policy_factory)) ACE_THROW (CORBA::BAD_PARAM ( @@ -59,7 +59,7 @@ TAO_PolicyFactory_Registry::register_policy_factory ( CORBA::Policy_ptr TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { @@ -78,7 +78,7 @@ TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type, return policy_factory->create_policy (type, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tao/PolicyFactory_Registry.h b/TAO/tao/PolicyFactory_Registry.h index 04f3b15e32c..808a541a2ce 100644 --- a/TAO/tao/PolicyFactory_Registry.h +++ b/TAO/tao/PolicyFactory_Registry.h @@ -66,13 +66,13 @@ public: void register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Construct a policy of the given type with the information /// contained in the CORBA::Any <value>. CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 39f8d95f6d8..534346a2322 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -38,17 +38,17 @@ void TAO_Policy_Current_Impl::set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->manager_impl_.set_policy_overrides (policies, set_add TAO_ENV_ARG_PARAMETER); + 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->manager_impl_.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER); + return this->manager_impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 029d27c9c9b..11d047109fe 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -49,20 +49,20 @@ public: /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // = The CORBA::PolicyManager operations virtual CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA_InvalidPolicies)); @@ -88,18 +88,18 @@ public: /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // = The CORBA::PolicyManager operations CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); void set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); @@ -122,21 +122,21 @@ public: /// Obtain a single policy. CORBA::Policy_ptr get_policy ( CORBA::PolicyType policy - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // = The CORBA::PolicyManager operations virtual CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA_InvalidPolicies)); diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index 478156475fc..4ea2f520105 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -9,36 +9,36 @@ TAO_Policy_Manager::TAO_Policy_Manager (void) ACE_INLINE CORBA::Policy_ptr TAO_Policy_Manager::get_policy ( CORBA::PolicyType policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); - return this->impl_.get_policy (policy TAO_ENV_ARG_PARAMETER); + return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::PolicyList * TAO_Policy_Manager::get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - TAO_ENV_ARG_DECL) + 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 TAO_ENV_ARG_PARAMETER); + return this->impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_Policy_Manager::set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL) + 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 TAO_ENV_ARG_PARAMETER); + this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Policy_ptr @@ -73,9 +73,9 @@ TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void) ACE_INLINE CORBA::Policy_ptr TAO_Policy_Current_Impl::get_policy ( CORBA::PolicyType policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->manager_impl_.get_policy (policy TAO_ENV_ARG_PARAMETER); + return this->manager_impl_.get_policy (policy ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Policy_ptr @@ -89,35 +89,35 @@ TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type) ACE_INLINE CORBA::Policy_ptr TAO_Policy_Current::get_policy ( CORBA::PolicyType policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Policy_Current_Impl &impl = this->implementation (); - return impl.get_policy (policy TAO_ENV_ARG_PARAMETER); + return impl.get_policy (policy ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::PolicyList * TAO_Policy_Current::get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Policy_Current_Impl &impl = this->implementation (); - return impl.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER); + return impl.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL) + 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 TAO_ENV_ARG_PARAMETER); + impl.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Policy_ptr diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index e0e1b2cc115..1fd96e0665a 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -11,10 +11,10 @@ ACE_RCSID(tao, Policy_Set, "$Id$") TAO_Policy_Set::~TAO_Policy_Set (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -45,7 +45,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) if (CORBA::is_nil (policy)) continue; - CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Add the "cacheable" policies into the cache. @@ -70,12 +70,12 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) void TAO_Policy_Set::copy_from (TAO_Policy_Set *source - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (source == 0) return; - this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; @@ -89,7 +89,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source if (! this->compatible_scope (policy->_tao_scope())) ACE_THROW (CORBA::NO_PERMISSION ()); - CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = this->policy_list_.length (); @@ -104,7 +104,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source } void -TAO_Policy_Set::cleanup_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Policy_Set::cleanup_i (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ULong i; @@ -113,7 +113,7 @@ TAO_Policy_Set::cleanup_i (TAO_ENV_SINGLE_ARG_DECL) i < this->policy_list_.length (); ++i) { - this->policy_list_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->policy_list_[i] = CORBA::Policy::_nil (); } @@ -129,7 +129,7 @@ void TAO_Policy_Set::set_policy_overrides ( const CORBA::PolicyList &policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ The spec does not say what to do on this case. if (set_add != CORBA::SET_OVERRIDE @@ -138,7 +138,7 @@ TAO_Policy_Set::set_policy_overrides ( if (set_add == CORBA::SET_OVERRIDE) { - this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -157,7 +157,7 @@ TAO_Policy_Set::set_policy_overrides ( if (CORBA::is_nil (policy.in ())) continue; - CORBA::PolicyType policy_type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType policy_type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (policy_type == TAO_RT_SERVER_PROTOCOL_POLICY_TYPE) @@ -173,22 +173,22 @@ TAO_Policy_Set::set_policy_overrides ( server_protocol_set = 1; } - this->set_policy (policy.in () TAO_ENV_ARG_PARAMETER); + this->set_policy (policy.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (! this->compatible_scope (policy->_tao_scope())) ACE_THROW (CORBA::NO_PERMISSION ()); - CORBA::PolicyType policy_type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType policy_type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -197,12 +197,12 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy while (j != length) { CORBA::ULong current = - this->policy_list_[j]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[j]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (current == policy_type) { - this->policy_list_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->policy_list_[j] = copy.ptr (); break; @@ -228,7 +228,7 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy CORBA::PolicyList * TAO_Policy_Set::get_policy_overrides ( const CORBA::PolicyTypeSeq &types - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong types_length = types.length (); @@ -267,7 +267,7 @@ TAO_Policy_Set::get_policy_overrides ( ++i) { CORBA::ULong current = - this->policy_list_[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (current != slot) @@ -284,7 +284,7 @@ TAO_Policy_Set::get_policy_overrides ( CORBA::Policy_ptr TAO_Policy_Set::get_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong length = this->policy_list_.length (); for (CORBA::ULong i = 0; @@ -292,7 +292,7 @@ TAO_Policy_Set::get_policy (CORBA::PolicyType type ++i) { CORBA::ULong current = - this->policy_list_[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (current != type) diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h index 72be1d9c21a..94a52934342 100644 --- a/TAO/tao/Policy_Set.h +++ b/TAO/tao/Policy_Set.h @@ -52,7 +52,7 @@ public: /// Copy the state from <source>, it uses the copy() operator to /// obtain independent copies of all the policies. void copy_from (TAO_Policy_Set* source - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Modify the list of policies to include <policies>. @@ -63,18 +63,18 @@ public: */ void set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Get the values (if any) for the policies in <types>, if <types> /// is an empty list the method returns *all* the current policies. CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Obtain a cached policy for speedy lookups. @@ -91,7 +91,7 @@ public: /// Utility method to set a single policy. void set_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Returns the policy at the specified index. /// CORBA::Policy::_nil () is returned if the policy doesn't exist @@ -104,7 +104,7 @@ private: /// Remove and destroy all the policy objects owned by this policy /// manager. - void cleanup_i (TAO_ENV_SINGLE_ARG_DECL); + void cleanup_i (ACE_ENV_SINGLE_ARG_DECL); /// 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 5b0c68b6457..87d6e087573 100644 --- a/TAO/tao/Policy_Validator.cpp +++ b/TAO/tao/Policy_Validator.cpp @@ -32,28 +32,28 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator) void TAO_Policy_Validator::validate (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->validate_impl (policies TAO_ENV_ARG_PARAMETER); + this->validate_impl (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->next_ != 0) { - this->next_->validate (policies TAO_ENV_ARG_PARAMETER); + this->next_->validate (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->merge_policies_impl (policies TAO_ENV_ARG_PARAMETER); + this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->next_ != 0) { - this->next_->merge_policies (policies TAO_ENV_ARG_PARAMETER); + this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h index 9582e4fb9d7..fa7eaa78c5b 100644 --- a/TAO/tao/Policy_Validator.h +++ b/TAO/tao/Policy_Validator.h @@ -54,13 +54,13 @@ public: * if that is not the case. */ void validate (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Add/merge policies. **/ void merge_policies (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Return whether the specified policy type is legal for the @@ -82,10 +82,10 @@ public: protected: virtual void validate_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void merge_policies_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) = 0; diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 4368660f227..6c02589fc72 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -144,10 +144,10 @@ CORBA_Pollable_var::tao_nil (void) ::CORBA_Pollable_ptr CORBA_Pollable_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_Pollable::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -228,15 +228,15 @@ CORBA_Pollable::~CORBA_Pollable (void) CORBA_Pollable_ptr CORBA_Pollable::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_Pollable::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_Pollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_Pollable_ptr CORBA_Pollable::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -396,10 +396,10 @@ CORBA_DIIPollable_var::tao_nil (void) ::CORBA_DIIPollable_ptr CORBA_DIIPollable_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_DIIPollable::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -480,15 +480,15 @@ CORBA_DIIPollable::~CORBA_DIIPollable (void) CORBA_DIIPollable_ptr CORBA_DIIPollable::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_DIIPollable::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_DIIPollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_DIIPollable_ptr CORBA_DIIPollable::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -660,10 +660,10 @@ CORBA_PollableSet_var::tao_nil (void) ::CORBA_PollableSet_ptr CORBA_PollableSet_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_PollableSet::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -744,15 +744,15 @@ CORBA_PollableSet::~CORBA_PollableSet (void) CORBA_PollableSet_ptr CORBA_PollableSet::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_PollableSet::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_PollableSet::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_PollableSet_ptr CORBA_PollableSet::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -847,7 +847,7 @@ void CORBA_PollableSet::NoPossiblePollable::_raise () void CORBA_PollableSet::NoPossiblePollable::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -855,7 +855,7 @@ void CORBA_PollableSet::NoPossiblePollable::_tao_encode ( void CORBA_PollableSet::NoPossiblePollable::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -915,7 +915,7 @@ void CORBA_PollableSet::UnknownPollable::_raise () void CORBA_PollableSet::UnknownPollable::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { ACE_THROW (CORBA::MARSHAL ()); } @@ -923,7 +923,7 @@ void CORBA_PollableSet::UnknownPollable::_tao_encode ( void CORBA_PollableSet::UnknownPollable::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index eb498987691..13dbbeefbae 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -98,7 +98,7 @@ public: static CORBA_PollableSet_ptr tao_duplicate (CORBA_PollableSet_ptr); static void tao_release (CORBA_PollableSet_ptr); static CORBA_PollableSet_ptr tao_nil (void); - static CORBA_PollableSet_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CORBA_PollableSet_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -174,7 +174,7 @@ public: static CORBA_Pollable_ptr tao_duplicate (CORBA_Pollable_ptr); static void tao_release (CORBA_Pollable_ptr); static CORBA_Pollable_ptr tao_nil (void); - static CORBA_Pollable_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CORBA_Pollable_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -229,11 +229,11 @@ public: static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj); static CORBA_Pollable_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Pollable_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Pollable_ptr _nil (void) { @@ -242,14 +242,14 @@ public: virtual CORBA::Boolean is_ready ( CORBA::ULong timeout - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA_PollableSet_ptr create_pollable_set ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -310,7 +310,7 @@ public: static CORBA_DIIPollable_ptr tao_duplicate (CORBA_DIIPollable_ptr); static void tao_release (CORBA_DIIPollable_ptr); static CORBA_DIIPollable_ptr tao_nil (void); - static CORBA_DIIPollable_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CORBA_DIIPollable_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -365,11 +365,11 @@ public: static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj); static CORBA_DIIPollable_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_DIIPollable_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_DIIPollable_ptr _nil (void) { @@ -419,11 +419,11 @@ public: static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj); static CORBA_PollableSet_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_PollableSet_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_PollableSet_ptr _nil (void) { @@ -453,12 +453,12 @@ public: virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NoPossiblePollable *_downcast (CORBA::Exception *); @@ -494,12 +494,12 @@ public: virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static UnknownPollable *_downcast (CORBA::Exception *); @@ -513,7 +513,7 @@ public: #endif /* end #if !defined */ virtual CORBA_DIIPollable_ptr create_dii_pollable ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -521,7 +521,7 @@ virtual CORBA_DIIPollable_ptr create_dii_pollable ( virtual void add_pollable ( CORBA_Pollable_ptr potential - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -529,7 +529,7 @@ virtual void add_pollable ( virtual CORBA_Pollable_ptr poll ( CORBA::ULong timeout - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -538,7 +538,7 @@ virtual CORBA_Pollable_ptr poll ( virtual void remove ( CORBA_Pollable_ptr potential - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -546,7 +546,7 @@ virtual void remove ( )) = 0; virtual CORBA::UShort number_left ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i index 152cda10df6..486f6c26e98 100644 --- a/TAO/tao/PollableC.i +++ b/TAO/tao/PollableC.i @@ -50,10 +50,10 @@ tao_CORBA_Pollable_nil ( ACE_INLINE CORBA_Pollable_ptr tao_CORBA_Pollable_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_Pollable::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -100,10 +100,10 @@ tao_CORBA_DIIPollable_nil ( ACE_INLINE CORBA_DIIPollable_ptr tao_CORBA_DIIPollable_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_DIIPollable::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -157,10 +157,10 @@ tao_CORBA_PollableSet_nil ( ACE_INLINE CORBA_PollableSet_ptr tao_CORBA_PollableSet_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_PollableSet::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index d27be60dab8..afc154eec1a 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -68,10 +68,10 @@ tao_PortableInterceptor_Interceptor_nil ( PortableInterceptor::Interceptor_ptr tao_PortableInterceptor_Interceptor_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::Interceptor::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -132,7 +132,7 @@ PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Inte return this->ptr_; } -PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast +PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast { return this->ptr_; } @@ -193,10 +193,10 @@ PortableInterceptor::Interceptor_var::tao_nil (void) ::PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::Interceptor::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -273,18 +273,18 @@ PortableInterceptor::Interceptor::Interceptor (void) // destructor PortableInterceptor::Interceptor::~Interceptor (void) {} - + PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Interceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Interceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -322,7 +322,7 @@ void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -389,27 +389,27 @@ void PortableInterceptor::ForwardRequest::_raise () void PortableInterceptor::ForwardRequest::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) { return; } - + ACE_THROW (CORBA::MARSHAL ()); } void PortableInterceptor::ForwardRequest::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -435,45 +435,45 @@ static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] = { TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x466f7277), - ACE_NTOHL (0x61726452), - ACE_NTOHL (0x65717565), - ACE_NTOHL (0x73743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x466f7277), + ACE_NTOHL (0x61726452), + ACE_NTOHL (0x65717565), + ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableInterceptor/ForwardRequest:1.0 15, - ACE_NTOHL (0x466f7277), - ACE_NTOHL (0x61726452), - ACE_NTOHL (0x65717565), + ACE_NTOHL (0x466f7277), + ACE_NTOHL (0x61726452), + ACE_NTOHL (0x65717565), ACE_NTOHL (0x73740000), // name = ForwardRequest 2, // member count 8, - ACE_NTOHL (0x666f7277), + ACE_NTOHL (0x666f7277), ACE_NTOHL (0x61726400), // name = forward CORBA::tk_objref, 52, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Object:1.0 7, - ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000), // name = Object 10, - ACE_NTOHL (0x7065726d), - ACE_NTOHL (0x616e656e), + ACE_NTOHL (0x7065726d), + ACE_NTOHL (0x616e656e), ACE_NTOHL (0x74000000), // name = permanent CORBA::tk_boolean, @@ -503,19 +503,19 @@ static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x5265706c), - ACE_NTOHL (0x79537461), - ACE_NTOHL (0x7475733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x5265706c), + ACE_NTOHL (0x79537461), + ACE_NTOHL (0x7475733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableInterceptor/ReplyStatus:1.0 12, - ACE_NTOHL (0x5265706c), - ACE_NTOHL (0x79537461), + ACE_NTOHL (0x5265706c), + ACE_NTOHL (0x79537461), ACE_NTOHL (0x74757300), // name = ReplyStatus CORBA::tk_short, @@ -562,17 +562,17 @@ static const CORBA::Long _oc_PortableInterceptor_SlotId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x536c6f74), - ACE_NTOHL (0x49643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x536c6f74), + ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableInterceptor/SlotId:1.0 7, - ACE_NTOHL (0x536c6f74), + ACE_NTOHL (0x536c6f74), ACE_NTOHL (0x49640000), // name = SlotId CORBA::tk_ulong, @@ -643,27 +643,27 @@ void PortableInterceptor::InvalidSlot::_raise () void PortableInterceptor::InvalidSlot::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) { return; } - + ACE_THROW (CORBA::MARSHAL ()); } void PortableInterceptor::InvalidSlot::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -679,19 +679,19 @@ static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696453), - ACE_NTOHL (0x6c6f743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696453), + ACE_NTOHL (0x6c6f743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableInterceptor/InvalidSlot:1.0 12, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696453), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696453), ACE_NTOHL (0x6c6f7400), // name = InvalidSlot 0, // member count }; @@ -745,10 +745,10 @@ tao_PortableInterceptor_Current_nil ( PortableInterceptor::Current_ptr tao_PortableInterceptor_Current_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -809,7 +809,7 @@ PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_ return this->ptr_; } -PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast +PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast { return this->ptr_; } @@ -870,10 +870,10 @@ PortableInterceptor::Current_var::tao_nil (void) ::PortableInterceptor::Current_ptr PortableInterceptor::Current_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -950,18 +950,18 @@ PortableInterceptor::Current::Current (void) // destructor PortableInterceptor::Current::~Current (void) {} - + PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::Current_ptr PortableInterceptor::Current::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1011,7 +1011,7 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1051,10 +1051,10 @@ tao_PortableInterceptor_RequestInfo_nil ( PortableInterceptor::RequestInfo_ptr tao_PortableInterceptor_RequestInfo_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::RequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1115,7 +1115,7 @@ PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::Requ return this->ptr_; } -PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast +PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast { return this->ptr_; } @@ -1176,10 +1176,10 @@ PortableInterceptor::RequestInfo_var::tao_nil (void) ::PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::RequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1256,18 +1256,18 @@ PortableInterceptor::RequestInfo::RequestInfo (void) // destructor PortableInterceptor::RequestInfo::~RequestInfo (void) {} - + PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1305,7 +1305,7 @@ void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1345,10 +1345,10 @@ tao_PortableInterceptor_ClientRequestInfo_nil ( PortableInterceptor::ClientRequestInfo_ptr tao_PortableInterceptor_ClientRequestInfo_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::ClientRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1409,7 +1409,7 @@ PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor return this->ptr_; } -PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast +PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast { return this->ptr_; } @@ -1470,10 +1470,10 @@ PortableInterceptor::ClientRequestInfo_var::tao_nil (void) ::PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ClientRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1550,18 +1550,18 @@ PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void) // destructor PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void) {} - + PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ClientRequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ClientRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1611,7 +1611,7 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1651,10 +1651,10 @@ tao_PortableInterceptor_ServerRequestInfo_nil ( PortableInterceptor::ServerRequestInfo_ptr tao_PortableInterceptor_ServerRequestInfo_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::ServerRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1715,7 +1715,7 @@ PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor return this->ptr_; } -PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast +PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast { return this->ptr_; } @@ -1776,10 +1776,10 @@ PortableInterceptor::ServerRequestInfo_var::tao_nil (void) ::PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ServerRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1856,18 +1856,18 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void) // destructor PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void) {} - + PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServerRequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServerRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1917,7 +1917,7 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1957,10 +1957,10 @@ tao_PortableInterceptor_ClientRequestInterceptor_nil ( PortableInterceptor::ClientRequestInterceptor_ptr tao_PortableInterceptor_ClientRequestInterceptor_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::ClientRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2021,7 +2021,7 @@ PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInte return this->ptr_; } -PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast +PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast { return this->ptr_; } @@ -2082,10 +2082,10 @@ PortableInterceptor::ClientRequestInterceptor_var::tao_nil (void) ::PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2162,18 +2162,18 @@ PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void) // destructor PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void) {} - + PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ClientRequestInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ClientRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2223,7 +2223,7 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_ar else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2263,10 +2263,10 @@ tao_PortableInterceptor_ServerRequestInterceptor_nil ( PortableInterceptor::ServerRequestInterceptor_ptr tao_PortableInterceptor_ServerRequestInterceptor_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::ServerRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2327,7 +2327,7 @@ PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInte return this->ptr_; } -PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast +PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast { return this->ptr_; } @@ -2388,10 +2388,10 @@ PortableInterceptor::ServerRequestInterceptor_var::tao_nil (void) ::PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2468,18 +2468,18 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) // destructor PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) {} - + PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServerRequestInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServerRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2529,7 +2529,7 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_ar else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2569,10 +2569,10 @@ tao_PortableInterceptor_IORInfo_nil ( PortableInterceptor::IORInfo_ptr tao_PortableInterceptor_IORInfo_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::IORInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2633,7 +2633,7 @@ PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_ return this->ptr_; } -PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast +PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast { return this->ptr_; } @@ -2694,10 +2694,10 @@ PortableInterceptor::IORInfo_var::tao_nil (void) ::PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::IORInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2774,18 +2774,18 @@ PortableInterceptor::IORInfo::IORInfo (void) // destructor PortableInterceptor::IORInfo::~IORInfo (void) {} - + PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IORInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return IORInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2823,7 +2823,7 @@ void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2863,10 +2863,10 @@ tao_PortableInterceptor_IORInterceptor_nil ( PortableInterceptor::IORInterceptor_ptr tao_PortableInterceptor_IORInterceptor_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::IORInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2927,7 +2927,7 @@ PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::I return this->ptr_; } -PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast +PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast { return this->ptr_; } @@ -2988,10 +2988,10 @@ PortableInterceptor::IORInterceptor_var::tao_nil (void) ::PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::IORInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3068,18 +3068,18 @@ PortableInterceptor::IORInterceptor::IORInterceptor (void) // destructor PortableInterceptor::IORInterceptor::~IORInterceptor (void) {} - + PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IORInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return IORInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3129,7 +3129,7 @@ void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -3169,10 +3169,10 @@ tao_PortableInterceptor_PolicyFactory_nil ( PortableInterceptor::PolicyFactory_ptr tao_PortableInterceptor_PolicyFactory_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::PolicyFactory::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3233,7 +3233,7 @@ PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::Po return this->ptr_; } -PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast +PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast { return this->ptr_; } @@ -3294,10 +3294,10 @@ PortableInterceptor::PolicyFactory_var::tao_nil (void) ::PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::PolicyFactory::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3374,18 +3374,18 @@ PortableInterceptor::PolicyFactory::PolicyFactory (void) // destructor PortableInterceptor::PolicyFactory::~PolicyFactory (void) {} - + PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PolicyFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return PolicyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3423,7 +3423,7 @@ void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -3463,10 +3463,10 @@ tao_PortableInterceptor_ORBInitInfo_nil ( PortableInterceptor::ORBInitInfo_ptr tao_PortableInterceptor_ORBInitInfo_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3527,7 +3527,7 @@ PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBI return this->ptr_; } -PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast +PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast { return this->ptr_; } @@ -3588,10 +3588,10 @@ PortableInterceptor::ORBInitInfo_var::tao_nil (void) ::PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3668,18 +3668,18 @@ PortableInterceptor::ORBInitInfo::ORBInitInfo (void) // destructor PortableInterceptor::ORBInitInfo::~ORBInitInfo (void) {} - + PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ORBInitInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3717,7 +3717,7 @@ void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -3776,7 +3776,7 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_raise () void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -3784,7 +3784,7 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode ( void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -3852,7 +3852,7 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_raise () void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -3860,7 +3860,7 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode ( void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -3903,10 +3903,10 @@ tao_PortableInterceptor_ORBInitializer_nil ( PortableInterceptor::ORBInitializer_ptr tao_PortableInterceptor_ORBInitializer_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PortableInterceptor::ORBInitializer::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableInterceptor::ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3967,7 +3967,7 @@ PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::O return this->ptr_; } -PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast +PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast { return this->ptr_; } @@ -4028,10 +4028,10 @@ PortableInterceptor::ORBInitializer_var::tao_nil (void) ::PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ORBInitializer::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableInterceptor::ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4108,18 +4108,18 @@ PortableInterceptor::ORBInitializer::ORBInitializer (void) // destructor PortableInterceptor::ORBInitializer::~ORBInitializer (void) {} - + PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ORBInitializer::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ORBInitializer::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } - + PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4157,7 +4157,7 @@ void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -4214,13 +4214,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - - CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ForwardRequest TAO_ENV_ARG_PARAMETER); + + CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ForwardRequest ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableInterceptor::ForwardRequest *)_tao_any.value (); @@ -4304,13 +4304,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - - CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_InvalidSlot TAO_ENV_ARG_PARAMETER); + + CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_InvalidSlot ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableInterceptor::InvalidSlot *)_tao_any.value (); diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index 1668d370f09..d8ef289f438 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -60,40 +60,40 @@ TAO_NAMESPACE PortableInterceptor { - + #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_ - + class Interceptor; typedef Interceptor *Interceptor_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_ - + class TAO_Export Interceptor_var : public TAO_Base_var { public: Interceptor_var (void); // default constructor - Interceptor_var (Interceptor_ptr p) : ptr_ (p) {} + Interceptor_var (Interceptor_ptr p) : ptr_ (p) {} Interceptor_var (const Interceptor_var &); // copy constructor ~Interceptor_var (void); // destructor - + Interceptor_var &operator= (Interceptor_ptr); Interceptor_var &operator= (const Interceptor_var &); Interceptor_ptr operator-> (void) const; - + operator const Interceptor_ptr &() const; operator Interceptor_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn Interceptor_ptr in (void) const; Interceptor_ptr &inout (void); Interceptor_ptr &out (void); Interceptor_ptr _retn (void); Interceptor_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static Interceptor_ptr tao_duplicate (Interceptor_ptr); @@ -101,10 +101,10 @@ TAO_NAMESPACE PortableInterceptor static Interceptor_ptr tao_nil (void); static Interceptor_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: Interceptor_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -114,11 +114,11 @@ TAO_NAMESPACE PortableInterceptor #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_ - + class TAO_Export Interceptor_out { public: @@ -131,18 +131,18 @@ TAO_NAMESPACE PortableInterceptor operator Interceptor_ptr &(); Interceptor_ptr &ptr (void); Interceptor_ptr operator-> (void); - + private: Interceptor_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_ - + class TAO_Export Interceptor : public virtual CORBA_Object { @@ -153,161 +153,161 @@ TAO_NAMESPACE PortableInterceptor #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static Interceptor_ptr _duplicate (Interceptor_ptr obj); - + static Interceptor_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Interceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Interceptor_ptr _nil (void) { return (Interceptor_ptr)0; } - + virtual char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: Interceptor (void); - + virtual ~Interceptor (void); - + private: Interceptor (const Interceptor &); void operator= (const Interceptor &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_) #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_ - + class TAO_Export ForwardRequest : public CORBA::UserException { public: CORBA::Object_var forward; CORBA::Boolean permanent; - + ForwardRequest (void); // Default constructor. - + ForwardRequest (const ForwardRequest &); // Copy constructor. - + ~ForwardRequest (void); // Destructor. - + static void _tao_any_destructor (void*); - + ForwardRequest &operator= (const ForwardRequest &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); - + static ForwardRequest *_downcast (CORBA::Exception *); ForwardRequest ( const CORBA::Object_ptr _tao_forward, CORBA::Boolean _tao_permanent ); - + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; }; // Exception PortableInterceptor::ForwardRequest. TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; - - + + #endif /* end #if !defined */ - + typedef CORBA::Short ReplyStatus; typedef CORBA::Short_out ReplyStatus_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyStatus; - + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SUCCESSFUL; - + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYSTEM_EXCEPTION; - + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short USER_EXCEPTION; - + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short LOCATION_FORWARD; - + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short LOCATION_FORWARD_PERMANENT; - + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short TRANSPORT_RETRY; - + typedef CORBA::ULong SlotId; typedef CORBA::ULong_out SlotId_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SlotId; - - + + #if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_) #define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_ - + class TAO_Export InvalidSlot : public CORBA::UserException { public: - + InvalidSlot (void); // Default constructor. - + InvalidSlot (const InvalidSlot &); // Copy constructor. - + ~InvalidSlot (void); // Destructor. - + static void _tao_any_destructor (void*); - + InvalidSlot &operator= (const InvalidSlot &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); - + static InvalidSlot *_downcast (CORBA::Exception *); @@ -317,44 +317,44 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; }; // Exception PortableInterceptor::InvalidSlot. TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CURRENT___PTR_CH_) #define _PORTABLEINTERCEPTOR_CURRENT___PTR_CH_ - + class Current; typedef Current *Current_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CURRENT___VAR_CH_) #define _PORTABLEINTERCEPTOR_CURRENT___VAR_CH_ - + class TAO_Export Current_var : public TAO_Base_var { public: Current_var (void); // default constructor - Current_var (Current_ptr p) : ptr_ (p) {} + Current_var (Current_ptr p) : ptr_ (p) {} Current_var (const Current_var &); // copy constructor ~Current_var (void); // destructor - + Current_var &operator= (Current_ptr); Current_var &operator= (const Current_var &); Current_ptr operator-> (void) const; - + operator const Current_ptr &() const; operator Current_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn Current_ptr in (void) const; Current_ptr &inout (void); Current_ptr &out (void); Current_ptr _retn (void); Current_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static Current_ptr tao_duplicate (Current_ptr); @@ -362,10 +362,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static Current_ptr tao_nil (void); static Current_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: Current_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -375,11 +375,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CURRENT___OUT_CH_) #define _PORTABLEINTERCEPTOR_CURRENT___OUT_CH_ - + class TAO_Export Current_out { public: @@ -392,18 +392,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator Current_ptr &(); Current_ptr &ptr (void); Current_ptr operator-> (void); - + private: Current_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_) #define _PORTABLEINTERCEPTOR_CURRENT_CH_ - + class TAO_Export Current : public virtual CORBA::Current { @@ -414,93 +414,93 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static Current_ptr _duplicate (Current_ptr obj); - + static Current_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _nil (void) { return (Current_ptr)0; } - + virtual CORBA::Any * get_slot ( - PortableInterceptor::SlotId id TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::SlotId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::InvalidSlot )) = 0; - + virtual void set_slot ( PortableInterceptor::SlotId id, - const CORBA::Any & data TAO_ENV_ARG_DECL_WITH_DEFAULTS + const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::InvalidSlot )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: Current (void); - + virtual ~Current (void); - + private: Current (const Current &); void operator= (const Current &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_ - + class RequestInfo; typedef RequestInfo *RequestInfo_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_ - + class TAO_Export RequestInfo_var : public TAO_Base_var { public: RequestInfo_var (void); // default constructor - RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {} + RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {} RequestInfo_var (const RequestInfo_var &); // copy constructor ~RequestInfo_var (void); // destructor - + RequestInfo_var &operator= (RequestInfo_ptr); RequestInfo_var &operator= (const RequestInfo_var &); RequestInfo_ptr operator-> (void) const; - + operator const RequestInfo_ptr &() const; operator RequestInfo_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn RequestInfo_ptr in (void) const; RequestInfo_ptr &inout (void); RequestInfo_ptr &out (void); RequestInfo_ptr _retn (void); RequestInfo_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static RequestInfo_ptr tao_duplicate (RequestInfo_ptr); @@ -508,10 +508,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static RequestInfo_ptr tao_nil (void); static RequestInfo_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: RequestInfo_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -521,11 +521,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_ - + class TAO_Export RequestInfo_out { public: @@ -538,18 +538,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator RequestInfo_ptr &(); RequestInfo_ptr &ptr (void); RequestInfo_ptr operator-> (void); - + private: RequestInfo_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_ - + class TAO_Export RequestInfo : public virtual CORBA_Object { @@ -560,179 +560,179 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static RequestInfo_ptr _duplicate (RequestInfo_ptr obj); - + static RequestInfo_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static RequestInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static RequestInfo_ptr _nil (void) { return (RequestInfo_ptr)0; } - + virtual CORBA::ULong request_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual char * operation ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::Dynamic::ContextList * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::Dynamic::RequestContext * operation_context ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::Boolean response_expected ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + #if TAO_HAS_CORBA_MESSAGING == 1 virtual Messaging::SyncScope sync_scope ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - + virtual PortableInterceptor::ReplyStatus reply_status ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::Object_ptr forward_reference ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::Any * get_slot ( - PortableInterceptor::SlotId id TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::SlotId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::InvalidSlot )) = 0; - + virtual ::IOP::ServiceContext * get_request_service_context ( - IOP::ServiceId id TAO_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::IOP::ServiceContext * get_reply_service_context ( - IOP::ServiceId id TAO_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: RequestInfo (void); - + virtual ~RequestInfo (void); - + private: RequestInfo (const RequestInfo &); void operator= (const RequestInfo &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_ - + class ClientRequestInfo; typedef ClientRequestInfo *ClientRequestInfo_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_ - + class TAO_Export ClientRequestInfo_var : public TAO_Base_var { public: ClientRequestInfo_var (void); // default constructor - ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {} + ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {} ClientRequestInfo_var (const ClientRequestInfo_var &); // copy constructor ~ClientRequestInfo_var (void); // destructor - + ClientRequestInfo_var &operator= (ClientRequestInfo_ptr); ClientRequestInfo_var &operator= (const ClientRequestInfo_var &); ClientRequestInfo_ptr operator-> (void) const; - + operator const ClientRequestInfo_ptr &() const; operator ClientRequestInfo_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ClientRequestInfo_ptr in (void) const; ClientRequestInfo_ptr &inout (void); ClientRequestInfo_ptr &out (void); ClientRequestInfo_ptr _retn (void); ClientRequestInfo_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ClientRequestInfo_ptr tao_duplicate (ClientRequestInfo_ptr); @@ -740,10 +740,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static ClientRequestInfo_ptr tao_nil (void); static ClientRequestInfo_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: ClientRequestInfo_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -753,11 +753,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_ - + class TAO_Export ClientRequestInfo_out { public: @@ -770,18 +770,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator ClientRequestInfo_ptr &(); ClientRequestInfo_ptr &ptr (void); ClientRequestInfo_ptr operator-> (void); - + private: ClientRequestInfo_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_ - + class TAO_Export ClientRequestInfo : public virtual PortableInterceptor::RequestInfo { @@ -792,140 +792,140 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj); - + static ClientRequestInfo_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInfo_ptr _nil (void) { return (ClientRequestInfo_ptr)0; } - + virtual CORBA::Object_ptr target ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::Object_ptr effective_target ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::IOP::TaggedProfile * effective_profile ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::Any * received_exception ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual char * received_exception_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::IOP::TaggedComponent * get_effective_component ( - IOP::ComponentId id TAO_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::IOP::TaggedComponentSeq * get_effective_components ( - IOP::ComponentId id TAO_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::CORBA::Policy_ptr get_request_policy ( - CORBA::PolicyType type TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void add_request_service_context ( const IOP::ServiceContext & service_context, - CORBA::Boolean replace TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean replace ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ClientRequestInfo (void); - + virtual ~ClientRequestInfo (void); - + private: ClientRequestInfo (const ClientRequestInfo &); void operator= (const ClientRequestInfo &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_ - + class ServerRequestInfo; typedef ServerRequestInfo *ServerRequestInfo_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_ - + class TAO_Export ServerRequestInfo_var : public TAO_Base_var { public: ServerRequestInfo_var (void); // default constructor - ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {} + ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {} ServerRequestInfo_var (const ServerRequestInfo_var &); // copy constructor ~ServerRequestInfo_var (void); // destructor - + ServerRequestInfo_var &operator= (ServerRequestInfo_ptr); ServerRequestInfo_var &operator= (const ServerRequestInfo_var &); ServerRequestInfo_ptr operator-> (void) const; - + operator const ServerRequestInfo_ptr &() const; operator ServerRequestInfo_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServerRequestInfo_ptr in (void) const; ServerRequestInfo_ptr &inout (void); ServerRequestInfo_ptr &out (void); ServerRequestInfo_ptr _retn (void); ServerRequestInfo_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ServerRequestInfo_ptr tao_duplicate (ServerRequestInfo_ptr); @@ -933,10 +933,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static ServerRequestInfo_ptr tao_nil (void); static ServerRequestInfo_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: ServerRequestInfo_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -946,11 +946,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_ - + class TAO_Export ServerRequestInfo_out { public: @@ -963,18 +963,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator ServerRequestInfo_ptr &(); ServerRequestInfo_ptr &ptr (void); ServerRequestInfo_ptr operator-> (void); - + private: ServerRequestInfo_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_ - + class TAO_Export ServerRequestInfo : public virtual PortableInterceptor::RequestInfo { @@ -985,156 +985,156 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj); - + static ServerRequestInfo_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInfo_ptr _nil (void) { return (ServerRequestInfo_ptr)0; } - + virtual CORBA::Any * sending_exception ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual char * server_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual char * orb_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::PortableInterceptor::AdapterName * adapter_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::CORBA::OctetSeq * object_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::CORBA::OctetSeq * adapter_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::CORBA::Policy_ptr get_server_policy ( - CORBA::PolicyType type TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_slot ( PortableInterceptor::SlotId id, - const CORBA::Any & data TAO_ENV_ARG_DECL_WITH_DEFAULTS + const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::InvalidSlot )) = 0; - + virtual CORBA::Boolean target_is_a ( - const char * id TAO_ENV_ARG_DECL_WITH_DEFAULTS + const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void add_reply_service_context ( const IOP::ServiceContext & service_context, - CORBA::Boolean replace TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean replace ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ServerRequestInfo (void); - + virtual ~ServerRequestInfo (void); - + private: ServerRequestInfo (const ServerRequestInfo &); void operator= (const ServerRequestInfo &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_ - + class ClientRequestInterceptor; typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_ - + class TAO_Export ClientRequestInterceptor_var : public TAO_Base_var { public: ClientRequestInterceptor_var (void); // default constructor - ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {} + ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {} ClientRequestInterceptor_var (const ClientRequestInterceptor_var &); // copy constructor ~ClientRequestInterceptor_var (void); // destructor - + ClientRequestInterceptor_var &operator= (ClientRequestInterceptor_ptr); ClientRequestInterceptor_var &operator= (const ClientRequestInterceptor_var &); ClientRequestInterceptor_ptr operator-> (void) const; - + operator const ClientRequestInterceptor_ptr &() const; operator ClientRequestInterceptor_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ClientRequestInterceptor_ptr in (void) const; ClientRequestInterceptor_ptr &inout (void); ClientRequestInterceptor_ptr &out (void); ClientRequestInterceptor_ptr _retn (void); ClientRequestInterceptor_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ClientRequestInterceptor_ptr tao_duplicate (ClientRequestInterceptor_ptr); @@ -1142,10 +1142,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static ClientRequestInterceptor_ptr tao_nil (void); static ClientRequestInterceptor_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: ClientRequestInterceptor_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1155,11 +1155,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_ - + class TAO_Export ClientRequestInterceptor_out { public: @@ -1172,18 +1172,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator ClientRequestInterceptor_ptr &(); ClientRequestInterceptor_ptr &ptr (void); ClientRequestInterceptor_ptr operator-> (void); - + private: ClientRequestInterceptor_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_ - + class TAO_Export ClientRequestInterceptor : public virtual PortableInterceptor::Interceptor { @@ -1194,114 +1194,114 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj); - + static ClientRequestInterceptor_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInterceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInterceptor_ptr _nil (void) { return (ClientRequestInterceptor_ptr)0; } - + virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )) = 0; - + virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )) = 0; - + virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ClientRequestInterceptor (void); - + virtual ~ClientRequestInterceptor (void); - + private: ClientRequestInterceptor (const ClientRequestInterceptor &); void operator= (const ClientRequestInterceptor &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_ - + class ServerRequestInterceptor; typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_ - + class TAO_Export ServerRequestInterceptor_var : public TAO_Base_var { public: ServerRequestInterceptor_var (void); // default constructor - ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {} + ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {} ServerRequestInterceptor_var (const ServerRequestInterceptor_var &); // copy constructor ~ServerRequestInterceptor_var (void); // destructor - + ServerRequestInterceptor_var &operator= (ServerRequestInterceptor_ptr); ServerRequestInterceptor_var &operator= (const ServerRequestInterceptor_var &); ServerRequestInterceptor_ptr operator-> (void) const; - + operator const ServerRequestInterceptor_ptr &() const; operator ServerRequestInterceptor_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServerRequestInterceptor_ptr in (void) const; ServerRequestInterceptor_ptr &inout (void); ServerRequestInterceptor_ptr &out (void); ServerRequestInterceptor_ptr _retn (void); ServerRequestInterceptor_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ServerRequestInterceptor_ptr tao_duplicate (ServerRequestInterceptor_ptr); @@ -1309,10 +1309,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static ServerRequestInterceptor_ptr tao_nil (void); static ServerRequestInterceptor_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: ServerRequestInterceptor_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1322,11 +1322,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_ - + class TAO_Export ServerRequestInterceptor_out { public: @@ -1339,18 +1339,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator ServerRequestInterceptor_ptr &(); ServerRequestInterceptor_ptr &ptr (void); ServerRequestInterceptor_ptr operator-> (void); - + private: ServerRequestInterceptor_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_ - + class TAO_Export ServerRequestInterceptor : public virtual PortableInterceptor::Interceptor { @@ -1361,115 +1361,115 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj); - + static ServerRequestInterceptor_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInterceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInterceptor_ptr _nil (void) { return (ServerRequestInterceptor_ptr)0; } - + virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )) = 0; - + virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )) = 0; - + virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )) = 0; - + virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ServerRequestInterceptor (void); - + virtual ~ServerRequestInterceptor (void); - + private: ServerRequestInterceptor (const ServerRequestInterceptor &); void operator= (const ServerRequestInterceptor &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_IORINFO___PTR_CH_) #define _PORTABLEINTERCEPTOR_IORINFO___PTR_CH_ - + class IORInfo; typedef IORInfo *IORInfo_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_IORINFO___VAR_CH_) #define _PORTABLEINTERCEPTOR_IORINFO___VAR_CH_ - + class TAO_Export IORInfo_var : public TAO_Base_var { public: IORInfo_var (void); // default constructor - IORInfo_var (IORInfo_ptr p) : ptr_ (p) {} + IORInfo_var (IORInfo_ptr p) : ptr_ (p) {} IORInfo_var (const IORInfo_var &); // copy constructor ~IORInfo_var (void); // destructor - + IORInfo_var &operator= (IORInfo_ptr); IORInfo_var &operator= (const IORInfo_var &); IORInfo_ptr operator-> (void) const; - + operator const IORInfo_ptr &() const; operator IORInfo_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn IORInfo_ptr in (void) const; IORInfo_ptr &inout (void); IORInfo_ptr &out (void); IORInfo_ptr _retn (void); IORInfo_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static IORInfo_ptr tao_duplicate (IORInfo_ptr); @@ -1477,10 +1477,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static IORInfo_ptr tao_nil (void); static IORInfo_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: IORInfo_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1490,11 +1490,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_IORINFO___OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINFO___OUT_CH_ - + class TAO_Export IORInfo_out { public: @@ -1507,18 +1507,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator IORInfo_ptr &(); IORInfo_ptr &ptr (void); IORInfo_ptr operator-> (void); - + private: IORInfo_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_) #define _PORTABLEINTERCEPTOR_IORINFO_CH_ - + class TAO_Export IORInfo : public virtual CORBA_Object { @@ -1529,133 +1529,133 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static IORInfo_ptr _duplicate (IORInfo_ptr obj); - + static IORInfo_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInfo_ptr _nil (void) { return (IORInfo_ptr)0; } - + virtual ::CORBA::Policy_ptr get_effective_policy ( - CORBA::PolicyType type TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void add_ior_component ( - const IOP::TaggedComponent & component TAO_ENV_ARG_DECL_WITH_DEFAULTS + const IOP::TaggedComponent & component ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void add_ior_component_to_profile ( const IOP::TaggedComponent & component, - IOP::ProfileId profile_id TAO_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ProfileId profile_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual PortableInterceptor::AdapterManagerId manager_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual PortableInterceptor::AdapterState state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void current_factory ( - PortableInterceptor::ObjectReferenceFactory * current_factory TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ObjectReferenceFactory * current_factory ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: IORInfo (void); - + virtual ~IORInfo (void); - + private: IORInfo (const IORInfo &); void operator= (const IORInfo &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_ - + class IORInterceptor; typedef IORInterceptor *IORInterceptor_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_ - + class TAO_Export IORInterceptor_var : public TAO_Base_var { public: IORInterceptor_var (void); // default constructor - IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {} + IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {} IORInterceptor_var (const IORInterceptor_var &); // copy constructor ~IORInterceptor_var (void); // destructor - + IORInterceptor_var &operator= (IORInterceptor_ptr); IORInterceptor_var &operator= (const IORInterceptor_var &); IORInterceptor_ptr operator-> (void) const; - + operator const IORInterceptor_ptr &() const; operator IORInterceptor_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn IORInterceptor_ptr in (void) const; IORInterceptor_ptr &inout (void); IORInterceptor_ptr &out (void); IORInterceptor_ptr _retn (void); IORInterceptor_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static IORInterceptor_ptr tao_duplicate (IORInterceptor_ptr); @@ -1663,10 +1663,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static IORInterceptor_ptr tao_nil (void); static IORInterceptor_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: IORInterceptor_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1676,11 +1676,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_ - + class TAO_Export IORInterceptor_out { public: @@ -1693,18 +1693,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator IORInterceptor_ptr &(); IORInterceptor_ptr &ptr (void); IORInterceptor_ptr operator-> (void); - + private: IORInterceptor_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_ - + class TAO_Export IORInterceptor : public virtual PortableInterceptor::Interceptor { @@ -1715,106 +1715,106 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj); - + static IORInterceptor_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInterceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInterceptor_ptr _nil (void) { return (IORInterceptor_ptr)0; } - + virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void components_established ( - PortableInterceptor::IORInfo_ptr info TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void adapter_manager_state_changed ( PortableInterceptor::AdapterManagerId id, - PortableInterceptor::AdapterState state TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, - PortableInterceptor::AdapterState state TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: IORInterceptor (void); - + virtual ~IORInterceptor (void); - + private: IORInterceptor (const IORInterceptor &); void operator= (const IORInterceptor &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_ - + class PolicyFactory; typedef PolicyFactory *PolicyFactory_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_ - + class TAO_Export PolicyFactory_var : public TAO_Base_var { public: PolicyFactory_var (void); // default constructor - PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {} + PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {} PolicyFactory_var (const PolicyFactory_var &); // copy constructor ~PolicyFactory_var (void); // destructor - + PolicyFactory_var &operator= (PolicyFactory_ptr); PolicyFactory_var &operator= (const PolicyFactory_var &); PolicyFactory_ptr operator-> (void) const; - + operator const PolicyFactory_ptr &() const; operator PolicyFactory_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn PolicyFactory_ptr in (void) const; PolicyFactory_ptr &inout (void); PolicyFactory_ptr &out (void); PolicyFactory_ptr _retn (void); PolicyFactory_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static PolicyFactory_ptr tao_duplicate (PolicyFactory_ptr); @@ -1822,10 +1822,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static PolicyFactory_ptr tao_nil (void); static PolicyFactory_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: PolicyFactory_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1835,11 +1835,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_ - + class TAO_Export PolicyFactory_out { public: @@ -1852,18 +1852,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator PolicyFactory_ptr &(); PolicyFactory_ptr &ptr (void); PolicyFactory_ptr operator-> (void); - + private: PolicyFactory_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_ - + class TAO_Export PolicyFactory : public virtual CORBA_Object { @@ -1874,85 +1874,85 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj); - + static PolicyFactory_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyFactory_ptr _nil (void) { return (PolicyFactory_ptr)0; } - + virtual ::CORBA::Policy_ptr create_policy ( CORBA::PolicyType type, - const CORBA::Any & value TAO_ENV_ARG_DECL_WITH_DEFAULTS + const CORBA::Any & value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, CORBA::PolicyError )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: PolicyFactory (void); - + virtual ~PolicyFactory (void); - + private: PolicyFactory (const PolicyFactory &); void operator= (const PolicyFactory &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_ - + class ORBInitInfo; typedef ORBInitInfo *ORBInitInfo_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_ - + class TAO_Export ORBInitInfo_var : public TAO_Base_var { public: ORBInitInfo_var (void); // default constructor - ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {} + ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {} ORBInitInfo_var (const ORBInitInfo_var &); // copy constructor ~ORBInitInfo_var (void); // destructor - + ORBInitInfo_var &operator= (ORBInitInfo_ptr); ORBInitInfo_var &operator= (const ORBInitInfo_var &); ORBInitInfo_ptr operator-> (void) const; - + operator const ORBInitInfo_ptr &() const; operator ORBInitInfo_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ORBInitInfo_ptr in (void) const; ORBInitInfo_ptr &inout (void); ORBInitInfo_ptr &out (void); ORBInitInfo_ptr _retn (void); ORBInitInfo_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ORBInitInfo_ptr tao_duplicate (ORBInitInfo_ptr); @@ -1960,10 +1960,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static ORBInitInfo_ptr tao_nil (void); static ORBInitInfo_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: ORBInitInfo_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1973,11 +1973,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_ - + class TAO_Export ORBInitInfo_out { public: @@ -1990,18 +1990,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; operator ORBInitInfo_ptr &(); ORBInitInfo_ptr &ptr (void); ORBInitInfo_ptr operator-> (void); - + private: ORBInitInfo_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_ - + class TAO_Export ORBInitInfo : public virtual CORBA_Object { @@ -2012,104 +2012,104 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj); - + static ORBInitInfo_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitInfo_ptr _nil (void) { return (ORBInitInfo_ptr)0; } - + typedef char * ObjectId; typedef CORBA::String_var ObjectId_var; typedef CORBA::String_out ObjectId_out; - + #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_ - + class TAO_Export DuplicateName : public CORBA::UserException { public: TAO_String_Manager name; - + DuplicateName (void); // Default constructor. - + DuplicateName (const DuplicateName &); // Copy constructor. - + ~DuplicateName (void); // Destructor. - + DuplicateName &operator= (const DuplicateName &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); - + static DuplicateName *_downcast (CORBA::Exception *); DuplicateName ( const char * _tao_name ); - + // = TAO extension. static CORBA::Exception *_alloc (void); }; // Exception PortableInterceptor::ORBInitInfo::DuplicateName. #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_ - + class TAO_Export InvalidName : public CORBA::UserException { public: - + InvalidName (void); // Default constructor. - + InvalidName (const InvalidName &); // Copy constructor. - + ~InvalidName (void); // Destructor. - + InvalidName &operator= (const InvalidName &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); - + static InvalidName *_downcast (CORBA::Exception *); @@ -2119,135 +2119,135 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - + virtual ::CORBA::StringSeq * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual char * orb_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual ::IOP::CodecFactory_ptr codec_factory ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void register_initial_reference ( const char * id, - CORBA::Object_ptr obj TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName )) = 0; - + virtual CORBA::Object_ptr resolve_initial_references ( - const char * id TAO_ENV_ARG_DECL_WITH_DEFAULTS + const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ORBInitInfo::InvalidName )) = 0; - + virtual void add_client_request_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; - + virtual void add_server_request_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; - + virtual void add_ior_interceptor ( - PortableInterceptor::IORInterceptor_ptr interceptor TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::IORInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; - + virtual PortableInterceptor::SlotId allocate_slot_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void register_policy_factory ( CORBA::PolicyType type, - PortableInterceptor::PolicyFactory_ptr policy_factory TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::PolicyFactory_ptr policy_factory ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ORBInitInfo (void); - + virtual ~ORBInitInfo (void); - + private: ORBInitInfo (const ORBInitInfo &); void operator= (const ORBInitInfo &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_ - + class ORBInitializer; typedef ORBInitializer *ORBInitializer_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_ - + class TAO_Export ORBInitializer_var : public TAO_Base_var { public: ORBInitializer_var (void); // default constructor - ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {} + ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {} ORBInitializer_var (const ORBInitializer_var &); // copy constructor ~ORBInitializer_var (void); // destructor - + ORBInitializer_var &operator= (ORBInitializer_ptr); ORBInitializer_var &operator= (const ORBInitializer_var &); ORBInitializer_ptr operator-> (void) const; - + operator const ORBInitializer_ptr &() const; operator ORBInitializer_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ORBInitializer_ptr in (void) const; ORBInitializer_ptr &inout (void); ORBInitializer_ptr &out (void); ORBInitializer_ptr _retn (void); ORBInitializer_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ORBInitializer_ptr tao_duplicate (ORBInitializer_ptr); @@ -2255,10 +2255,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; static ORBInitializer_ptr tao_nil (void); static ORBInitializer_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); - + private: ORBInitializer_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -2270,14 +2270,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; /// table. TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( ORBInitializer_ptr init - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_ - + class TAO_Export ORBInitializer_out { public: @@ -2290,18 +2290,18 @@ TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( operator ORBInitializer_ptr &(); ORBInitializer_ptr &ptr (void); ORBInitializer_ptr operator-> (void); - + private: ORBInitializer_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_ - + class TAO_Export ORBInitializer : public virtual CORBA_Object { @@ -2312,57 +2312,57 @@ TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( #endif /* ! __GNUC__ || g++ >= 2.8 */ static int _tao_class_id; - + // The static operations. static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj); - + static ORBInitializer_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitializer_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitializer_ptr _nil (void) { return (ORBInitializer_ptr)0; } - + virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ORBInitializer (void); - + virtual ~ORBInitializer (void); - + private: ORBInitializer (const ORBInitializer &); void operator= (const ORBInitializer &); }; - - + + #endif /* end #if !defined */ - - + + } TAO_NAMESPACE_CLOSE // module PortableInterceptor diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.cpp b/TAO/tao/PortableServer/AMH_Response_Handler.cpp index 0e0f18c78c1..9c7256c746f 100644 --- a/TAO/tao/PortableServer/AMH_Response_Handler.cpp +++ b/TAO/tao/PortableServer/AMH_Response_Handler.cpp @@ -42,7 +42,7 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) } // @@ Mayur: change the signature of this function to use -// TAO_ENV_SINGLE_ARG_DECL... and then change the generated code in +// ACE_ENV_SINGLE_ARG_DECL... and then change the generated code in // the IDL compiler too! void TAO_AMH_Response_Handler::_tao_rh_init_reply (void) @@ -51,27 +51,27 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) if (this->once_only_ != TAO_UNINITIALISED_REPLY) { - // Raise exception ... when exceptions have been implemented, send the + // Raise exception ... when exceptions have been implemented, send the // appropriate exception to the client ACE_ERROR ((LM_ERROR, ACE_TEXT("ERROR. Tried calling method twice \n"))); } // We are now ready to initialise the reply this->once_only_ = TAO_INITIALISING_REPLY; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Initialising RH ... \n"))); // Construct our reply generator. TAO_Pluggable_Reply_Params_Base reply_params; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tSetting request_id ... \n"))); reply_params.request_id_ = this->request_id_; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tInitialising reply svc cntxt ... \n"))); reply_params.service_context_notowned (&(this->reply_service_context_.service_info ())); - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tSetting argument flag ... \n"))); reply_params.argument_flag_ = this->argument_flag_; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tSetting reply_status ... \n"))); if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION) { @@ -81,35 +81,35 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) { reply_params.reply_status_ = this->exception_type_; } - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tgenerating reply header ... \n"))); this->mesg_base_->generate_reply_header (this->_tao_out, reply_params); //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Done Initialising RH. \n"))); // We are done initialising the reply - this->once_only_ = TAO_INITIALISED_REPLY; + this->once_only_ = TAO_INITIALISED_REPLY; } void TAO_AMH_Response_Handler::_tao_rh_send_reply (void) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); - + // If the reply has not been initialised, raise an exception if (this->once_only_ != TAO_INITIALISED_REPLY) { - // Raise exception ... when exceptions have been implemented, send the + // Raise exception ... when exceptions have been implemented, send the // appropriate exception to the client ACE_ERROR ((LM_ERROR, ACE_TEXT("ERROR. Tried calling method twice \n"))); } - + this->once_only_ = TAO_SENDING_REPLY; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO_RH sending message ... \n"))); - + // Send the message. int result = this->transport_->send_message (this->_tao_out); - + if (result == -1) { if (TAO_debug_level > 0) diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 652536ff186..5d23647a7ae 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -84,7 +84,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : user_id_map_ (0), servant_map_ (0), id_uniqueness_strategy_ (0), diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 0e28031dc06..0e0f1d15f0e 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -77,7 +77,7 @@ public: int unique_id_policy, int persistent_id_policy, const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Constructor. ~TAO_Active_Object_Map (void); diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp index 30f5e9f4400..977e3cb6085 100644 --- a/TAO/tao/PortableServer/Collocated_Object.cpp +++ b/TAO/tao/PortableServer/Collocated_Object.cpp @@ -25,7 +25,7 @@ TAO_Collocated_Object::_servant (void) const */ TAO_Collocated_Object * TAO_Collocated_Object::_narrow (CORBA::Object_ptr object - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (object == 0) return 0; @@ -40,11 +40,11 @@ TAO_Collocated_Object::_narrow (CORBA::Object_ptr object CORBA::Boolean TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If the object is collocated then try locally.... if (!this->_is_collocated ()) - return this->CORBA_Object::_is_a (logical_type_id TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (logical_type_id ACE_ENV_ARG_PARAMETER); if (this->_stubobj ()->type_id.in () != 0 && ACE_OS::strcmp (logical_type_id, @@ -65,14 +65,14 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id servant_upcall.prepare_for_upcall (this->_object_key (), "_is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return servant_upcall.servant ()->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER); + return servant_upcall.servant ()->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER); } // Direct collocation strategy is used. if (this->servant_ != 0) - return this->servant_->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER); + return this->servant_->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER); // @@ Maybe we want to change this exception... ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0); @@ -80,11 +80,11 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id CORBA::Boolean TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()) { CORBA::Boolean equivalent = - this->CORBA_Object::_is_equivalent (other_obj TAO_ENV_ARG_PARAMETER); + this->CORBA_Object::_is_equivalent (other_obj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (equivalent) @@ -106,7 +106,7 @@ TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj #if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::Boolean -TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL) +TAO_Collocated_Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean _tao_retval = 0; @@ -114,7 +114,7 @@ TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL) { // If the object is collocated then try locally.... if (!this->_is_collocated ()) - return this->CORBA_Object::_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->CORBA_Object::_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_Stub *stub = this->_stubobj (); @@ -131,14 +131,14 @@ TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL) servant_upcall.prepare_for_upcall (this->_object_key (), "_non_existent", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return servant_upcall.servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return servant_upcall.servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); } // Direct collocation strategy is used. if (this->servant_ != 0) - return this->servant_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->servant_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); // @@ Maybe we want to change this exception... ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0); diff --git a/TAO/tao/PortableServer/Collocated_Object.h b/TAO/tao/PortableServer/Collocated_Object.h index 5326817da53..768d51b2286 100644 --- a/TAO/tao/PortableServer/Collocated_Object.h +++ b/TAO/tao/PortableServer/Collocated_Object.h @@ -44,17 +44,17 @@ public: */ static TAO_Collocated_Object *_narrow (CORBA::Object_ptr object - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Downcast operation // = The CORBA_Object methods, check the tao/Object.h file for details virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (()); #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_MINIMUM_CORBA */ virtual void *_tao_QueryInterface(ptr_arith_t type); diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index ffb35bb4320..8d4d5b2aa33 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -18,26 +18,26 @@ TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void) void TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { #if (TAO_HAS_MINIMUM_POA == 0) CORBA::Policy_var policy = policies.get_cached_policy (TAO_CACHED_POLICY_SERVANT_RETENTION); PortableServer::ServantRetentionPolicy_var srp = PortableServer::ServantRetentionPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ServantRetentionPolicyValue servant_retention = - srp->value (TAO_ENV_SINGLE_ARG_PARAMETER); + srp->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; policy = policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING); PortableServer::RequestProcessingPolicy_var rpp = PortableServer::RequestProcessingPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::RequestProcessingPolicyValue request_processing = - rpp->value (TAO_ENV_SINGLE_ARG_PARAMETER); + rpp->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or @@ -56,29 +56,29 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS); PortableServer::IdUniquenessPolicy_var iup = PortableServer::IdUniquenessPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::IdUniquenessPolicyValue id_uniqueness = - iup->value (TAO_ENV_SINGLE_ARG_PARAMETER); + iup->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; policy = policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION); PortableServer::ImplicitActivationPolicy_var iap = PortableServer::ImplicitActivationPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ImplicitActivationPolicyValue implicit_activation = - iap->value (TAO_ENV_SINGLE_ARG_PARAMETER); + iap->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT); PortableServer::IdAssignmentPolicy_var idap = PortableServer::IdAssignmentPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::IdAssignmentPolicyValue id_assignment = - idap->value (TAO_ENV_SINGLE_ARG_PARAMETER); + idap->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -94,7 +94,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies ACE_THROW (PortableServer::POA::InvalidPolicy ()); #else /* TAO_HAS_MINIMUM_POA == 0 */ ACE_UNUSED_ARG (policies); - TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* TAO_HAS_MINIMUM_POA == 0 */ } @@ -113,6 +113,6 @@ TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type) void TAO_POA_Default_Policy_Validator::merge_policies_impl (TAO_Policy_Set & - TAO_ENV_ARG_DECL_NOT_USED) + 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 5dcbf878594..873b830f335 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.h +++ b/TAO/tao/PortableServer/Default_Policy_Validator.h @@ -41,11 +41,11 @@ protected: * if that is not the case. */ void validate_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Add/merge policies. void merge_policies_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + 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 b4aea740b64..8d837738eee 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -13,11 +13,11 @@ void TAO_Default_Servant_Dispatcher::dispatch ( TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_ServerRequest &req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { servant_upcall.servant ()->_dispatch (req, &servant_upcall - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_POA * @@ -29,7 +29,7 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_POA *poa; @@ -42,7 +42,7 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name, thread_lock, orb_core, object_adapter - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index 339747a9645..0c4ac669529 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -40,7 +40,7 @@ public: /// Dispatch the request to the servant. virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_ServerRequest &req - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Factory method for creating new POA's. virtual TAO_POA *create_POA (const ACE_CString &name, @@ -51,7 +51,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; #include "ace/post.h" diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp index c86f002de75..78e69462db7 100644 --- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp +++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp @@ -20,11 +20,11 @@ TAO_Direct_Object_Proxy_Impl::~TAO_Direct_Object_Proxy_Impl (void) CORBA::Boolean TAO_Direct_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL ) + ACE_ENV_ARG_DECL ) { return target->_servant ()->_is_a (logical_type_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -32,13 +32,13 @@ TAO_Direct_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, CORBA::Boolean TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean _tao_retval = 0; ACE_TRY { if (target->_servant () != 0) - return target->_servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return target->_servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); // @@ Maybe we want to change this exception... ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0); @@ -58,12 +58,12 @@ TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target CORBA_InterfaceDef_ptr TAO_Direct_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { if (target->_servant () != 0) - return target->_servant ()->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + return target->_servant ()->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); // @@ Maybe we want to change this exception... ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0); diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h index bb6927fdad3..1a9390437f2 100644 --- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h +++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h @@ -51,16 +51,16 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); #if (TAO_HAS_MINIMUM_CORBA == 0) virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA_InterfaceDef_ptr _get_interface ( const CORBA::Object_ptr target - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/IORInfo.cpp b/TAO/tao/PortableServer/IORInfo.cpp index e8feb18d2fc..90753275567 100644 --- a/TAO/tao/PortableServer/IORInfo.cpp +++ b/TAO/tao/PortableServer/IORInfo.cpp @@ -25,7 +25,7 @@ TAO_IORInfo::~TAO_IORInfo (void) CORBA::Policy_ptr TAO_IORInfo::get_effective_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::PolicyList *policy_list = @@ -38,7 +38,7 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type { CORBA::PolicyType pt = (*policy_list)[i]->policy_type ( - TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); if (pt == type) @@ -55,7 +55,7 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type void TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Priyanka, why aren't you using the following: @@ -64,7 +64,7 @@ TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component // Add the given tagged component to all profiles. this->poa_->save_ior_component (component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -72,7 +72,7 @@ void TAO_IORInfo::add_ior_component_to_profile ( const IOP::TaggedComponent &component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles matching the given @@ -83,26 +83,26 @@ TAO_IORInfo::add_ior_component_to_profile ( // ?!!!? this->poa_->save_ior_component_and_profile_id (component, profile_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableInterceptor::AdapterManagerId -TAO_IORInfo::manager_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->poa_->get_manager_id (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->poa_->get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableInterceptor::AdapterState -TAO_IORInfo::state (TAO_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->poa_->get_adapter_state (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableInterceptor::ObjectReferenceTemplate * -TAO_IORInfo::adapter_template (TAO_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { /* Returns Object Reference Template whenever an IOR Interceptor is @@ -125,7 +125,7 @@ TAO_IORInfo::adapter_template (TAO_ENV_SINGLE_ARG_DECL) } PortableInterceptor::ObjectReferenceFactory * -TAO_IORInfo::current_factory (TAO_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { /* Returns the current_factory that is used to create the object @@ -143,17 +143,17 @@ TAO_IORInfo::current_factory (TAO_ENV_SINGLE_ARG_DECL) CORBA::COMPLETED_NO), 0); } - + return adapter_factory; } void TAO_IORInfo::current_factory ( PortableInterceptor::ObjectReferenceFactory * current_factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->poa_->set_obj_ref_factory (current_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/PortableServer/IORInfo.h b/TAO/tao/PortableServer/IORInfo.h index 2477742fae7..4c399535dfb 100644 --- a/TAO/tao/PortableServer/IORInfo.h +++ b/TAO/tao/PortableServer/IORInfo.h @@ -62,21 +62,21 @@ public: TAO_IORInfo (TAO_ORB_Core *orb_core, TAO_POA *poa); - /* TAO_MProfile &mp, - CORBA::PolicyList *policy_list); + /* TAO_MProfile &mp, + CORBA::PolicyList *policy_list); */ /// Return the policy matching the given policy type that is in /// effect for the object whose IOR is being created. virtual CORBA::Policy_ptr get_effective_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles matching the given @@ -84,28 +84,28 @@ public: virtual void add_ior_component_to_profile ( const IOP::TaggedComponent & component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::AdapterManagerId manager_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::AdapterState state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::ObjectReferenceFactory * current_factory ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void current_factory ( PortableInterceptor::ObjectReferenceFactory * current_factory - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index b11c3aff750..039d9c077a7 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -150,10 +150,10 @@ ImplementationRepository::ServerObject_var::tao_nil (void) ::ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::ImplementationRepository::ServerObject::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -230,21 +230,21 @@ public: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -258,30 +258,30 @@ private: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -289,13 +289,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TA CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -307,21 +307,21 @@ public: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -335,30 +335,30 @@ private: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -366,13 +366,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -394,7 +394,7 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::_TAO_ServerObject void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -436,7 +436,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -452,7 +452,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -464,17 +464,17 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -490,7 +490,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -504,7 +504,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -514,12 +514,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -530,7 +530,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -546,7 +546,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -588,7 +588,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -604,7 +604,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -616,17 +616,17 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -642,7 +642,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -656,7 +656,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -666,12 +666,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -682,7 +682,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -737,7 +737,7 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::~_TAO_ServerObj ImplementationRepository::_TAO_ServerObject_Proxy_Impl& ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy ( ::ImplementationRepository::ServerObject * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -778,24 +778,24 @@ void ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_voi ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return ServerObject::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0"TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0"ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ServerObject::_nil ()); if (is_a == 0) return ServerObject::_nil (); } - return ServerObject::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServerObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -864,14 +864,14 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj) return obj; } -CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t type) @@ -896,36 +896,36 @@ const char* ImplementationRepository::ServerObject::_interface_repository_id (vo } void ImplementationRepository::ServerObject::ping ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ServerObject_Proxy_Impl &proxy = - this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.ping ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::ServerObject::shutdown ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ServerObject_Proxy_Impl &proxy = - this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.shutdown ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2144,10 +2144,10 @@ ImplementationRepository::Administration_var::tao_nil (void) ::ImplementationRepository::Administration_ptr ImplementationRepository::Administration_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::ImplementationRepository::Administration::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2225,21 +2225,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2255,19 +2255,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::T TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2283,12 +2283,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::a } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2312,13 +2312,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2332,21 +2332,21 @@ public: CORBA::Object_ptr _tao_target, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2364,7 +2364,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::T CORBA::Object_ptr _tao_target, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -2372,12 +2372,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::T {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2396,12 +2396,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::a } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2424,13 +2424,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2444,21 +2444,21 @@ public: CORBA::Object_ptr _tao_target, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2476,7 +2476,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Object_ptr _tao_target, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -2484,12 +2484,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2508,12 +2508,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2521,13 +2521,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2540,21 +2540,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2570,19 +2570,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2598,12 +2598,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arg } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2626,13 +2626,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2645,21 +2645,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2675,19 +2675,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::T TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2703,12 +2703,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::a } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2731,13 +2731,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2752,21 +2752,21 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2788,7 +2788,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -2797,12 +2797,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2824,12 +2824,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2852,13 +2852,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2881,21 +2881,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2911,19 +2911,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2939,12 +2939,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2967,13 +2967,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2986,21 +2986,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3016,19 +3016,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRe TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3044,12 +3044,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (T } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -3072,13 +3072,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions ( CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3092,21 +3092,21 @@ public: CORBA::Object_ptr _tao_target, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3124,7 +3124,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRe CORBA::Object_ptr _tao_target, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), how_many_ (how_many) @@ -3132,12 +3132,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRe {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3154,12 +3154,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (T } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -3167,13 +3167,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions ( CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3196,7 +3196,7 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::_TAO_Administra void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3253,7 +3253,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3269,7 +3269,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3281,12 +3281,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3299,7 +3299,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3315,7 +3315,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3329,7 +3329,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3339,12 +3339,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3355,7 +3355,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3373,7 +3373,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3426,7 +3426,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s _collocated_tao_target_, server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3442,7 +3442,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3454,12 +3454,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3473,7 +3473,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3489,7 +3489,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3503,7 +3503,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3513,12 +3513,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3529,7 +3529,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3547,7 +3547,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3591,7 +3591,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister _collocated_tao_target_, server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3607,7 +3607,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3619,12 +3619,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3638,7 +3638,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3654,7 +3654,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3668,7 +3668,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3678,12 +3678,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3694,7 +3694,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3711,7 +3711,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3763,7 +3763,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3779,7 +3779,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3791,12 +3791,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3809,7 +3809,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3825,7 +3825,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3839,7 +3839,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3849,12 +3849,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3865,7 +3865,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3882,7 +3882,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3934,7 +3934,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3950,7 +3950,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3962,12 +3962,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3980,7 +3980,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3996,7 +3996,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4010,7 +4010,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4020,12 +4020,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4036,7 +4036,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4055,7 +4055,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -4109,7 +4109,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -4125,7 +4125,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4137,12 +4137,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -4158,7 +4158,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4175,7 +4175,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4203,7 +4203,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4213,12 +4213,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4229,7 +4229,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4246,7 +4246,7 @@ return _tao_safe_retval._retn (); void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -4298,7 +4298,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -4314,7 +4314,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4326,12 +4326,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4344,7 +4344,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4360,7 +4360,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4374,7 +4374,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4384,12 +4384,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4400,7 +4400,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4418,7 +4418,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -4475,7 +4475,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -4491,7 +4491,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4503,12 +4503,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4521,7 +4521,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4537,7 +4537,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4561,7 +4561,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4571,12 +4571,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4587,7 +4587,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4606,7 +4606,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4655,7 +4655,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( _collocated_tao_target_, how_many - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -4671,7 +4671,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4683,12 +4683,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4701,7 +4701,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4717,7 +4717,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4742,7 +4742,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4752,12 +4752,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4768,7 +4768,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4823,7 +4823,7 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::~_TAO_Adminis ImplementationRepository::_TAO_Administration_Proxy_Impl& ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy ( ::ImplementationRepository::Administration * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -4864,24 +4864,24 @@ void ImplementationRepository::Administration::_tao_any_destructor (void *_tao_v ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return Administration::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0"TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0"ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Administration::_nil ()); if (is_a == 0) return Administration::_nil (); } - return Administration::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Administration::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4950,14 +4950,14 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj) return obj; } -CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t type) @@ -5033,7 +5033,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_raise () void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -5046,7 +5046,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode ( void ImplementationRepository::Administration::AlreadyRegistered::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -5167,7 +5167,7 @@ void ImplementationRepository::Administration::CannotActivate::_raise () void ImplementationRepository::Administration::CannotActivate::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -5180,7 +5180,7 @@ void ImplementationRepository::Administration::CannotActivate::_tao_encode ( void ImplementationRepository::Administration::CannotActivate::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -5310,7 +5310,7 @@ void ImplementationRepository::Administration::NotFound::_raise () void ImplementationRepository::Administration::NotFound::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -5323,7 +5323,7 @@ void ImplementationRepository::Administration::NotFound::_tao_encode ( void ImplementationRepository::Administration::NotFound::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -5388,7 +5388,7 @@ CORBA::TypeCode_ptr ImplementationRepository::Administration::NotFound::_type (v void ImplementationRepository::Administration::activate_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5397,20 +5397,20 @@ void ImplementationRepository::Administration::activate_server ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.activate_server ( this, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5418,41 +5418,41 @@ void ImplementationRepository::Administration::register_server ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.register_server ( this, server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.reregister_server ( this, server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::remove_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5460,19 +5460,19 @@ void ImplementationRepository::Administration::remove_server ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.remove_server ( this, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::shutdown_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5480,13 +5480,13 @@ void ImplementationRepository::Administration::shutdown_server ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.shutdown_server ( this, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5494,7 +5494,7 @@ char * ImplementationRepository::Administration::server_is_running ( const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5502,7 +5502,7 @@ char * ImplementationRepository::Administration::server_is_running ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.server_is_running ( @@ -5510,13 +5510,13 @@ char * ImplementationRepository::Administration::server_is_running ( server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5524,20 +5524,20 @@ void ImplementationRepository::Administration::server_is_shutting_down ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.server_is_shutting_down ( this, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5545,14 +5545,14 @@ void ImplementationRepository::Administration::find ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.find ( this, server, info - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5560,14 +5560,14 @@ void ImplementationRepository::Administration::list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.list ( @@ -5575,7 +5575,7 @@ void ImplementationRepository::Administration::list ( how_many, server_list, server_iterator - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5726,10 +5726,10 @@ ImplementationRepository::ServerInformationIterator_var::tao_nil (void) ::ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::ImplementationRepository::ServerInformationIterator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5807,21 +5807,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5839,19 +5839,19 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), how_many_ (how_many) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5867,12 +5867,12 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5880,13 +5880,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5908,21 +5908,21 @@ public: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5936,30 +5936,30 @@ private: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -5967,13 +5967,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -5997,7 +5997,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6046,7 +6046,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P &_tao_call, _collocated_tao_target_, how_many - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -6062,7 +6062,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6074,12 +6074,12 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -6093,7 +6093,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6110,7 +6110,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6138,7 +6138,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6148,12 +6148,12 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6164,7 +6164,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6180,7 +6180,7 @@ return _tao_retval; void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6222,7 +6222,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -6238,7 +6238,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6250,17 +6250,17 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6276,7 +6276,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6290,7 +6290,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6300,12 +6300,12 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6316,7 +6316,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6371,7 +6371,7 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::~_ ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::select_proxy ( ::ImplementationRepository::ServerInformationIterator * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -6412,24 +6412,24 @@ void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (v ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return ServerInformationIterator::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0"TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0"ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ServerInformationIterator::_nil ()); if (is_a == 0) return ServerInformationIterator::_nil (); } - return ServerInformationIterator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServerInformationIterator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -6498,14 +6498,14 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati return obj; } -CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptr_arith_t type) @@ -6532,38 +6532,38 @@ const char* ImplementationRepository::ServerInformationIterator::_interface_repo CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ServerInformationIterator_Proxy_Impl &proxy = - this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.next_n ( this, how_many, server_list - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::ServerInformationIterator::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ServerInformationIterator_Proxy_Impl &proxy = - this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.destroy ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6632,7 +6632,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository _tao_elem = ImplementationRepository::ServerObject::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6707,7 +6707,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6798,7 +6798,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6861,7 +6861,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6921,7 +6921,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7004,7 +7004,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7095,7 +7095,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7164,7 +7164,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository _tao_elem = ImplementationRepository::Administration::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7242,7 +7242,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7332,7 +7332,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7422,7 +7422,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7495,7 +7495,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository _tao_elem = ImplementationRepository::ServerInformationIterator::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7556,7 +7556,7 @@ CORBA::Boolean operator>> ( _tao_objref = ImplementationRepository::ServerObject::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -7676,7 +7676,7 @@ CORBA::Boolean operator>> ( _tao_objref = ImplementationRepository::Administration::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -7712,7 +7712,7 @@ CORBA::Boolean operator>> ( _tao_objref = ImplementationRepository::ServerInformationIterator::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index 83789055066..19239e80f9b 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -104,7 +104,7 @@ TAO_NAMESPACE ImplementationRepository static ServerObject_ptr tao_nil (void); static ServerObject_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -168,12 +168,12 @@ TAO_NAMESPACE ImplementationRepository static ServerObject_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerObject_ptr _nil (void) @@ -184,14 +184,14 @@ TAO_NAMESPACE ImplementationRepository static void _tao_any_destructor (void*); virtual void ping ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void shutdown ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -199,7 +199,7 @@ TAO_NAMESPACE ImplementationRepository virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -249,7 +249,7 @@ TAO_NAMESPACE ImplementationRepository virtual ~_TAO_ServerObject_Proxy_Impl (void) { } virtual void ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -257,7 +257,7 @@ TAO_NAMESPACE ImplementationRepository virtual void shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -287,7 +287,7 @@ TAO_NAMESPACE ImplementationRepository virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { } virtual void ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -295,7 +295,7 @@ TAO_NAMESPACE ImplementationRepository virtual void shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -324,7 +324,7 @@ TAO_NAMESPACE ImplementationRepository virtual ~_TAO_ServerObject_Proxy_Broker (void); virtual _TAO_ServerObject_Proxy_Impl &select_proxy ( ServerObject *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -351,7 +351,7 @@ TAO_NAMESPACE ImplementationRepository virtual _TAO_ServerObject_Proxy_Impl &select_proxy ( ServerObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -961,7 +961,7 @@ TAO_NAMESPACE ImplementationRepository static ServerInformationIterator_ptr tao_nil (void); static ServerInformationIterator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1040,7 +1040,7 @@ TAO_NAMESPACE ImplementationRepository static Administration_ptr tao_nil (void); static Administration_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1104,12 +1104,12 @@ TAO_NAMESPACE ImplementationRepository static Administration_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Administration_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Administration_ptr _nil (void) @@ -1144,12 +1144,12 @@ TAO_NAMESPACE ImplementationRepository virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static AlreadyRegistered *_downcast (CORBA::Exception *); @@ -1191,12 +1191,12 @@ static CORBA::TypeCode_ptr _tc_AlreadyRegistered; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CannotActivate *_downcast (CORBA::Exception *); @@ -1240,12 +1240,12 @@ static CORBA::TypeCode_ptr _tc_CannotActivate; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NotFound *_downcast (CORBA::Exception *); @@ -1263,7 +1263,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void activate_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1274,7 +1274,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1284,7 +1284,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1292,7 +1292,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void remove_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1301,7 +1301,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void shutdown_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1312,7 +1312,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1321,7 +1321,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1331,7 +1331,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1342,7 +1342,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1350,7 +1350,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1401,7 +1401,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1413,7 +1413,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1424,7 +1424,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1433,7 +1433,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1443,7 +1443,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1455,7 +1455,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1465,7 +1465,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1476,7 +1476,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1488,7 +1488,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1519,7 +1519,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1531,7 +1531,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1542,7 +1542,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1551,7 +1551,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1561,7 +1561,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1573,7 +1573,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1583,7 +1583,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1594,7 +1594,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1606,7 +1606,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1635,7 +1635,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual ~_TAO_Administration_Proxy_Broker (void); virtual _TAO_Administration_Proxy_Impl &select_proxy ( Administration *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -1662,7 +1662,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual _TAO_Administration_Proxy_Impl &select_proxy ( Administration *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1710,12 +1710,12 @@ static CORBA::TypeCode_ptr _tc_NotFound; static ServerInformationIterator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerInformationIterator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerInformationIterator_ptr _nil (void) @@ -1728,14 +1728,14 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1743,7 +1743,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1795,7 +1795,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1803,7 +1803,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1835,7 +1835,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1843,7 +1843,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1872,7 +1872,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void); virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( ServerInformationIterator *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -1899,7 +1899,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( ServerInformationIterator *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i index a5339a82670..38a7ee435f5 100644 --- a/TAO/tao/PortableServer/ImplRepoC.i +++ b/TAO/tao/PortableServer/ImplRepoC.i @@ -50,10 +50,10 @@ tao_ImplementationRepository_ServerObject_nil ( ACE_INLINE ImplementationRepository::ServerObject_ptr tao_ImplementationRepository_ServerObject_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ImplementationRepository::ServerObject::_narrow (p TAO_ENV_ARG_PARAMETER); + return ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1490,10 +1490,10 @@ tao_ImplementationRepository_Administration_nil ( ACE_INLINE ImplementationRepository::Administration_ptr tao_ImplementationRepository_Administration_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ImplementationRepository::Administration::_narrow (p TAO_ENV_ARG_PARAMETER); + return ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1551,10 +1551,10 @@ tao_ImplementationRepository_ServerInformationIterator_nil ( ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr tao_ImplementationRepository_ServerInformationIterator_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ImplementationRepository::ServerInformationIterator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp index b5c96026e3c..137f40dfade 100644 --- a/TAO/tao/PortableServer/ImplRepoS.cpp +++ b/TAO/tao/PortableServer/ImplRepoS.cpp @@ -160,31 +160,31 @@ public: TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -201,31 +201,31 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::ServerObject *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -233,13 +233,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TA CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -247,7 +247,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (TAO_EN char * TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -257,10 +257,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_de CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo @@ -269,31 +269,31 @@ public: TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -310,31 +310,31 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_Server TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::ServerObject *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -342,13 +342,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -356,7 +356,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (TA char * TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -366,10 +366,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_mos CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -402,17 +402,17 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_ ImplementationRepository::_TAO_ServerObject_Proxy_Impl& POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select_proxy ( ::ImplementationRepository::ServerObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -422,7 +422,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select void POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -501,7 +501,7 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerO void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -515,7 +515,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping ( _collocated_tao_target_->_object_key (), "ping", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -524,14 +524,14 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping ( "IDL:ImplementationRepository/ServerObject:1.0" ) )->ping ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -545,7 +545,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow _collocated_tao_target_->_object_key (), "shutdown", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -554,7 +554,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow "IDL:ImplementationRepository/ServerObject:1.0" ) )->shutdown ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } @@ -573,7 +573,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerOb void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -583,14 +583,14 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping ( POA_ImplementationRepository::ServerObject_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0") )->ping ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -600,7 +600,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown POA_ImplementationRepository::ServerObject_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0") )->shutdown ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -629,7 +629,7 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerObject *_tao_impl = @@ -650,24 +650,24 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->ping ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -675,12 +675,12 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -701,7 +701,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerObject *_tao_impl = @@ -722,24 +722,24 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->shutdown ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -747,12 +747,12 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -773,7 +773,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -783,7 +783,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -796,11 +796,11 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -813,7 +813,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; @@ -832,7 +832,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -859,10 +859,10 @@ void POA_ImplementationRepository::ServerObject::_interface_skel ( CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -884,12 +884,12 @@ void* POA_ImplementationRepository::ServerObject::_downcast ( return 0; } -void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -899,9 +899,9 @@ const char* POA_ImplementationRepository::ServerObject::_interface_repository_id } ImplementationRepository::ServerObject* -POA_ImplementationRepository::ServerObject::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -1045,31 +1045,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1088,7 +1088,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::T TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1096,12 +1096,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::T {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1117,12 +1117,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::a } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1146,13 +1146,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1160,7 +1160,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::r char * TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1170,10 +1170,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::t CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo @@ -1185,31 +1185,31 @@ public: , const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1230,7 +1230,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T POA_ImplementationRepository::Administration *tao_impl, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1239,12 +1239,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1263,12 +1263,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::a } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1291,13 +1291,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1305,7 +1305,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::r char * TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1315,10 +1315,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::t CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo @@ -1330,31 +1330,31 @@ public: , const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1375,7 +1375,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: POA_ImplementationRepository::Administration *tao_impl, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1384,12 +1384,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1408,12 +1408,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -1421,13 +1421,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1435,7 +1435,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: char * TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1445,10 +1445,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo @@ -1459,31 +1459,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1502,7 +1502,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1510,12 +1510,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1531,12 +1531,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arg } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1559,13 +1559,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1573,7 +1573,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::res char * TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1583,10 +1583,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::tar CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo @@ -1597,31 +1597,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1640,7 +1640,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::T TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1648,12 +1648,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::T {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1669,12 +1669,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::a } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1697,13 +1697,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1711,7 +1711,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::r char * TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1721,10 +1721,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::t CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo @@ -1737,31 +1737,31 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -1785,7 +1785,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1795,12 +1795,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1822,12 +1822,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1850,13 +1850,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1868,7 +1868,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: char * TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1878,10 +1878,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1899,31 +1899,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1942,7 +1942,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1950,12 +1950,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1971,12 +1971,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1999,13 +1999,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2013,7 +2013,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting char * TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2023,10 +2023,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo @@ -2037,31 +2037,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2080,7 +2080,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRe TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2088,12 +2088,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2109,12 +2109,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (T } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2137,13 +2137,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions ( CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2151,7 +2151,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (TAO_ char * TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2161,10 +2161,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_ CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo @@ -2176,31 +2176,31 @@ public: , const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2220,7 +2220,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2229,12 +2229,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2251,12 +2251,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (T } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -2264,13 +2264,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions ( CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2278,7 +2278,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (TAO_ char * TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2288,10 +2288,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_ CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -2324,17 +2324,17 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TA ImplementationRepository::_TAO_Administration_Proxy_Impl& POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::select_proxy ( ::ImplementationRepository::Administration *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -2344,7 +2344,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::sele void POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2424,7 +2424,7 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Admin void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2440,7 +2440,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ _collocated_tao_target_->_object_key (), "activate_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2450,7 +2450,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ ) )->activate_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2459,7 +2459,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2474,7 +2474,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis _collocated_tao_target_->_object_key (), "register_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2485,7 +2485,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis )->register_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2494,7 +2494,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2508,7 +2508,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg _collocated_tao_target_->_object_key (), "reregister_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2519,7 +2519,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg )->reregister_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2527,7 +2527,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2542,7 +2542,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov _collocated_tao_target_->_object_key (), "remove_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2552,7 +2552,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov ) )->remove_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2560,7 +2560,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2575,7 +2575,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd _collocated_tao_target_->_object_key (), "shutdown_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2585,7 +2585,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd ) )->shutdown_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2595,7 +2595,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2612,7 +2612,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser _collocated_tao_target_->_object_key (), "server_is_running", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2624,14 +2624,14 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2646,7 +2646,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve _collocated_tao_target_->_object_key (), "server_is_shutting_down", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2656,7 +2656,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve ) )->server_is_shutting_down ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2665,7 +2665,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2680,7 +2680,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find _collocated_tao_target_->_object_key (), "find", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2691,7 +2691,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find )->find ( server, info - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2701,7 +2701,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2715,7 +2715,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list _collocated_tao_target_->_object_key (), "list", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2727,7 +2727,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list how_many, server_list, server_iterator - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2747,7 +2747,7 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Admini void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2760,7 +2760,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->activate_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2769,7 +2769,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2782,7 +2782,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist )->register_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2791,7 +2791,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2803,7 +2803,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi )->reregister_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2811,7 +2811,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2823,7 +2823,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->remove_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2831,7 +2831,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2843,7 +2843,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdo _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->shutdown_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2853,7 +2853,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2867,7 +2867,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2875,7 +2875,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2887,7 +2887,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->server_is_shutting_down ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2896,7 +2896,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2909,7 +2909,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find )->find ( server, info - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2919,7 +2919,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2932,7 +2932,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list how_many, server_list, server_iterator - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2961,7 +2961,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2990,25 +2990,25 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( _tao_upcall, _tao_impl, server.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->activate_server ( server.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3016,12 +3016,12 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3042,7 +3042,7 @@ void POA_ImplementationRepository::Administration::register_server_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3074,12 +3074,12 @@ void POA_ImplementationRepository::Administration::register_server_skel ( _tao_impl, server.in (), options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -3087,13 +3087,13 @@ void POA_ImplementationRepository::Administration::register_server_skel ( _tao_impl->register_server ( server.in (), options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3101,12 +3101,12 @@ void POA_ImplementationRepository::Administration::register_server_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3127,7 +3127,7 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3159,12 +3159,12 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( _tao_impl, server.in (), options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -3172,13 +3172,13 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( _tao_impl->reregister_server ( server.in (), options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3186,12 +3186,12 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3212,7 +3212,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3241,25 +3241,25 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( _tao_upcall, _tao_impl, server.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->remove_server ( server.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3267,12 +3267,12 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3293,7 +3293,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3322,25 +3322,25 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( _tao_upcall, _tao_impl, server.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->shutdown_server ( server.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3348,12 +3348,12 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3374,7 +3374,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3409,12 +3409,12 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( server.in (), addr.in (), server_object.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -3423,7 +3423,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( server.in (), addr.in (), server_object.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3432,7 +3432,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3440,12 +3440,12 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3473,7 +3473,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3502,25 +3502,25 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel _tao_upcall, _tao_impl, server.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->server_is_shutting_down ( server.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3528,12 +3528,12 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3554,7 +3554,7 @@ void POA_ImplementationRepository::Administration::find_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3583,12 +3583,12 @@ void POA_ImplementationRepository::Administration::find_skel ( _tao_upcall, _tao_impl, server.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -3596,13 +3596,13 @@ void POA_ImplementationRepository::Administration::find_skel ( _tao_impl->find ( server.in (), info.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3610,12 +3610,12 @@ void POA_ImplementationRepository::Administration::find_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3643,7 +3643,7 @@ void POA_ImplementationRepository::Administration::list_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3674,12 +3674,12 @@ void POA_ImplementationRepository::Administration::list_skel ( _tao_impl, how_many - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -3688,13 +3688,13 @@ void POA_ImplementationRepository::Administration::list_skel ( how_many, server_list.out (), server_iterator.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3702,12 +3702,12 @@ void POA_ImplementationRepository::Administration::list_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3736,7 +3736,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3746,7 +3746,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3759,11 +3759,11 @@ void POA_ImplementationRepository::Administration::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3776,7 +3776,7 @@ void POA_ImplementationRepository::Administration::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; @@ -3795,7 +3795,7 @@ void POA_ImplementationRepository::Administration::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -3822,10 +3822,10 @@ void POA_ImplementationRepository::Administration::_interface_skel ( CORBA::Boolean POA_ImplementationRepository::Administration::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -3847,12 +3847,12 @@ void* POA_ImplementationRepository::Administration::_downcast ( return 0; } -void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -3862,9 +3862,9 @@ const char* POA_ImplementationRepository::Administration::_interface_repository_ } ImplementationRepository::Administration* -POA_ImplementationRepository::Administration::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -3998,31 +3998,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl , const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -4042,7 +4042,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::ServerInformationIterator *tao_impl, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4050,12 +4050,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4071,12 +4071,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4084,13 +4084,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4102,7 +4102,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: char * TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4112,10 +4112,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4131,31 +4131,31 @@ public: TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4172,31 +4172,31 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::ServerInformationIterator *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; @@ -4204,13 +4204,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4218,7 +4218,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy char * TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4228,10 +4228,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -4264,17 +4264,17 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::select_proxy ( ::ImplementationRepository::ServerInformationIterator *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -4284,7 +4284,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B void POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -4365,7 +4365,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4381,7 +4381,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru _collocated_tao_target_->_object_key (), "next_n", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -4392,13 +4392,13 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru )->next_n ( how_many, server_list - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4412,7 +4412,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_ _collocated_tao_target_->_object_key (), "destroy", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -4421,7 +4421,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_ "IDL:ImplementationRepository/ServerInformationIterator:1.0" ) )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } @@ -4442,7 +4442,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4454,14 +4454,14 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire )->next_n ( how_many, server_list - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4471,7 +4471,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_I POA_ImplementationRepository::ServerInformationIterator_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0") )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4500,7 +4500,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4530,12 +4530,12 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( _tao_upcall, _tao_impl, how_many - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -4543,7 +4543,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( _tao_impl->next_n ( how_many, server_list.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4551,7 +4551,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4559,12 +4559,12 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4593,7 +4593,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = @@ -4614,24 +4614,24 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4639,12 +4639,12 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4665,7 +4665,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4675,7 +4675,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4688,11 +4688,11 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4705,7 +4705,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; @@ -4724,7 +4724,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -4751,10 +4751,10 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -4776,12 +4776,12 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast ( return 0; } -void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -4791,9 +4791,9 @@ const char* POA_ImplementationRepository::ServerInformationIterator::_interface_ } ImplementationRepository::ServerInformationIterator* -POA_ImplementationRepository::ServerInformationIterator::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h index 0926dcc5a9f..136d8d42c82 100644 --- a/TAO/tao/PortableServer/ImplRepoS.h +++ b/TAO/tao/PortableServer/ImplRepoS.h @@ -68,7 +68,7 @@ TAO_NAMESPACE POA_ImplementationRepository virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -79,37 +79,37 @@ TAO_NAMESPACE POA_ImplementationRepository TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::ImplementationRepository::ServerObject *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual void ping ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -119,11 +119,11 @@ TAO_NAMESPACE POA_ImplementationRepository TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void shutdown ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -133,7 +133,7 @@ TAO_NAMESPACE POA_ImplementationRepository TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -153,7 +153,7 @@ TAO_NAMESPACE POA_ImplementationRepository virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy ( ::ImplementationRepository::ServerObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -161,7 +161,7 @@ TAO_NAMESPACE POA_ImplementationRepository // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -200,7 +200,7 @@ TAO_NAMESPACE POA_ImplementationRepository virtual void ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -208,7 +208,7 @@ TAO_NAMESPACE POA_ImplementationRepository virtual void shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -237,7 +237,7 @@ public: virtual void ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -245,7 +245,7 @@ public: virtual void shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -279,7 +279,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -290,38 +290,38 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::ImplementationRepository::Administration *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual void activate_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -333,13 +333,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -350,13 +350,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -366,12 +366,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void remove_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -382,12 +382,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void shutdown_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -398,14 +398,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual char * server_is_running ( const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -416,12 +416,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -432,13 +432,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -449,14 +449,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -466,7 +466,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -486,7 +486,7 @@ public: virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy ( ::ImplementationRepository::Administration *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -494,7 +494,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -534,7 +534,7 @@ public: virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -546,7 +546,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -557,7 +557,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -566,7 +566,7 @@ public: virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -576,7 +576,7 @@ public: virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -588,7 +588,7 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -598,7 +598,7 @@ public: virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -609,7 +609,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -621,7 +621,7 @@ public: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -651,7 +651,7 @@ public: virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -663,7 +663,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -674,7 +674,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -683,7 +683,7 @@ public: virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -693,7 +693,7 @@ public: virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -705,7 +705,7 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -715,7 +715,7 @@ public: virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -726,7 +726,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -738,7 +738,7 @@ public: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -772,7 +772,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -783,31 +783,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::ImplementationRepository::ServerInformationIterator *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -815,7 +815,7 @@ public: virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -825,11 +825,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -839,7 +839,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -859,7 +859,7 @@ public: virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( ::ImplementationRepository::ServerInformationIterator *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -867,7 +867,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -908,7 +908,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -916,7 +916,7 @@ public: virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -947,7 +947,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -955,7 +955,7 @@ public: virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h index 82456cc70ec..676cbf18c73 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.h +++ b/TAO/tao/PortableServer/ImplRepoS_T.h @@ -63,17 +63,17 @@ TAO_NAMESPACE POA_ImplementationRepository // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); void ping ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void shutdown ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -119,11 +119,11 @@ TAO_NAMESPACE POA_ImplementationRepository // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); void activate_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -134,7 +134,7 @@ TAO_NAMESPACE POA_ImplementationRepository void register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -144,7 +144,7 @@ TAO_NAMESPACE POA_ImplementationRepository void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -152,7 +152,7 @@ TAO_NAMESPACE POA_ImplementationRepository void remove_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -161,7 +161,7 @@ TAO_NAMESPACE POA_ImplementationRepository void shutdown_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -172,7 +172,7 @@ TAO_NAMESPACE POA_ImplementationRepository const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -181,7 +181,7 @@ TAO_NAMESPACE POA_ImplementationRepository void server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -191,7 +191,7 @@ TAO_NAMESPACE POA_ImplementationRepository void find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -202,7 +202,7 @@ TAO_NAMESPACE POA_ImplementationRepository CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -248,19 +248,19 @@ TAO_NAMESPACE POA_ImplementationRepository // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i index f821198e58b..dc5b9eae4e1 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.i +++ b/TAO/tao/PortableServer/ImplRepoS_T.i @@ -90,37 +90,37 @@ POA_ImplementationRepository::ServerObject_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ServerObject::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ServerObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE void POA_ImplementationRepository::ServerObject_tie<T>::ping ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->ping ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::ServerObject_tie<T>::shutdown ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->shutdown ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -197,18 +197,18 @@ POA_ImplementationRepository::Administration_tie<T>::_is_owner (CORBA::Boolean b } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_ImplementationRepository::Administration_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::Administration_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->Administration::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->Administration::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::activate_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -218,7 +218,7 @@ void POA_ImplementationRepository::Administration_tie<T>::activate_server ( { this->ptr_->activate_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -226,7 +226,7 @@ template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -236,7 +236,7 @@ void POA_ImplementationRepository::Administration_tie<T>::register_server ( this->ptr_->register_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -244,7 +244,7 @@ template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -253,14 +253,14 @@ void POA_ImplementationRepository::Administration_tie<T>::reregister_server ( this->ptr_->reregister_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::remove_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -269,14 +269,14 @@ void POA_ImplementationRepository::Administration_tie<T>::remove_server ( { this->ptr_->remove_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::shutdown_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -285,7 +285,7 @@ void POA_ImplementationRepository::Administration_tie<T>::shutdown_server ( { this->ptr_->shutdown_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -294,7 +294,7 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running ( const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -305,14 +305,14 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running ( server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -321,7 +321,7 @@ void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_dow { this->ptr_->server_is_shutting_down ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -329,7 +329,7 @@ template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -339,7 +339,7 @@ void POA_ImplementationRepository::Administration_tie<T>::find ( this->ptr_->find ( server, info - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -348,7 +348,7 @@ void POA_ImplementationRepository::Administration_tie<T>::list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -358,7 +358,7 @@ void POA_ImplementationRepository::Administration_tie<T>::list ( how_many, server_list, server_iterator - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -435,19 +435,19 @@ POA_ImplementationRepository::ServerInformationIterator_tie<T>::_is_owner (CORBA } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ServerInformationIterator::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ServerInformationIterator::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -456,20 +456,20 @@ CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::n return this->ptr_->next_n ( how_many, server_list - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::ServerInformationIterator_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/tao/PortableServer/ImplRepo_i.cpp b/TAO/tao/PortableServer/ImplRepo_i.cpp index 492bea49049..4de7a2ece9e 100644 --- a/TAO/tao/PortableServer/ImplRepo_i.cpp +++ b/TAO/tao/PortableServer/ImplRepo_i.cpp @@ -17,21 +17,21 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb, } void -ServerObject_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerObject_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -ServerObject_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +ServerObject_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_ptr -ServerObject_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tao/PortableServer/ImplRepo_i.h b/TAO/tao/PortableServer/ImplRepo_i.h index c81aa13f92c..cf598c71b65 100644 --- a/TAO/tao/PortableServer/ImplRepo_i.h +++ b/TAO/tao/PortableServer/ImplRepo_i.h @@ -41,15 +41,15 @@ public: PortableServer::POA_ptr poa); /// Ping method. - void ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the server. - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns the default POA for this servant. - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); protected: /// Our ORB. We need this member in case we need to shutdown the diff --git a/TAO/tao/PortableServer/MessagingS.cpp b/TAO/tao/PortableServer/MessagingS.cpp index eda6af66a2d..0c1aa75efb2 100644 --- a/TAO/tao/PortableServer/MessagingS.cpp +++ b/TAO/tao/PortableServer/MessagingS.cpp @@ -186,17 +186,17 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::~_TAO_ReplyHandler_St Messaging::_TAO_ReplyHandler_Proxy_Impl& POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy ( ::Messaging::ReplyHandler *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -206,7 +206,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy ( void POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -319,7 +319,7 @@ void POA_Messaging::ReplyHandler::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -329,7 +329,7 @@ void POA_Messaging::ReplyHandler::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -342,11 +342,11 @@ void POA_Messaging::ReplyHandler::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -359,7 +359,7 @@ void POA_Messaging::ReplyHandler::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_object_reference; @@ -378,7 +378,7 @@ void POA_Messaging::ReplyHandler::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -405,10 +405,10 @@ void POA_Messaging::ReplyHandler::_interface_skel ( CORBA::Boolean POA_Messaging::ReplyHandler::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -430,12 +430,12 @@ void* POA_Messaging::ReplyHandler::_downcast ( return 0; } -void POA_Messaging::ReplyHandler::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_Messaging::ReplyHandler::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const @@ -444,9 +444,9 @@ const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const } Messaging::ReplyHandler* -POA_Messaging::ReplyHandler::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h index eb2af498df8..08763f1c1cf 100644 --- a/TAO/tao/PortableServer/MessagingS.h +++ b/TAO/tao/PortableServer/MessagingS.h @@ -76,7 +76,7 @@ TAO_NAMESPACE POA_Messaging virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -87,31 +87,31 @@ TAO_NAMESPACE POA_Messaging TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::Messaging::ReplyHandler *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -133,7 +133,7 @@ TAO_NAMESPACE POA_Messaging virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl &select_proxy ( ::Messaging::ReplyHandler *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -142,7 +142,7 @@ TAO_NAMESPACE POA_Messaging // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/tao/PortableServer/MessagingS_T.h b/TAO/tao/PortableServer/MessagingS_T.h index 5e44a56a7a3..95eafa8c5d8 100644 --- a/TAO/tao/PortableServer/MessagingS_T.h +++ b/TAO/tao/PortableServer/MessagingS_T.h @@ -49,7 +49,7 @@ TAO_NAMESPACE POA_Messaging // ctor with T*, ownership flag and a POA ~ReplyHandler_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -61,16 +61,16 @@ TAO_NAMESPACE POA_Messaging // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed ReplyHandler_tie (const ReplyHandler_tie &); void operator= (const ReplyHandler_tie &); diff --git a/TAO/tao/PortableServer/MessagingS_T.i b/TAO/tao/PortableServer/MessagingS_T.i index 84f75442fea..6dad8a7e540 100644 --- a/TAO/tao/PortableServer/MessagingS_T.i +++ b/TAO/tao/PortableServer/MessagingS_T.i @@ -23,30 +23,30 @@ template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE @@ -90,12 +90,12 @@ POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_Messaging::ReplyHandler_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ReplyHandler::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } #endif /* ACE_HAS_USING_KEYWORD */ diff --git a/TAO/tao/PortableServer/ORB_Manager.cpp b/TAO/tao/PortableServer/ORB_Manager.cpp index 752ac45da94..9dcf1405533 100644 --- a/TAO/tao/PortableServer/ORB_Manager.cpp +++ b/TAO/tao/PortableServer/ORB_Manager.cpp @@ -28,26 +28,26 @@ TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb, int TAO_ORB_Manager::init (int &argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return this->init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int TAO_ORB_Manager::init (int &argc, char **argv, const char *orb_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (this->orb_.in ())) { this->orb_ = CORBA::ORB_init (argc, argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -56,7 +56,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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (poa_object.in ())) @@ -67,7 +67,7 @@ TAO_ORB_Manager::init (int &argc, // Get the POA object. this->poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -76,7 +76,7 @@ TAO_ORB_Manager::init (int &argc, { // Get the POA_Manager. this->poa_manager_ = - this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -88,13 +88,13 @@ int TAO_ORB_Manager::init_child_poa (int& argc, char **argv, const char *poa_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return this->init_child_poa (argc, argv, poa_name, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int @@ -102,7 +102,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, char **argv, const char *poa_name, const char *orb_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int init_result; @@ -110,7 +110,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, init_result = this->init (argc, argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (init_result == -1) @@ -126,13 +126,13 @@ TAO_ORB_Manager::init_child_poa (int& argc, // Id Assignment policy policies[0] = this->poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Lifespan policy policies[1] = this->poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We use a different POA, otherwise the user would have to change @@ -142,7 +142,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, this->poa_->create_POA (poa_name, this->poa_manager_.in (), policies - TAO_ENV_ARG_PARAMETER); + 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); @@ -153,7 +153,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } return 0; @@ -162,9 +162,9 @@ TAO_ORB_Manager::init_child_poa (int& argc, // Activate POA manager. int -TAO_ORB_Manager::activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Manager::activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL) { - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } @@ -173,21 +173,21 @@ TAO_ORB_Manager::activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ORB_Manager::activate (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId_var id = this->poa_->activate_object (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = this->poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var str = this->orb_->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return str._retn (); @@ -195,20 +195,20 @@ TAO_ORB_Manager::activate (PortableServer::Servant servant void TAO_ORB_Manager::deactivate (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->orb_->string_to_object (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var object_id = this->poa_->reference_to_id (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_->deactivate_object (object_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // Activate the object with the object_name under the child POA. @@ -216,7 +216,7 @@ TAO_ORB_Manager::deactivate (const char *id char * TAO_ORB_Manager::activate_under_child_poa (const char *object_name, PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (object_name == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -229,17 +229,17 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name, this->child_poa_->activate_object_with_id (id.in (), servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = this->child_poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); char * str = this->orb_->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -248,46 +248,46 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name, void TAO_ORB_Manager::deactivate_under_child_poa (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->orb_->string_to_object (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var object_id = this->child_poa_->reference_to_id (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->child_poa_->deactivate_object (object_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // Enter the ORB event loop. int TAO_ORB_Manager::run (ACE_Time_Value &tv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -TAO_ORB_Manager::fini (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Manager::fini (ACE_ENV_SINGLE_ARG_DECL) { - this->poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->poa_ = 0; - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->orb_ = 0; @@ -295,12 +295,12 @@ TAO_ORB_Manager::fini (TAO_ENV_SINGLE_ARG_DECL) } int -TAO_ORB_Manager::run (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Manager::run (ACE_ENV_SINGLE_ARG_DECL) { - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -344,7 +344,7 @@ TAO_ORB_Manager::~TAO_ORB_Manager (void) { this->poa_->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tao/PortableServer/ORB_Manager.h b/TAO/tao/PortableServer/ORB_Manager.h index 7420662f37e..034708f4f11 100644 --- a/TAO/tao/PortableServer/ORB_Manager.h +++ b/TAO/tao/PortableServer/ORB_Manager.h @@ -64,7 +64,7 @@ public: */ int init (int &argc, char *argv[] - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Initialize the ORB/root POA, using the supplied command line * arguments or the default ORB components. @@ -74,7 +74,7 @@ public: int init (int &argc, char *argv[], const char *orb_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Creates a child poa under the root poa with PERSISTENT and @@ -86,7 +86,7 @@ public: int init_child_poa (int &argc, char *argv[], const char *poa_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Creates a child poa under the root poa with PERSISTENT and @@ -97,13 +97,13 @@ public: char *argv[], const char *poa_name, const char *orb_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Shut down. Invoke the destroy() methods on the orb and poa. * * @return -1 on failure, 0 on success */ - int fini (TAO_ENV_SINGLE_ARG_DECL); + int fini (ACE_ENV_SINGLE_ARG_DECL); /// Destructor. ~TAO_ORB_Manager (void); @@ -119,7 +119,7 @@ public: * * @return -1 on failure, 0 on success */ - int activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * Activate <servant>, using the POA <activate_object> call. Users @@ -130,7 +130,7 @@ public: * memory deallocation of the string. */ char *activate (PortableServer::Servant servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Deactivate object in RootPOA. * @@ -138,7 +138,7 @@ public: * of the servant to deactivate in the POA */ void deactivate (const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Precondition: init_child_poa has been called. Activate <servant> @@ -156,7 +156,7 @@ public: */ char *activate_under_child_poa (const char *object_name, PortableServer::Servant servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Deactivate object in child POA. * @@ -164,7 +164,7 @@ public: * the object to deactivate in the POA */ void deactivate_under_child_poa (const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Run the ORB event loop with the specified <tv> time value. * @@ -172,8 +172,8 @@ public: * @return -1 on failure, 0 on success */ int run (ACE_Time_Value &tv - TAO_ENV_ARG_DECL_WITH_DEFAULTS); - int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); + int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * Accessor which returns the ORB pointer. Following the normal diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp b/TAO/tao/PortableServer/ObjectReferenceFactory.cpp index baa47b7ea5d..02732b62984 100644 --- a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp +++ b/TAO/tao/PortableServer/ObjectReferenceFactory.cpp @@ -26,7 +26,7 @@ TAO_ObjectReferenceFactory::TAO_ObjectReferenceFactory (TAO_POA *poa) CORBA::Object * TAO_ObjectReferenceFactory::make_object (const char *intf, const PortableInterceptor::ObjectId & id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::OctetSeq object_id = id; @@ -39,7 +39,7 @@ TAO_ObjectReferenceFactory::make_object (const char *intf, CORBA::Object_var object = this->poa_->invoke_key_to_object (intf, *user_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object._retn (); diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.h b/TAO/tao/PortableServer/ObjectReferenceFactory.h index a47b3ef1a3a..4f6a75e3e9e 100644 --- a/TAO/tao/PortableServer/ObjectReferenceFactory.h +++ b/TAO/tao/PortableServer/ObjectReferenceFactory.h @@ -57,7 +57,7 @@ class TAO_PortableServer_Export TAO_ObjectReferenceFactory virtual CORBA::Object_ptr make_object ( const char * repository_id, const PortableInterceptor::ObjectId & id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void set_servant (PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp index f79f70d3e9a..25c44c8cdf7 100644 --- a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp @@ -26,7 +26,7 @@ TAO_ObjectReferenceTemplate::~TAO_ObjectReferenceTemplate (void) } char * -TAO_ObjectReferenceTemplate::server_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Priyanka, you're not conforming to the C++ mapping. Do a @@ -36,7 +36,7 @@ TAO_ObjectReferenceTemplate::server_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_ObjectReferenceTemplate::orb_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Priyanka, you're not conforming to the C++ mapping. Do a @@ -46,7 +46,7 @@ TAO_ObjectReferenceTemplate::orb_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableInterceptor::AdapterName * -TAO_ObjectReferenceTemplate::adapter_name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Priyanka, you're not conforming to the C++ mapping. You must @@ -62,7 +62,7 @@ CORBA::Object * TAO_ObjectReferenceTemplate::make_object ( const char * intf, const PortableInterceptor::ObjectId & id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) // @@ Priyanka, is this method supposed to have an exception // specification? { @@ -78,21 +78,21 @@ TAO_ObjectReferenceTemplate::make_object ( CORBA::Object_var object = this->poa_->invoke_key_to_object (intf, *user_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // @@ Priyanka, what purpose does this object_to_string() call // serve? Can't you remove it? CORBA::String_var ior = this->poa_->orb_core ().orb ()->object_to_string (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object._retn (); } void -TAO_ObjectReferenceTemplate::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ObjectReferenceTemplate::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // @@ Priyanka, this is a reference counted object. You cannot // directly call delete() on the instance. Use the reference diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h index 6941b59ab18..904dbc8f659 100644 --- a/TAO/tao/PortableServer/ObjectReferenceTemplate.h +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h @@ -62,22 +62,22 @@ class TAO_PortableServer_Export TAO_ObjectReferenceTemplate /// Destructor ~TAO_ObjectReferenceTemplate (void); - virtual char * server_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * orb_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::AdapterName * adapter_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Object_ptr make_object ( const char * repository_id, const PortableInterceptor::ObjectId & id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); private: diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 221f0f9fa6d..afeb5baca31 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -207,7 +207,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ void TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the default policies. @@ -215,42 +215,42 @@ TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies // Thread policy. TAO_Thread_Policy thread_policy (PortableServer::ORB_CTRL_MODEL); - policies.merge_policy (&thread_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&thread_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; #endif /* TAO_HAS_MINIMUM_POA == 0 */ // Lifespan policy. TAO_Lifespan_Policy lifespan_policy (PortableServer::TRANSIENT); - policies.merge_policy (&lifespan_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&lifespan_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // ID uniqueness policy. TAO_Id_Uniqueness_Policy id_uniqueness_policy (PortableServer::UNIQUE_ID); - policies.merge_policy (&id_uniqueness_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&id_uniqueness_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // ID assignment policy. TAO_Id_Assignment_Policy id_assignment_policy (PortableServer::SYSTEM_ID); - policies.merge_policy (&id_assignment_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&id_assignment_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if (TAO_HAS_MINIMUM_POA == 0) // Implicit activation policy. TAO_Implicit_Activation_Policy implicit_activation_policy (PortableServer::NO_IMPLICIT_ACTIVATION); - policies.merge_policy (&implicit_activation_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Servant retention policy. TAO_Servant_Retention_Policy servant_retention_policy (PortableServer::RETAIN); - policies.merge_policy (&servant_retention_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&servant_retention_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Request processing policy. TAO_Request_Processing_Policy request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY); - policies.merge_policy (&request_processing_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&request_processing_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; #endif /* TAO_HAS_MINIMUM_POA == 0 */ } @@ -295,7 +295,7 @@ int TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key, TAO_ServerRequest &req, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START); @@ -310,7 +310,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key, servant_upcall.prepare_for_upcall (key, operation, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result); if (result != TAO_Adapter::DS_OK) @@ -322,7 +322,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key, this->servant_dispatcher_->dispatch (servant_upcall, req - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result); } @@ -333,7 +333,7 @@ void TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key, PortableServer::ObjectId &system_id, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Object_Adapter::poa_name poa_system_name; CORBA::Boolean is_root = 0; @@ -366,7 +366,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key, is_root, poa_creation_time, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -377,7 +377,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key, int TAO_Object_Adapter::activate_poa (const poa_name &folded_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int result = -1; @@ -414,7 +414,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name, { current = parent->find_POA_i (*iterator, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::AdapterNonExistent, ex) @@ -432,7 +432,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name, #else ACE_UNUSED_ARG (folded_name); ACE_UNUSED_ARG (poa); - TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* TAO_HAS_MINIMUM_POA == 0 */ return result; @@ -443,7 +443,7 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name, CORBA::Boolean root, const TAO_Temporary_Creation_Time &poa_creation_time, TAO_POA *&poa - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int result = 0; @@ -492,7 +492,7 @@ TAO_Object_Adapter::unbind_poa (TAO_POA *poa, int TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId id; TAO_POA *poa = 0; @@ -500,14 +500,14 @@ TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key this->locate_poa (key, id, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::Servant servant = 0; TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id, servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); switch (servant_location) @@ -528,7 +528,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId id; TAO_POA *poa = 0; @@ -536,23 +536,23 @@ TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key, this->locate_poa (key, id, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND); TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id, servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND); return servant_location; } void -TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) +TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) { // Add in the default POA policies to the default list. this->init_default_policies (this->default_poa_policies () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // If a POA extension hasn't changed the servant dispatcher, initialize the @@ -572,7 +572,7 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) PortableServer::POAManager_var safe_poa_manager = poa_manager; // Set the default Server Protocol Policy. - this->set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_POA_Policy_Set policies (this->default_poa_policies ()); @@ -587,12 +587,12 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); policies.merge_policy (&implicit_activation_policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif /* TAO_HAS_MINIMUM_POA == 0 */ // Merge policies from the ORB level. this->validator ().merge_policies (policies.policies () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Construct a new POA @@ -606,7 +606,7 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) this->thread_lock (), this->orb_core_, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // The Object_Adapter will keep a reference to the Root POA so that @@ -621,7 +621,7 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Object_Adapter::set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Object_Adapter::set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_DECL) { TAO_Thread_Lane_Resources &default_lane_resources = this->orb_core_.thread_lane_resources_manager ().default_lane_resources (); @@ -630,19 +630,19 @@ TAO_Object_Adapter::set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL) default_lane_resources.acceptor_registry (); TAO_Protocols_Hooks *protocols_hooks = - this->orb_core_.get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_core_.get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; protocols_hooks->set_default_server_protocol_policy (acceptor_registry - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Object_Adapter::close (int wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->check_close (wait_for_completion TAO_ENV_ARG_PARAMETER); + this->check_close (wait_for_completion ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shutting down the ORB causes all object adapters to be destroyed, @@ -665,18 +665,18 @@ TAO_Object_Adapter::close (int wait_for_completion CORBA::Boolean etherealize_objects = 1; root->destroy (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::release (root); } void TAO_Object_Adapter::check_close (int wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_POA::check_for_valid_wait_for_completions (this->orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -690,7 +690,7 @@ int TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::memcmp (key.get_buffer (), @@ -714,7 +714,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, // The receive_request_service_contexts() interception point // must be invoked before the operation is dispatched to the // servant. - sri_adapter.receive_request_service_contexts (&ri TAO_ENV_ARG_PARAMETER); + sri_adapter.receive_request_service_contexts (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If a PortableInterceptor::ForwardRequest exception was @@ -722,7 +722,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, // with the appropriate return status. if (sri_adapter.location_forwarded ()) { - forward_to = ri.forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER); + forward_to = ri.forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return TAO_Adapter::DS_FORWARD; @@ -732,7 +732,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, result = this->dispatch_servant (key, request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #if TAO_HAS_INTERCEPTORS == 1 ACE_TRY_CHECK; @@ -741,7 +741,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, { ri.forward_reference (forward_to.ptr ()); sri_adapter.send_other (&ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -750,11 +750,11 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, ri.exception (&ACE_ANY_EXCEPTION); sri_adapter.send_exception (&ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Only re-throw the exception if it hasn't been transformed by @@ -799,7 +799,7 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub, TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0) continue; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_ServantBase *servant = 0; @@ -807,7 +807,7 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub, TAO_SERVANT_LOCATION servant_location = this->find_servant (objkey.in (), servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (servant_location != TAO_SERVANT_NOT_FOUND) @@ -895,7 +895,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void) int TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { poa_name folded_name; int result = this->persistent_poa_system_map_.recover_key (system_name, @@ -914,7 +914,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &s { result = this->object_adapter_->activate_poa (folded_name, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } } @@ -969,7 +969,7 @@ TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void) int TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int result = this->object_adapter_->persistent_poa_name_map_->find (system_name, poa); @@ -978,7 +978,7 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &syste result = this->object_adapter_->activate_poa (system_name, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -1127,7 +1127,7 @@ TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void) { ACE_TRY_NEW_ENV { - this->poa_.complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_.complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1169,7 +1169,7 @@ int TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key, const char *operation, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Acquire the object adapter lock first. int result = this->object_adapter_->lock ().acquire (); @@ -1185,18 +1185,18 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key // 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. - this->object_adapter_->wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER); + 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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); // Check the state of the POA Manager. - this->poa_->check_poa_manager_state (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_->check_poa_manager_state (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); // Setup current for this request. @@ -1219,7 +1219,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key this->system_id_, *this, this->current_context_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } #if (TAO_HAS_MINIMUM_CORBA == 0) @@ -1254,7 +1254,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key this->state_ = OBJECT_ADAPTER_LOCK_RELEASED; // Serialize servants (if appropriate). - this->single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_PARAMETER); + this->single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); // We have acquired the servant lock. Record this for later use. @@ -1266,7 +1266,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key TAO_POA * TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Acquire the object adapter lock first. int result = this->object_adapter_->lock ().acquire (); @@ -1282,14 +1282,14 @@ TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key // 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. - this->object_adapter_->wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER); + 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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->poa_; @@ -1401,7 +1401,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void) if (this->using_servant_locator_) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->poa_->servant_locator_->postinvoke (this->current_context_.object_id (), @@ -1409,7 +1409,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void) this->operation_, this->cookie_, this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1423,7 +1423,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void) } void -TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_DECL) +TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL) { #if (TAO_HAS_MINIMUM_POA == 0) // Serialize servants (if necessary). @@ -1443,7 +1443,7 @@ TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (TAO_ENV_SINGLE_AR ACE_THROW (CORBA::OBJ_ADAPTER ()); } #else - TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* !TAO_HAS_MINIMUM_POA == 0 */ } @@ -1468,11 +1468,11 @@ TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void) if (new_count == 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->poa_->cleanup_servant (this->active_object_map_entry_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1521,7 +1521,7 @@ TAO_Object_Adapter::Servant_Upcall::poa_cleanup (void) { ACE_TRY_NEW_ENV { - this->poa_->complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1587,7 +1587,7 @@ TAO_POA_Current_Impl::teardown (void) } PortableServer::POA_ptr -TAO_POA_Current_Impl::get_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA_Current_Impl::get_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -1595,7 +1595,7 @@ TAO_POA_Current_Impl::get_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableServer::ObjectId * -TAO_POA_Current_Impl::get_object_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA_Current_Impl::get_object_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -1616,7 +1616,7 @@ TAO_POA_Current_Impl::orb_core (void) const } PortableServer::POA_ptr -TAO_POA_Current::get_POA (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Current::get_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -1625,11 +1625,11 @@ TAO_POA_Current::get_POA (TAO_ENV_SINGLE_ARG_DECL) if (impl == 0) ACE_THROW_RETURN (PortableServer::Current::NoContext (), 0); - return impl->get_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::ObjectId * -TAO_POA_Current::get_object_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Current::get_object_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -1638,7 +1638,7 @@ TAO_POA_Current::get_object_id (TAO_ENV_SINGLE_ARG_DECL) if (impl == 0) ACE_THROW_RETURN (PortableServer::Current::NoContext (), 0); - return impl->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); } TAO_POA_Current_Impl * diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 5b7994f8d89..b75ba21b3c3 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -73,14 +73,14 @@ public: TAO_POA_Current (void); // Constructor - PortableServer::POA_ptr get_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); // Returns the POA on which the current request is being invoked. // Can raise the <CORBA::NoContext> exception if this function is // not invoked in the context of an upcall. - PortableServer::ObjectId *get_object_id (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); // Returns the object id of the current request being invoked. Can @@ -119,13 +119,13 @@ public: friend class TAO_POA; - PortableServer::POA_ptr get_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); // Return pointer to the invoking POA. Raises the // <CORBA::NoContext> exception. - PortableServer::ObjectId *get_object_id (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); // Return pointer to the object id through which this was invoked. @@ -234,21 +234,21 @@ public: int dispatch_servant (const TAO_ObjectKey &key, TAO_ServerRequest &req, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int locate_servant (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_SERVANT_LOCATION find_servant (const TAO_ObjectKey &key, PortableServer::Servant &servant - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int find_poa (const poa_name &system_name, CORBA::Boolean activate_it, CORBA::Boolean root, const TAO_Temporary_Creation_Time &poa_creation_time, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int bind_poa (const poa_name &folded_name, TAO_POA *poa, @@ -260,7 +260,7 @@ public: int activate_poa (const poa_name &folded_name, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_Lock &lock (void); @@ -295,20 +295,20 @@ public: /// Initialize the default set of POA policies. void init_default_policies (TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The TAO_Adapter methods, please check tao/Adapter.h for the // documentation - virtual void open (TAO_ENV_SINGLE_ARG_DECL); + virtual void open (ACE_ENV_SINGLE_ARG_DECL); virtual void close (int wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void check_close (int wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int priority (void) const; virtual int dispatch (TAO_ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out foward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual const char *name (void) const; virtual CORBA::Object_ptr root (void); @@ -318,31 +318,31 @@ public: protected: int locate_servant_i (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_SERVANT_LOCATION find_servant_i (const TAO_ObjectKey &key, PortableServer::Servant &servant - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void dispatch_servant_i (const TAO_ObjectKey &key, TAO_ServerRequest &req, void *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void locate_poa (const TAO_ObjectKey &key, PortableServer::ObjectId &id, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int find_transient_poa (const poa_name &system_name, CORBA::Boolean root, const TAO_Temporary_Creation_Time &poa_creation_time, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int bind_transient_poa (TAO_POA *poa, poa_name_out system_name); @@ -356,7 +356,7 @@ protected: int unbind_persistent_poa (const poa_name &folded_name, const poa_name &system_name); - void set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL); + void set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_DECL); static ACE_Lock *create_lock (int enable_locking, TAO_SYNCH_MUTEX &thread_lock); @@ -377,7 +377,7 @@ public: virtual int find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual int bind_persistent_poa (const poa_name &folded_name, TAO_POA *poa, @@ -410,7 +410,7 @@ public: virtual int find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int bind_persistent_poa (const poa_name &folded_name, TAO_POA *poa, @@ -444,7 +444,7 @@ public: virtual int find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int bind_persistent_poa (const poa_name &folded_name, TAO_POA *poa, @@ -634,11 +634,11 @@ public: int prepare_for_upcall (const TAO_ObjectKey &key, const char *operation, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Locate POA and servant. TAO_POA *lookup_POA (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Locate POA. TAO_POA &poa (void) const; @@ -689,7 +689,7 @@ public: protected: void servant_locator_cleanup (void); - void single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_DECL); + void single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL); void single_threaded_poa_cleanup (void); void servant_cleanup (void); void poa_cleanup (void); diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i index 1bbfebe3018..f472c0c0247 100644 --- a/TAO/tao/PortableServer/Object_Adapter.i +++ b/TAO/tao/PortableServer/Object_Adapter.i @@ -45,36 +45,36 @@ TAO_Object_Adapter::transient_poa_name_size () ACE_INLINE int TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Lock access for the duration of this transaction. TAO_OBJECT_ADAPTER_GUARD_RETURN (-1); return this->locate_servant_i (key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE TAO_SERVANT_LOCATION TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key, PortableServer::Servant &servant - TAO_ENV_ARG_DECL) + 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE int TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return this->hint_strategy_->find_persistent_poa (system_name, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE int @@ -83,13 +83,13 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name, CORBA::Boolean root, const TAO_Temporary_Creation_Time &poa_creation_time, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (activate_it) { return this->find_persistent_poa (system_name, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { @@ -97,7 +97,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name, root, poa_creation_time, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index 787e3f0efcc..b1a4e99f340 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -377,7 +377,7 @@ template class TAO_Singleton<TAO_Operation_Table_Parameters, TAO_SYNCH_RECURSIVE // This is necessary with g++ 2.91.66 to avoid a couple of strange // unresolved ACE_Hash_Map_Entry symbols. (Strange because c++filt // can't demangle them.) -template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, void *, void * TAO_ENV_ARG_DECL_NOT_USED)>; +template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, void *, void * ACE_ENV_ARG_DECL_NOT_USED)>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index c8a6084c081..57cbe5236e5 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -61,7 +61,7 @@ TAO_POA::_tao_poa_downcast(void) PortableServer::ThreadPolicy_ptr TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Thread_Policy *thread_policy = 0; @@ -77,7 +77,7 @@ TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value PortableServer::LifespanPolicy_ptr TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Lifespan_Policy *lifespan_policy = 0; @@ -91,7 +91,7 @@ TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value PortableServer::IdUniquenessPolicy_ptr TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Uniqueness_Policy *id_uniqueness_policy = 0; @@ -105,7 +105,7 @@ TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va PortableServer::IdAssignmentPolicy_ptr TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Assignment_Policy *id_assignment_policy = 0; @@ -121,7 +121,7 @@ TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va PortableServer::ImplicitActivationPolicy_ptr TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Implicit_Activation_Policy *implicit_activation_policy = 0; @@ -135,7 +135,7 @@ TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo PortableServer::ServantRetentionPolicy_ptr TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Servant_Retention_Policy *servant_retention_policy = 0; @@ -149,7 +149,7 @@ TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy PortableServer::RequestProcessingPolicy_ptr TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Request_Processing_Policy *request_processing_policy = 0; @@ -166,7 +166,7 @@ TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPoli void TAO_POA::set_obj_ref_factory ( PortableInterceptor::ObjectReferenceFactory *current_factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ Priyanka, I have no idea what you're doing here. @@ -209,7 +209,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : name_ (name), poa_manager_ (poa_manager), policy_list_ (0), @@ -260,7 +260,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, // Parse the policies that are used in the critical path in // a cache. this->cached_policies_.update (this->policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if (TAO_HAS_MINIMUM_POA == 1) @@ -290,7 +290,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID, this->persistent (), this->orb_core_.server_factory ()->active_object_map_creation_parameters () - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); // Give ownership of the new map to the auto pointer. Note, that it @@ -349,7 +349,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, { int temp = this->use_imr_; this->use_imr_ = 0; - this->imr_notify_startup (TAO_ENV_SINGLE_ARG_PARAMETER); + this->imr_notify_startup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->use_imr_ = temp; } @@ -382,7 +382,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, TAO_ObjectReferenceTemplate ( server_id.in (), orb_id.in (), - this->adapter_name (TAO_ENV_SINGLE_ARG_PARAMETER), + this->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER), this), CORBA::NO_MEMORY ()); // @@ Priyanka, where's the ACE_CHECK? @@ -390,13 +390,13 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, this->ort_template_ = ort_template; this->set_obj_ref_factory (this->ort_template_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // @@ Priyanka, where's the ACE_CHECK? // 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->tao_establish_components (TAO_ENV_SINGLE_ARG_PARAMETER); + this->tao_establish_components (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -407,7 +407,7 @@ TAO_POA::~TAO_POA (void) } void -TAO_POA::complete_destruction_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL) { // No longer awaiting destruction. this->waiting_destruction_ = 0; @@ -469,7 +469,7 @@ PortableServer::POA_ptr TAO_POA::create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -480,12 +480,12 @@ TAO_POA::create_POA_i (const char *adapter_name, // Merge policies from the ORB level. this->object_adapter ().validator ().merge_policies (tao_policies.policies () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Merge in any policies that the user may have specified. tao_policies.merge_policies (policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // If any of the policy objects specified are not valid for the ORB @@ -496,7 +496,7 @@ TAO_POA::create_POA_i (const char *adapter_name, // policies parameter value of the first offending policy object. tao_policies.validate_policies (this->object_adapter ().validator (), this->orb_core_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // If the poa_manager parameter is null, a new POAManager object is @@ -521,7 +521,7 @@ TAO_POA::create_POA_i (const char *adapter_name, TAO_POA *poa = this->create_POA_i (adapter_name, *tao_poa_manager, tao_policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); return PortableServer::POA::_duplicate (poa); @@ -536,7 +536,7 @@ TAO_POA::new_POA (const String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_POA *poa; @@ -549,7 +549,7 @@ TAO_POA::new_POA (const String &name, thread_lock, orb_core, object_adapter - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -560,7 +560,7 @@ TAO_POA * TAO_POA::create_POA_i (const TAO_POA::String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -596,7 +596,7 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name, this->object_adapter ().thread_lock (), this->orb_core_, this->object_adapter_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Give ownership of the new map to the POA_var. Note, that it // is important for the POA_var to take ownership before @@ -638,7 +638,7 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name, PortableServer::POA_ptr TAO_POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)) { @@ -657,7 +657,7 @@ TAO_POA::find_POA (const char *adapter_name, TAO_POA *poa = this->find_POA_i (adapter_name, activate_it - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); return PortableServer::POA::_duplicate (poa); @@ -666,7 +666,7 @@ TAO_POA::find_POA (const char *adapter_name, TAO_POA * TAO_POA::find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)) { @@ -683,13 +683,13 @@ TAO_POA::find_POA_i (const ACE_CString &child_name, if (!CORBA::is_nil (this->adapter_activator_.in ())) { // Check the state of the POA Manager. - this->check_poa_manager_state (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_poa_manager_state (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean success = this->adapter_activator_->unknown_adapter (this, child_name.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (success) @@ -731,7 +731,7 @@ TAO_POA::find_POA_i (const ACE_CString &child_name, void TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->cleanup_in_progress_) @@ -740,7 +740,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (this->orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->cleanup_in_progress_ = 1; @@ -796,7 +796,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, child_poa->destroy_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -814,15 +814,15 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, TAO_POA *tao_poa = 0; PortableServer::POA_var poa = - this->server_object_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_object_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; tao_poa = poa->_tao_poa_downcast(); PortableServer::ObjectId_var id = - tao_poa->servant_to_id_i (this->server_object_ TAO_ENV_ARG_PARAMETER); + tao_poa->servant_to_id_i (this->server_object_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - tao_poa->deactivate_object_i (id.in ()TAO_ENV_ARG_PARAMETER); + tao_poa->deactivate_object_i (id.in ()ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -842,7 +842,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, this->deactivate_all_objects_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // If there are no outstanding requests and that we are not in a @@ -854,7 +854,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, (non_servant_upcall_in_progress == 0 || &non_servant_upcall_in_progress->poa () != this)) { - this->complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->adapter_state_ = PortableInterceptor::NON_EXISTENT; @@ -888,7 +888,7 @@ TAO_POA::delete_child (const TAO_POA::String &child) } PortableServer::POAList * -TAO_POA::the_children_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAList_var children; @@ -918,7 +918,7 @@ TAO_POA::the_children_i (TAO_ENV_SINGLE_ARG_DECL) // TypeCodes! // CORBA::StringSeq * -TAO_POA::adapter_name_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { /// The adapter name is the sequence of names starting from the @@ -939,7 +939,7 @@ TAO_POA::adapter_name_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::StringSeq_var safe_args (name_seq); CORBA::String_var current_poa_name = - this->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + this->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong name_seq_length = 0; @@ -963,11 +963,11 @@ TAO_POA::adapter_name_i (TAO_ENV_SINGLE_ARG_DECL) /// Make the parent name as the current_poa_name /// Go up the ladder by one parent ;-) PortableServer::POA_var current_poa_name_parent = - current_poa->the_parent (TAO_ENV_SINGLE_ARG_PARAMETER); + current_poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); current_poa_name = - current_poa_name_parent->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + current_poa_name_parent->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); current_poa = @@ -991,7 +991,7 @@ TAO_POA::set_mprofile (TAO_MProfile *mprofile) void TAO_POA::tao_add_ior_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles. @@ -1002,7 +1002,7 @@ TAO_POA::tao_add_ior_component (const IOP::TaggedComponent &component { TAO_Profile *profile = this->mprofile_->get_profile (i); - profile->add_tagged_component (component TAO_ENV_ARG_PARAMETER); + profile->add_tagged_component (component ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1012,7 +1012,7 @@ void TAO_POA::tao_add_ior_component_to_profile ( const IOP::TaggedComponent &component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles matching the given @@ -1027,7 +1027,7 @@ TAO_POA::tao_add_ior_component_to_profile ( if (profile->tag () == profile_id) { - profile->add_tagged_component (component TAO_ENV_ARG_PARAMETER); + profile->add_tagged_component (component ACE_ENV_ARG_PARAMETER); ACE_CHECK; found_profile = 1; @@ -1066,7 +1066,7 @@ adapter_state_changed (const PortableInterceptor::ObjectReferenceTemplateSeq *se #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ServantManager_ptr -TAO_POA::get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1089,7 +1089,7 @@ TAO_POA::get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1105,7 +1105,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr if (this->cached_policies_.servant_retention () == PortableServer::RETAIN) { this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->servant_activator_.in ())) @@ -1116,7 +1116,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr else { this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->servant_locator_.in ())) @@ -1127,7 +1127,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr } PortableServer::Servant -TAO_POA::get_servant_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::get_servant_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)) @@ -1163,7 +1163,7 @@ TAO_POA::get_servant_i (TAO_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. - result->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + result->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result; @@ -1179,7 +1179,7 @@ TAO_POA::get_servant_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_POA::set_servant_i (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1212,7 +1212,7 @@ TAO_POA::set_servant_i (PortableServer::Servant servant TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this); ACE_UNUSED_ARG (non_servant_upcall); - servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -1300,7 +1300,7 @@ TAO_POA::is_user_id_in_map (const PortableServer::ObjectId &id, PortableServer::ObjectId * TAO_POA::activate_object_i (PortableServer::Servant servant, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) @@ -1354,7 +1354,7 @@ TAO_POA::activate_object_i (PortableServer::Servant servant, // 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return user_id._retn (); @@ -1364,7 +1364,7 @@ void TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -1452,29 +1452,29 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, // _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 (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { this->deactivate_all_objects_i (etherealize_objects - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->wait_for_completions (wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { while (this->object_adapter ().enable_locking_ && wait_for_completion && @@ -1494,7 +1494,7 @@ TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion void TAO_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (wait_for_completion) { @@ -1530,7 +1530,7 @@ TAO_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core, void TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1580,14 +1580,14 @@ TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects ++i) { this->deactivate_map_entry (map_entries[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -1611,13 +1611,13 @@ TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id } this->deactivate_map_entry (active_object_map_entry - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Decrement the reference count. CORBA::UShort new_count = --active_object_map_entry->reference_count_; @@ -1625,7 +1625,7 @@ TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_m if (new_count == 0) { this->cleanup_servant (active_object_map_entry - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -1647,7 +1647,7 @@ TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_m void TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If a servant manager is associated with the POA, // ServantLocator::etherealize will be invoked with the oid and the @@ -1702,7 +1702,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en active_object_map_entry->servant_, this->cleanup_in_progress_, remaining_activations - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -1721,7 +1721,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this); ACE_UNUSED_ARG (non_servant_upcall); - active_object_map_entry->servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + active_object_map_entry->servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -1738,7 +1738,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en } void -TAO_POA::check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POAManager::State state = this->poa_manager_.get_state_i (); @@ -1812,7 +1812,7 @@ TAO_POA::check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_ptr TAO_POA::create_reference_i (const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1868,7 +1868,7 @@ TAO_POA::create_reference_i (const char *intf CORBA::Object_var object = this->obj_ref_factory_->make_object (intf, *obj_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object._retn (); @@ -1877,7 +1877,7 @@ TAO_POA::create_reference_i (const char *intf CORBA::Object_ptr TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1906,7 +1906,7 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, CORBA::Object_var obj_ptr = this->obj_ref_factory_->make_object (intf, *obj_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return obj_ptr._retn (); @@ -1914,7 +1914,7 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, PortableServer::ObjectId * TAO_POA::servant_to_id_i (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -1981,7 +1981,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant // 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return user_id._retn (); @@ -2012,7 +2012,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant if (poa_current_impl != 0 && servant == poa_current_impl->servant ()) { - return poa_current_impl->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER); + return poa_current_impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); } } } @@ -2027,7 +2027,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant PortableServer::ObjectId * TAO_POA::servant_to_system_id_i (PortableServer::Servant servant, CORBA::Short &priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -2094,7 +2094,7 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant, // 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return system_id._retn (); @@ -2107,7 +2107,7 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant, CORBA::Object_ptr TAO_POA::servant_to_reference (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -2123,7 +2123,7 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant PortableServer::ObjectId_var id = this->servant_to_system_id (servant, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ObjectId user_id; @@ -2145,7 +2145,7 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant CORBA::Object_var object = this->obj_ref_factory_->make_object (servant->_interface_repository_id (), *obj_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object._retn (); @@ -2153,7 +2153,7 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant PortableServer::Servant TAO_POA::reference_to_servant (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, @@ -2181,7 +2181,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference // servant associated with that object in the Active Object Map. if (this->cached_policies_.servant_retention () == PortableServer::RETAIN) { - TAO_ObjectKey_var key = reference->_key (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // If the object reference was not created by this POA, the @@ -2256,7 +2256,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference // _remove_ref on the returned Servant if the type of the // Servant uses the default reference counting inherited // from ServantBase. - servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return servant; @@ -2301,7 +2301,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference // _remove_ref on the returned Servant if the type of the // Servant uses the default reference counting inherited // from ServantBase. - result->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + result->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result; @@ -2322,7 +2322,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference PortableServer::ObjectId * TAO_POA::reference_to_id (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)) @@ -2343,7 +2343,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference // POA on which the operation is being performed. If the object // reference was not created by this POA, the WrongAdapter exception // is raised. - TAO_ObjectKey_var key = reference->_key (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); PortableServer::ObjectId system_id; @@ -2402,7 +2402,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference PortableServer::Servant TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -2440,7 +2440,7 @@ TAO_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return servant; @@ -2455,7 +2455,7 @@ TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id CORBA::Object_ptr TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -2488,7 +2488,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id servant, 1, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else // If the Object Id value is not active in the POA, an @@ -2500,7 +2500,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id } CORBA::OctetSeq * -TAO_POA::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return new CORBA::OctetSeq (this->id_); @@ -2509,7 +2509,7 @@ TAO_POA::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) TAO_SERVANT_LOCATION TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If the POA has the RETAIN policy, the POA looks in the Active // Object Map to find if there is a servant associated with the @@ -2597,7 +2597,7 @@ TAO_POA::locate_servant_i (const char *operation, const PortableServer::ObjectId &system_id, TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_POA_Current_Impl &poa_current_impl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If we have the RETAIN policy, convert/transform from system id to // user id. @@ -2732,7 +2732,7 @@ TAO_POA::locate_servant_i (const char *operation, // Invocations of incarnate and etherealize on the servant manager are mutually exclusive. servant = this->servant_activator_->incarnate (poa_current_impl.object_id (), this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (servant == 0) @@ -2806,7 +2806,7 @@ TAO_POA::locate_servant_i (const char *operation, this, operation, cookie - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (servant == 0) @@ -3312,7 +3312,7 @@ TAO_Adapter_Activator::TAO_Adapter_Activator (PortableServer::POAManager_ptr poa CORBA::Boolean TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Default policies @@ -3322,19 +3322,19 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, PortableServer::POA_var child = parent->create_POA (name, this->poa_manager_.in (), default_policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TRY { - child->the_activator (this TAO_ENV_ARG_PARAMETER); + child->the_activator (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { child->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return 0; } @@ -3350,7 +3350,7 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, CORBA::Object_ptr TAO_POA::invoke_key_to_object (const char *intf, PortableServer::ObjectId &user_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Short priority; @@ -3443,7 +3443,7 @@ TAO_POA::invoke_key_to_object (const char *intf, servant, 1, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { @@ -3453,7 +3453,7 @@ TAO_POA::invoke_key_to_object (const char *intf, 0, 1, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } @@ -3466,12 +3466,12 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key, TAO_ServantBase *servant, CORBA::Boolean collocated, CORBA::Short priority - TAO_ENV_ARG_DECL) + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ -3499,7 +3499,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key, } CORBA::String_var imr_str = - imr->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER); + imr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (obj); if (TAO_debug_level > 0) @@ -3541,7 +3541,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key, ior.c_str ())); obj = - this->orb_core_.orb ()->string_to_object (ior.c_str () TAO_ENV_ARG_PARAMETER); + this->orb_core_.orb ()->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (obj); return obj; @@ -3552,7 +3552,7 @@ orbkey: #endif /* TAO_HAS_MINIMUM_CORBA */ TAO_Stub *data = - this->key_to_stub_i (key, type_id, priority TAO_ENV_ARG_PARAMETER); + this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -3590,30 +3590,30 @@ TAO_Stub * TAO_POA::key_to_stub (const TAO_ObjectKey &key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL) + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->key_to_stub_i (key, type_id, priority TAO_ENV_ARG_PARAMETER); + return this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER); } TAO_Stub * TAO_POA::key_to_stub_i (const TAO_ObjectKey &key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::PolicyList_var client_exposed_policies = this->client_exposed_policies (priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); /// Set the endpoints - (void) this->orb_core_.open (TAO_ENV_SINGLE_ARG_PARAMETER); + (void) this->orb_core_.open (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Default_Acceptor_Filter filter; @@ -3623,14 +3623,14 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key, client_exposed_policies._retn (), &filter, this->orb_core_.lane_resources ().acceptor_registry () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return data; } void -TAO_POA::tao_establish_components (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::tao_establish_components (ACE_ENV_SINGLE_ARG_DECL) { PortableInterceptor::IORInfo_ptr info_temp; ACE_NEW_THROW_EX (info_temp, @@ -3645,13 +3645,13 @@ TAO_POA::tao_establish_components (TAO_ENV_SINGLE_ARG_DECL) PortableInterceptor::IORInfo_var info = info_temp; this->establish_components (info.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_POA::establish_components (PortableInterceptor::IORInfo *info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Iterate over the registered IOR interceptors so that they may be // given the opportunity to add tagged components to the profiles @@ -3669,7 +3669,7 @@ TAO_POA::establish_components (PortableInterceptor::IORInfo *info { interceptors[i]->establish_components ( info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3682,7 +3682,7 @@ TAO_POA::establish_components (PortableInterceptor::IORInfo *info if (TAO_debug_level > 1) { CORBA::String_var name = interceptors[i]->name ( - TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_SINGLE_ARG_PARAMETER); // @@ What do we do if we get an exception here? if (name.in () != 0) @@ -3703,14 +3703,14 @@ TAO_POA::establish_components (PortableInterceptor::IORInfo *info } this->components_established_i (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return; } void TAO_POA::components_established_i (PortableInterceptor::IORInfo *info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Iterate over the registered IOR interceptors so that they may be // given the opportunity to add tagged components to the profiles @@ -3730,7 +3730,7 @@ TAO_POA::components_established_i (PortableInterceptor::IORInfo *info { interceptors[j]->components_established ( info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3757,7 +3757,7 @@ TAO_POA::get_policy_list () void TAO_POA::save_ior_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // @@ Priyanka, let's think about why this is broken. // - This method gets invoked by IORInfo::add_ior_component(). @@ -3780,7 +3780,7 @@ void TAO_POA:: save_ior_component_and_profile_id (const IOP::TaggedComponent &component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // @@ Priyanka, let's think about why this is broken. // - This method gets invoked by IORInfo::add_ior_component(). @@ -3810,7 +3810,7 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key, CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, TAO_Acceptor_Registry &acceptor_registry - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int error = 0; @@ -3882,7 +3882,7 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key, { // Get the ith profile profile = mprofile.get_profile (i); - profile->policies (policy_list TAO_ENV_ARG_PARAMETER); + profile->policies (policy_list ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } @@ -3898,14 +3898,14 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key, if (this->profile_id_ == 0) { this->tao_add_ior_component (this->tagged_component_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else { this->tao_add_ior_component_to_profile (this->tagged_component_, this->profile_id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } @@ -3914,12 +3914,12 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key, this->orb_core_.create_stub_object (mprofile, type_id, policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::PolicyList * TAO_POA::client_exposed_policies (CORBA::Short object_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::PolicyList *client_exposed_policies = 0; ACE_NEW_THROW_EX (client_exposed_policies, @@ -3932,7 +3932,7 @@ TAO_POA::client_exposed_policies (CORBA::Short object_priority // Add in all of the client exposed policies. this->policies_.add_client_exposed_fixed_policies (client_exposed_policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_UNUSED_ARG (object_priority); @@ -3946,7 +3946,7 @@ TAO_POA::client_exposed_policies (CORBA::Short object_priority #if (TAO_HAS_MINIMUM_CORBA == 0) void -TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notifying IMR of startup\n")); @@ -3970,16 +3970,16 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var id = root_poa->activate_object_i (this->server_object_, this->cached_policies_.server_priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var obj = root_poa->id_to_reference_i (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ImplementationRepository::ServerObject_var svr = ImplementationRepository::ServerObject::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ()) @@ -3989,7 +3989,7 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) } CORBA::String_var svr_str = - svr->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER); + svr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Search for "corbaloc:" alone, without the protocol. This code @@ -4015,7 +4015,7 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) CORBA::String_var curr_addr (svr_str); ImplementationRepository::Administration_var imr_admin = - ImplementationRepository::Administration::_narrow (imr.in ()TAO_ENV_ARG_PARAMETER); + ImplementationRepository::Administration::_narrow (imr.in ()ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (TAO_debug_level > 0) @@ -4026,7 +4026,7 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) imr_admin->server_is_running (this->name ().c_str (), curr_addr.in (), svr.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -4065,10 +4065,10 @@ TAO_POA::imr_notify_shutdown (void) { // Get the IMR's administrative object and call shutting_down on it ImplementationRepository::Administration_var imr_admin = - ImplementationRepository::Administration::_narrow (imr.in ()TAO_ENV_ARG_PARAMETER); + ImplementationRepository::Administration::_narrow (imr.in ()ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - imr_admin->server_is_shutting_down (this->the_name ()TAO_ENV_ARG_PARAMETER); + imr_admin->server_is_shutting_down (this->the_name ()ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4082,7 +4082,7 @@ TAO_POA::imr_notify_shutdown (void) #endif /* TAO_HAS_MINIMUM_CORBA */ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa - TAO_ENV_ARG_DECL, + ACE_ENV_ARG_DECL, int check_for_destruction) : guard_ (poa.lock ()) { @@ -4097,7 +4097,7 @@ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa // 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (check_for_destruction && @@ -4114,7 +4114,7 @@ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa PortableServer::ObjectId * TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -4127,7 +4127,7 @@ TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref } PortableServer::ObjectId *obj_id = - hooks->create_id_for_reference (*this, the_ref TAO_ENV_ARG_PARAMETER); + hooks->create_id_for_reference (*this, the_ref ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return obj_id; @@ -4135,7 +4135,7 @@ TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref PortableServer::IDs * TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -4149,7 +4149,7 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref } PortableServer::IDs *id_list = - hooks->reference_to_ids (*this, the_ref TAO_ENV_ARG_PARAMETER); + hooks->reference_to_ids (*this, the_ref ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return id_list; @@ -4158,7 +4158,7 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref void TAO_POA::associate_reference_with_id (CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -4170,14 +4170,14 @@ TAO_POA::associate_reference_with_id (CORBA::Object_ptr ref, ACE_THROW (CORBA::NO_IMPLEMENT ()); } - hooks->associate_reference_with_id (*this, ref, oid TAO_ENV_ARG_PARAMETER); + hooks->associate_reference_with_id (*this, ref, oid ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -4189,7 +4189,7 @@ TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref, ACE_THROW (CORBA::NO_IMPLEMENT ()); } - hooks->disassociate_reference_with_id (*this, ref, oid TAO_ENV_ARG_PARAMETER); + hooks->disassociate_reference_with_id (*this, ref, oid ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h index edc49c0d6e6..513a5673ded 100644 --- a/TAO/tao/PortableServer/POA.h +++ b/TAO/tao/PortableServer/POA.h @@ -148,71 +148,71 @@ public: PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - char * the_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr the_parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAList *the_children (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAManager_ptr the_POAManager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableInterceptor::AdapterManagerId get_manager_id (TAO_ENV_SINGLE_ARG_DECL) + PortableInterceptor::AdapterManagerId get_manager_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // @@ Priyanka, shouldn't this method return a @@ -223,7 +223,7 @@ public: /// 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. - CORBA::StringSeq *adapter_name (TAO_ENV_SINGLE_ARG_DECL) + CORBA::StringSeq *adapter_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// {@ Accessor methods to ObjectReferenceTemplate @@ -231,7 +231,7 @@ public: void set_adapter_template (PortableInterceptor::ObjectReferenceTemplate * object_ref_template - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// @} /// {@ Accessor methods to PortableInterceptor::ObjectReferenceFactory @@ -239,17 +239,17 @@ public: void set_obj_ref_factory (PortableInterceptor::ObjectReferenceFactory * current_factory - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// @} /// Call the establish components. - void tao_establish_components (TAO_ENV_SINGLE_ARG_DECL); + void tao_establish_components (ACE_ENV_SINGLE_ARG_DECL); /// Give each registered IOR interceptor the opportunity to add /// tagged components to profiles of each created servant. void establish_components (PortableInterceptor::IORInfo *info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// TAO_IORInfo requests these members. CORBA::PolicyList *get_policy_list (); @@ -260,115 +260,115 @@ public: // Do you really need it? void save_ior_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // @@ Priyanka, this method appears to be very useless and broken. // Do you really need it? void save_ior_component_and_profile_id (const IOP::TaggedComponent &component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::AdapterActivator_ptr the_activator (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::ServantManager_ptr get_servant_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); void set_servant (PortableServer::Servant servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); void deactivate_object (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::OctetSeq *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) @@ -376,7 +376,7 @@ public: virtual PortableServer::ObjectId * create_id_for_reference ( CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -386,7 +386,7 @@ public: virtual PortableServer::IDs * reference_to_ids ( CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -396,7 +396,7 @@ public: virtual void associate_reference_with_id ( CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -406,7 +406,7 @@ public: virtual void disassociate_reference_with_id ( CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -424,7 +424,7 @@ public: TAO_POA_Cached_Policies &cached_policies (void); virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method gives the policies that are exposed to the client. // These policies are shipped within the IOR. @@ -449,7 +449,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual ~TAO_POA (void); @@ -470,7 +470,7 @@ public: static void check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_ORB_Core &orb_core (void) const; // ORB Core for POA. @@ -485,7 +485,7 @@ public: TAO_Stub* key_to_stub (const TAO_ObjectKey &key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Create the correct stub, properly initialized with the attributes // and policies attached to the current POA. @@ -495,7 +495,7 @@ public: /// {@ Accesor methods to POA state. The POA can be in one of /// HOLDING, ACTIVE, DISCARDING, INACTIVE and NON_EXISTENT states. PortableInterceptor::AdapterState - get_adapter_state (TAO_ENV_SINGLE_ARG_DECL); + get_adapter_state (ACE_ENV_SINGLE_ARG_DECL); void set_adapter_state (PortableInterceptor::AdapterState adapter_state, @@ -517,12 +517,12 @@ protected: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); PortableServer::POA_ptr create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); @@ -530,25 +530,25 @@ protected: TAO_POA *create_POA_i (const String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); TAO_POA *find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void complete_destruction_i (TAO_ENV_SINGLE_ARG_DECL); + void complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL); - PortableServer::POAList *the_children_i (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POAList *the_children_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // @@ Priyanka, shouldn't this method return a @@ -559,7 +559,7 @@ protected: /// 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. - CORBA::StringSeq *adapter_name_i (TAO_ENV_SINGLE_ARG_DECL) + CORBA::StringSeq *adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Method to notify the IOR Interceptors when there is a state @@ -574,7 +574,7 @@ protected: /// Add the given tagged component to all profiles. void tao_add_ior_component ( const IOP::TaggedComponent & component - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles matching the given @@ -582,27 +582,27 @@ protected: void tao_add_ior_component_to_profile ( const IOP::TaggedComponent & component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ServantManager_ptr get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::ServantManager_ptr get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager_i (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant_i (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::Servant get_servant_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); void set_servant_i (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); @@ -613,7 +613,7 @@ protected: // #if (TAO_HAS_MINIMUM_CORBA == 0) - void imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL); + void imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL); // ImplRepo helper method, notify the ImplRepo on startup void imr_notify_shutdown (void); @@ -624,21 +624,21 @@ protected: CORBA::Object_ptr invoke_key_to_object (const char *intf, PortableServer::ObjectId &user_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); CORBA::Object_ptr key_to_object (const TAO_ObjectKey &key, const char *type_id, TAO_ServantBase *servant, CORBA::Boolean collocated, CORBA::Short priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Wrapper for the ORB's key_to_object that will alter the object pointer // if the ImplRepo is used. virtual TAO_Stub* key_to_stub_i (const TAO_ObjectKey &key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Like key_to_stub() but assume that the ORB is not shutting down. TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key, @@ -646,7 +646,7 @@ protected: CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, TAO_Acceptor_Registry &acceptor_registry - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int is_servant_in_map (PortableServer::Servant servant); @@ -656,7 +656,7 @@ protected: PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); @@ -664,79 +664,79 @@ protected: void activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects - TAO_ENV_ARG_DECL) + 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void wait_for_completions (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); - void check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL); + void check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL); void deactivate_object_i (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); CORBA::Object_ptr create_reference_i (const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id_i (const PortableServer::ObjectId &oid, const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_system_id (PortableServer::Servant p_servant, CORBA::Short &priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_system_id_i (PortableServer::Servant p_servant, CORBA::Short &priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); @@ -744,7 +744,7 @@ protected: TAO_Active_Object_Map &active_object_map (void) const; void components_established_i (PortableInterceptor::IORInfo *info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int delete_child (const String &child); @@ -772,13 +772,13 @@ protected: TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id, PortableServer::Servant &servant - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); PortableServer::Servant locate_servant_i (const char *operation, const PortableServer::ObjectId &id, TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_POA_Current_Impl &poa_current_impl - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); const TAO_Creation_Time &creation_time (void); @@ -933,7 +933,7 @@ class TAO_PortableServer_Export TAO_POA_Guard { public: TAO_POA_Guard (TAO_POA &poa - TAO_ENV_ARG_DECL, + ACE_ENV_ARG_DECL, int check_for_destruction = 1); private: @@ -950,7 +950,7 @@ public: CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i index 431b714f202..4967d6a47bf 100644 --- a/TAO/tao/PortableServer/POA.i +++ b/TAO/tao/PortableServer/POA.i @@ -130,7 +130,7 @@ ACE_INLINE PortableServer::POA_ptr TAO_POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -141,23 +141,23 @@ TAO_POA::create_POA (const char *adapter_name, return this->create_POA_i (adapter_name, poa_manager, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. - TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER, 0); + TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER, 0); ACE_CHECK; ACE_UNUSED_ARG (poa_guard); this->destroy_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE TAO_POA_Policy_Set & @@ -175,19 +175,19 @@ TAO_POA::active_object_map (void) const #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE PortableServer::ServantManager_ptr -TAO_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ()); - return this->get_servant_manager_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->get_servant_manager_i (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE void TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -195,11 +195,11 @@ TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr TAO_POA_GUARD; this->set_servant_manager_i (imgr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::Servant -TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)) @@ -207,12 +207,12 @@ TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL) // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->get_servant_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->get_servant_i (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE void TAO_POA::set_servant (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -220,14 +220,14 @@ TAO_POA::set_servant (PortableServer::Servant servant TAO_POA_GUARD; this->set_servant_i (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ ACE_INLINE PortableServer::ObjectId * TAO_POA::activate_object (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) @@ -237,13 +237,13 @@ TAO_POA::activate_object (PortableServer::Servant servant return this->activate_object_i (servant, this->cached_policies_.server_priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -255,12 +255,12 @@ TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id, this->activate_object_with_id_i (id, servant, this->cached_policies_.server_priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA::deactivate_object (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -269,12 +269,12 @@ TAO_POA::deactivate_object (const PortableServer::ObjectId &oid TAO_POA_GUARD; this->deactivate_object_i (oid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object_ptr TAO_POA::create_reference (const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -282,13 +282,13 @@ TAO_POA::create_reference (const char *intf TAO_POA_GUARD_RETURN (CORBA::Object::_nil ()); return this->create_reference_i (intf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object_ptr TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id, const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -297,12 +297,12 @@ TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id, return this->create_reference_with_id_i (id, intf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::ObjectId * TAO_POA::servant_to_id (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -313,13 +313,13 @@ TAO_POA::servant_to_id (PortableServer::Servant servant TAO_POA_GUARD_RETURN (0); return this->servant_to_id_i (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::ObjectId * TAO_POA::servant_to_system_id (PortableServer::Servant servant, CORBA::Short &priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -329,12 +329,12 @@ TAO_POA::servant_to_system_id (PortableServer::Servant servant, return this->servant_to_system_id_i (servant, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::Servant TAO_POA::id_to_servant (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -343,12 +343,12 @@ TAO_POA::id_to_servant (const PortableServer::ObjectId &oid TAO_POA_GUARD_RETURN (0); return this->id_to_servant_i (oid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object_ptr TAO_POA::id_to_reference (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -356,11 +356,11 @@ TAO_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 TAO_ENV_ARG_PARAMETER); + return this->id_to_reference_i (oid ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::POA_ptr -TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->parent_ != 0) @@ -370,24 +370,24 @@ TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } ACE_INLINE PortableServer::POAList * -TAO_POA::the_children (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::the_children (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->the_children_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->the_children_i (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE PortableServer::POAManager_ptr -TAO_POA::the_POAManager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POAManager::_duplicate (&this->poa_manager_); } ACE_INLINE PortableInterceptor::AdapterManagerId -TAO_POA::get_manager_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::get_manager_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO_POA_Manager::poa_manager_id_; @@ -400,10 +400,10 @@ TAO_POA::get_manager_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // TypeCodes! // ACE_INLINE CORBA::StringSeq * -TAO_POA::adapter_name (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->adapter_name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE PortableInterceptor::ObjectReferenceTemplate * @@ -421,7 +421,7 @@ TAO_POA::get_obj_ref_factory () #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE PortableServer::AdapterActivator_ptr -TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. @@ -432,7 +432,7 @@ TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL) ACE_INLINE void TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. @@ -476,7 +476,7 @@ TAO_POA::name (void) const } ACE_INLINE char * -TAO_POA::the_name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::the_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.c_str ()); @@ -636,7 +636,7 @@ TAO_POA::thread_policy (void) const } ACE_INLINE PortableInterceptor::AdapterState -TAO_POA::get_adapter_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::get_adapter_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->adapter_state_; } diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index 910a43e9dcb..3b6ae064865 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -27,7 +27,7 @@ TAO_POA_Manager::~TAO_POA_Manager (void) } void -TAO_POA_Manager::activate_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { @@ -49,14 +49,14 @@ TAO_POA_Manager::activate_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This operation changes the state of the POA manager to @@ -107,7 +107,7 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, TAO_POA *poa = *iterator; poa->deactivate_all_objects_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -149,14 +149,14 @@ adapter_manager_state_changed (PortableServer::POAManager::State state, void TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This operation changes the state of the POA manager to @@ -197,7 +197,7 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion { TAO_POA *poa = *iterator; poa->wait_for_completions (wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -205,14 +205,14 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion void TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This operation changes the state of the POA manager to @@ -255,7 +255,7 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion { TAO_POA *poa = *iterator; poa->wait_for_completions (wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index fe3bf6fe9e2..9a862da113d 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -56,31 +56,31 @@ class TAO_PortableServer_Export TAO_POA_Manager : public: - void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); #if (TAO_HAS_MINIMUM_POA == 0) void hold_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void discard_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAManager::State get_state (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); TAO_POA_Manager (TAO_Object_Adapter &object_adapter); @@ -89,13 +89,13 @@ public: protected: - void activate_i (TAO_ENV_SINGLE_ARG_DECL) + void activate_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); @@ -103,16 +103,16 @@ protected: /// of POAManager changed. void adapter_manager_state_changed (PortableServer::POAManager::State state, CORBA::Environment &ACE_TRY_ENV); - + #if (TAO_HAS_MINIMUM_POA == 0) void hold_requests_i (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void discard_requests_i (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i index aec6e34cd32..66f172859ee 100644 --- a/TAO/tao/PortableServer/POAManager.i +++ b/TAO/tao/PortableServer/POAManager.i @@ -9,46 +9,46 @@ TAO_POA_Manager::lock (void) } ACE_INLINE void -TAO_POA_Manager::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::activate (ACE_ENV_SINGLE_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->activate_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_i (ACE_ENV_SINGLE_ARG_PARAMETER); } #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE void TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + 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 TAO_ENV_ARG_PARAMETER); + this->hold_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + 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 TAO_ENV_ARG_PARAMETER); + this->discard_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { @@ -57,7 +57,7 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, this->deactivate_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -70,7 +70,7 @@ TAO_POA_Manager::get_state_i (void) } ACE_INLINE PortableServer::POAManager::State -TAO_POA_Manager::get_state (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::get_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access to the POAManager for the duration of this transaction diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 0ca2e26182c..fd705c3da9e 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -31,33 +31,33 @@ TAO_POA_Cached_Policies::~TAO_POA_Cached_Policies (void) void TAO_POA_Cached_Policies::update (TAO_POA_Policy_Set &policy_set - TAO_ENV_ARG_DECL) + 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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ThreadPolicy_var thread = PortableServer::ThreadPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (thread.in ())) { - this->thread_ = thread->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->thread_ = thread->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -67,12 +67,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::LifespanPolicy_var lifespan = PortableServer::LifespanPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (lifespan.in ())) { - this->lifespan_ = lifespan->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lifespan_ = lifespan->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -80,12 +80,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::IdUniquenessPolicy_var id_uniqueness = PortableServer::IdUniquenessPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (id_uniqueness.in ())) { - this->id_uniqueness_ = id_uniqueness->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->id_uniqueness_ = id_uniqueness->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -93,12 +93,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::IdAssignmentPolicy_var id_assignment = PortableServer::IdAssignmentPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (id_assignment.in ())) { - this->id_assignment_ = id_assignment->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->id_assignment_ = id_assignment->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -108,12 +108,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::ImplicitActivationPolicy_var implicit_activation = PortableServer::ImplicitActivationPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (implicit_activation.in ())) { - this->implicit_activation_ = implicit_activation->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->implicit_activation_ = implicit_activation->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -121,12 +121,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::ServantRetentionPolicy_var servant_retention = PortableServer::ServantRetentionPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (servant_retention.in ())) { - this->servant_retention_ = servant_retention->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->servant_retention_ = servant_retention->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -134,12 +134,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::RequestProcessingPolicy_var request_processing = PortableServer::RequestProcessingPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (request_processing.in ())) { - this->request_processing_ = request_processing->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->request_processing_ = request_processing->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index 127439ab984..63569e01b20 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -56,7 +56,7 @@ public: /// Update the cached policy values. void update (TAO_POA_Policy_Set &policy_set - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Accessor methods to cached values. PortableServer::ThreadPolicyValue thread (void) const; @@ -77,7 +77,7 @@ protected: /// Helper method to update a particular policy. void update_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); PortableServer::ThreadPolicyValue thread_; diff --git a/TAO/tao/PortableServer/POA_Policies.cpp b/TAO/tao/PortableServer/POA_Policies.cpp index e72058e4ad5..09078bacb3f 100644 --- a/TAO/tao/PortableServer/POA_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Policies.cpp @@ -17,14 +17,14 @@ TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value) } PortableServer::ThreadPolicyValue -TAO_Thread_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Thread_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Thread_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Thread_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Thread_Policy *thread_policy_copy = 0; @@ -37,13 +37,13 @@ TAO_Thread_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Thread_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Thread_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Thread_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Thread_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::THREAD_POLICY_ID; @@ -71,14 +71,14 @@ TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue va } PortableServer::LifespanPolicyValue -TAO_Lifespan_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Lifespan_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Lifespan_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Lifespan_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Lifespan_Policy *lifespan_policy_copy = 0; @@ -91,13 +91,13 @@ TAO_Lifespan_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Lifespan_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Lifespan_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Lifespan_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Lifespan_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::LIFESPAN_POLICY_ID; @@ -123,14 +123,14 @@ TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniqueness } PortableServer::IdUniquenessPolicyValue -TAO_Id_Uniqueness_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Uniqueness_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Id_Uniqueness_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Id_Uniqueness_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Uniqueness_Policy *id_uniqueness_policy_copy = 0; @@ -143,13 +143,13 @@ TAO_Id_Uniqueness_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Id_Uniqueness_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Uniqueness_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Id_Uniqueness_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Uniqueness_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::ID_UNIQUENESS_POLICY_ID; @@ -175,14 +175,14 @@ TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignment } PortableServer::IdAssignmentPolicyValue -TAO_Id_Assignment_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Assignment_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Id_Assignment_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Id_Assignment_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Assignment_Policy *id_assignment_policy_copy = 0; @@ -195,13 +195,13 @@ TAO_Id_Assignment_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Id_Assignment_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Assignment_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Id_Assignment_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Assignment_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::ID_ASSIGNMENT_POLICY_ID; @@ -229,14 +229,14 @@ TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer:: } PortableServer::ImplicitActivationPolicyValue -TAO_Implicit_Activation_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Implicit_Activation_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Implicit_Activation_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Implicit_Activation_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Implicit_Activation_Policy *implicit_activation_policy_copy = 0; @@ -249,13 +249,13 @@ TAO_Implicit_Activation_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Implicit_Activation_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Implicit_Activation_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Implicit_Activation_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Implicit_Activation_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::IMPLICIT_ACTIVATION_POLICY_ID; @@ -281,14 +281,14 @@ TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::Serv } PortableServer::ServantRetentionPolicyValue -TAO_Servant_Retention_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Servant_Retention_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Servant_Retention_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Servant_Retention_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Servant_Retention_Policy *servant_retention_policy_copy = 0; @@ -301,13 +301,13 @@ TAO_Servant_Retention_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Servant_Retention_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Servant_Retention_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Servant_Retention_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Servant_Retention_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::SERVANT_RETENTION_POLICY_ID; @@ -333,14 +333,14 @@ TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::Re } PortableServer::RequestProcessingPolicyValue -TAO_Request_Processing_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Request_Processing_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Request_Processing_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Request_Processing_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Request_Processing_Policy *request_processing_policy_copy = 0; @@ -353,13 +353,13 @@ TAO_Request_Processing_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Request_Processing_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Request_Processing_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Request_Processing_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Request_Processing_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::REQUEST_PROCESSING_POLICY_ID; diff --git a/TAO/tao/PortableServer/POA_Policies.h b/TAO/tao/PortableServer/POA_Policies.h index 4c47630e2d7..bd9231d99f9 100644 --- a/TAO/tao/PortableServer/POA_Policies.h +++ b/TAO/tao/PortableServer/POA_Policies.h @@ -47,16 +47,16 @@ class TAO_PortableServer_Export TAO_Thread_Policy : public: TAO_Thread_Policy (PortableServer::ThreadPolicyValue value); - PortableServer::ThreadPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ThreadPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -78,16 +78,16 @@ class TAO_PortableServer_Export TAO_Lifespan_Policy : public: TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value); - PortableServer::LifespanPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::LifespanPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -107,16 +107,16 @@ class TAO_PortableServer_Export TAO_Id_Uniqueness_Policy : public: TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value); - PortableServer::IdUniquenessPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::IdUniquenessPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -136,16 +136,16 @@ class TAO_PortableServer_Export TAO_Id_Assignment_Policy : public: TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value); - PortableServer::IdAssignmentPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::IdAssignmentPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -167,16 +167,16 @@ class TAO_PortableServer_Export TAO_Implicit_Activation_Policy : public: TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value); - PortableServer::ImplicitActivationPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ImplicitActivationPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -196,16 +196,16 @@ class TAO_PortableServer_Export TAO_Servant_Retention_Policy : public: TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value); - PortableServer::ServantRetentionPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ServantRetentionPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -225,16 +225,16 @@ class TAO_PortableServer_Export TAO_Request_Processing_Policy : public: TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value); - PortableServer::RequestProcessingPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::RequestProcessingPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index 69c388e4aab..9907212b534 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -30,7 +30,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong cep_index = client_exposed_policies->length (); @@ -45,7 +45,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cep_index++; @@ -56,14 +56,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 - TAO_ENV_ARG_DECL) + 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); // Validate that all of the specified policies make sense. - validator.validate (this->impl_ TAO_ENV_ARG_PARAMETER); + validator.validate (this->impl_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Verify that all policies are legal for the currently loaded @@ -74,7 +74,7 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (validator.legal_policy (type) == 0) diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index 06353d178d6..7907df07412 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -58,18 +58,18 @@ public: CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); void merge_policies (const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void merge_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void validate_policies (TAO_Policy_Validator &validator, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL); + 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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_Policy_Set &policies (void); diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i index 3cdda2dc2cc..b0a9ec35c10 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.i +++ b/TAO/tao/PortableServer/POA_Policy_Set.i @@ -20,20 +20,20 @@ TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type) ACE_INLINE void TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_INLINE void TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->impl_.set_policy (policy TAO_ENV_ARG_PARAMETER); + this->impl_.set_policy (policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 86647b1eae4..0689ed2d10f 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -162,31 +162,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, POA_CORBA_Policy *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::PolicyType result); @@ -204,44 +204,44 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Policy *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -253,7 +253,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -263,10 +263,10 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -283,31 +283,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, POA_CORBA_Policy *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Policy_ptr result); @@ -325,44 +325,44 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Policy *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Policy_copy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -374,7 +374,7 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -384,10 +384,10 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Policy_copy::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -404,31 +404,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, POA_CORBA_Policy *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -445,44 +445,44 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_d TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Policy *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Policy_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -490,7 +490,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -500,10 +500,10 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -536,17 +536,17 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::~POA_CORBA_TAO_Policy_Strategized CORBA_TAO_Policy_Proxy_Impl& POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy ( ::CORBA::Policy *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -556,7 +556,7 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy ( void POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -626,7 +626,7 @@ POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -642,7 +642,7 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( _collocated_tao_target_->_object_key (), "policy_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -651,13 +651,13 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( "IDL:omg.org/CORBA/Policy:1.0" ) )->policy_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -673,7 +673,7 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy ( _collocated_tao_target_->_object_key (), "copy", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -682,13 +682,13 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy ( "IDL:omg.org/CORBA/Policy:1.0" ) )->copy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -702,7 +702,7 @@ void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy ( _collocated_tao_target_->_object_key (), "destroy", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -711,7 +711,7 @@ void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy ( "IDL:omg.org/CORBA/Policy:1.0" ) )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } @@ -729,7 +729,7 @@ _TAO_CORBA_Policy_Direct_Proxy_Impl::_TAO_CORBA_Policy_Direct_Proxy_Impl (void) CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -739,14 +739,14 @@ CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type ( POA_CORBA_Policy_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") )->policy_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -756,14 +756,14 @@ CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy ( POA_CORBA_Policy_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") )->copy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -773,7 +773,7 @@ void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy ( POA_CORBA_Policy_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -803,7 +803,7 @@ void POA_CORBA_Policy::_get_policy_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy *_tao_impl = @@ -824,18 +824,18 @@ void POA_CORBA_Policy::_get_policy_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->policy_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -843,7 +843,7 @@ void POA_CORBA_Policy::_get_policy_type_skel ( CORBA::PolicyType _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -851,12 +851,12 @@ void POA_CORBA_Policy::_get_policy_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -883,7 +883,7 @@ void POA_CORBA_Policy::copy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy *_tao_impl = @@ -904,18 +904,18 @@ void POA_CORBA_Policy::copy_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->copy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -924,7 +924,7 @@ void POA_CORBA_Policy::copy_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -932,12 +932,12 @@ void POA_CORBA_Policy::copy_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -965,7 +965,7 @@ void POA_CORBA_Policy::destroy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy *_tao_impl = @@ -986,24 +986,24 @@ void POA_CORBA_Policy::destroy_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1011,12 +1011,12 @@ void POA_CORBA_Policy::destroy_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1037,7 +1037,7 @@ void POA_CORBA_Policy::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1047,7 +1047,7 @@ void POA_CORBA_Policy::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1060,11 +1060,11 @@ void POA_CORBA_Policy::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1077,7 +1077,7 @@ void POA_CORBA_Policy::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference; @@ -1096,7 +1096,7 @@ void POA_CORBA_Policy::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1123,10 +1123,10 @@ void POA_CORBA_Policy::_interface_skel ( CORBA::Boolean POA_CORBA_Policy::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -1148,12 +1148,12 @@ void* POA_CORBA_Policy::_downcast ( return 0; } -void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } const char* POA_CORBA_Policy::_interface_repository_id (void) const @@ -1162,9 +1162,9 @@ const char* POA_CORBA_Policy::_interface_repository_id (void) const } CORBA::Policy* -POA_CORBA_Policy::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Policy::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index e89330ca907..1537f13465c 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -64,7 +64,7 @@ virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -75,37 +75,37 @@ TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA::Policy *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -115,11 +115,11 @@ TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -129,11 +129,11 @@ TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -143,7 +143,7 @@ TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -163,7 +163,7 @@ virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy ( ::CORBA::Policy *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -171,7 +171,7 @@ // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -210,7 +210,7 @@ virtual CORBA::PolicyType policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -218,7 +218,7 @@ virtual CORBA::Policy_ptr copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -226,7 +226,7 @@ virtual CORBA::Policy_ptr copy ( virtual void destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -254,7 +254,7 @@ public: virtual CORBA::PolicyType policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -262,7 +262,7 @@ public: virtual CORBA_Policy_ptr copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -270,7 +270,7 @@ public: virtual void destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + 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 2c64e99cf90..39647c49710 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -62,24 +62,24 @@ // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i index 4552a17af9e..2598ef6287b 100644 --- a/TAO/tao/PortableServer/PolicyS_T.i +++ b/TAO/tao/PortableServer/PolicyS_T.i @@ -90,50 +90,50 @@ 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 (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_Policy::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::PolicyType POA_CORBA_Policy_tie<T>::policy_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->policy_type ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Policy_ptr POA_CORBA_Policy_tie<T>::copy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->copy ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_Policy_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/tao/PortableServer/PortableGroup_Hooks.h b/TAO/tao/PortableServer/PortableGroup_Hooks.h index 2103e700efe..d083b9bcda5 100644 --- a/TAO/tao/PortableServer/PortableGroup_Hooks.h +++ b/TAO/tao/PortableServer/PortableGroup_Hooks.h @@ -42,7 +42,7 @@ public: virtual PortableServer::ObjectId * create_id_for_reference ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -52,7 +52,7 @@ public: virtual PortableServer::IDs * reference_to_ids ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -63,7 +63,7 @@ public: TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -74,7 +74,7 @@ public: TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 6e95fd3ad6a..ea2636d8d50 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -106,11 +106,11 @@ void PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, target); - *tmp = PortableServer::POA::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = PortableServer::POA::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -317,7 +317,7 @@ void PortableServer::ForwardRequest::_raise () void PortableServer::ForwardRequest::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -330,7 +330,7 @@ void PortableServer::ForwardRequest::_tao_encode ( void PortableServer::ForwardRequest::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -479,7 +479,7 @@ void PortableServer::NotAGroupObject::_raise () void PortableServer::NotAGroupObject::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -492,7 +492,7 @@ void PortableServer::NotAGroupObject::_tao_encode ( void PortableServer::NotAGroupObject::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -906,10 +906,10 @@ PortableServer::ThreadPolicy_var::tao_nil (void) ::PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ThreadPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -989,15 +989,15 @@ PortableServer::ThreadPolicy::ThreadPolicy (void) PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ThreadPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ThreadPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1218,10 +1218,10 @@ PortableServer::LifespanPolicy_var::tao_nil (void) ::PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::LifespanPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1301,15 +1301,15 @@ PortableServer::LifespanPolicy::LifespanPolicy (void) PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return LifespanPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return LifespanPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1530,10 +1530,10 @@ PortableServer::IdUniquenessPolicy_var::tao_nil (void) ::PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::IdUniquenessPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1613,15 +1613,15 @@ PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void) PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IdUniquenessPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return IdUniquenessPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1841,10 +1841,10 @@ PortableServer::IdAssignmentPolicy_var::tao_nil (void) ::PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::IdAssignmentPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1924,15 +1924,15 @@ PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void) PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IdAssignmentPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return IdAssignmentPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2164,10 +2164,10 @@ PortableServer::ImplicitActivationPolicy_var::tao_nil (void) ::PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ImplicitActivationPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2247,15 +2247,15 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void) PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ImplicitActivationPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ImplicitActivationPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2477,10 +2477,10 @@ PortableServer::ServantRetentionPolicy_var::tao_nil (void) ::PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ServantRetentionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2560,15 +2560,15 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void) PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServantRetentionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServantRetentionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2804,10 +2804,10 @@ PortableServer::RequestProcessingPolicy_var::tao_nil (void) ::PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::RequestProcessingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2887,15 +2887,15 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void) PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RequestProcessingPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RequestProcessingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3069,10 +3069,10 @@ PortableServer::POAManager_var::tao_nil (void) ::PortableServer::POAManager_ptr PortableServer::POAManager_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::POAManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3152,15 +3152,15 @@ PortableServer::POAManager::POAManager (void) PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return POAManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return POAManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::POAManager_ptr PortableServer::POAManager::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3255,7 +3255,7 @@ void PortableServer::POAManager::AdapterInactive::_raise () void PortableServer::POAManager::AdapterInactive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -3263,7 +3263,7 @@ void PortableServer::POAManager::AdapterInactive::_tao_encode ( void PortableServer::POAManager::AdapterInactive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -3390,10 +3390,10 @@ PortableServer::AdapterActivator_var::tao_nil (void) ::PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::AdapterActivator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3473,15 +3473,15 @@ PortableServer::AdapterActivator::AdapterActivator (void) PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return AdapterActivator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return AdapterActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3641,10 +3641,10 @@ PortableServer::ServantManager_var::tao_nil (void) ::PortableServer::ServantManager_ptr PortableServer::ServantManager_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ServantManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3724,15 +3724,15 @@ PortableServer::ServantManager::ServantManager (void) PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServantManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServantManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ServantManager_ptr PortableServer::ServantManager::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3892,10 +3892,10 @@ PortableServer::ServantActivator_var::tao_nil (void) ::PortableServer::ServantActivator_ptr PortableServer::ServantActivator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ServantActivator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3975,15 +3975,15 @@ PortableServer::ServantActivator::ServantActivator (void) PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServantActivator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServantActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4155,10 +4155,10 @@ PortableServer::ServantLocator_var::tao_nil (void) ::PortableServer::ServantLocator_ptr PortableServer::ServantLocator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ServantLocator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4238,15 +4238,15 @@ PortableServer::ServantLocator::ServantLocator (void) PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServantLocator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServantLocator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4420,10 +4420,10 @@ PortableServer::POA_var::tao_nil (void) ::PortableServer::POA_ptr PortableServer::POA_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4503,15 +4503,15 @@ PortableServer::POA::POA (void) PortableServer::POA_ptr PortableServer::POA::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return POA::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr PortableServer::POA::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4606,7 +4606,7 @@ void PortableServer::POA::AdapterAlreadyExists::_raise () void PortableServer::POA::AdapterAlreadyExists::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4614,7 +4614,7 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_encode ( void PortableServer::POA::AdapterAlreadyExists::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4674,7 +4674,7 @@ void PortableServer::POA::AdapterNonExistent::_raise () void PortableServer::POA::AdapterNonExistent::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4682,7 +4682,7 @@ void PortableServer::POA::AdapterNonExistent::_tao_encode ( void PortableServer::POA::AdapterNonExistent::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4744,7 +4744,7 @@ void PortableServer::POA::InvalidPolicy::_raise () void PortableServer::POA::InvalidPolicy::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4752,7 +4752,7 @@ void PortableServer::POA::InvalidPolicy::_tao_encode ( void PortableServer::POA::InvalidPolicy::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4822,7 +4822,7 @@ void PortableServer::POA::NoServant::_raise () void PortableServer::POA::NoServant::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4830,7 +4830,7 @@ void PortableServer::POA::NoServant::_tao_encode ( void PortableServer::POA::NoServant::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4892,7 +4892,7 @@ void PortableServer::POA::ObjectAlreadyActive::_raise () void PortableServer::POA::ObjectAlreadyActive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4900,7 +4900,7 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_encode ( void PortableServer::POA::ObjectAlreadyActive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4960,7 +4960,7 @@ void PortableServer::POA::ObjectNotActive::_raise () void PortableServer::POA::ObjectNotActive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4968,7 +4968,7 @@ void PortableServer::POA::ObjectNotActive::_tao_encode ( void PortableServer::POA::ObjectNotActive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5028,7 +5028,7 @@ void PortableServer::POA::ServantAlreadyActive::_raise () void PortableServer::POA::ServantAlreadyActive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5036,7 +5036,7 @@ void PortableServer::POA::ServantAlreadyActive::_tao_encode ( void PortableServer::POA::ServantAlreadyActive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5096,7 +5096,7 @@ void PortableServer::POA::ServantNotActive::_raise () void PortableServer::POA::ServantNotActive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5104,7 +5104,7 @@ void PortableServer::POA::ServantNotActive::_tao_encode ( void PortableServer::POA::ServantNotActive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5164,7 +5164,7 @@ void PortableServer::POA::WrongAdapter::_raise () void PortableServer::POA::WrongAdapter::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5172,7 +5172,7 @@ void PortableServer::POA::WrongAdapter::_tao_encode ( void PortableServer::POA::WrongAdapter::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5232,7 +5232,7 @@ void PortableServer::POA::WrongPolicy::_raise () void PortableServer::POA::WrongPolicy::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5240,7 +5240,7 @@ void PortableServer::POA::WrongPolicy::_tao_encode ( void PortableServer::POA::WrongPolicy::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5365,10 +5365,10 @@ PortableServer::Current_var::tao_nil (void) ::PortableServer::Current_ptr PortableServer::Current_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5448,15 +5448,15 @@ PortableServer::Current::Current (void) PortableServer::Current_ptr PortableServer::Current::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::Current_ptr PortableServer::Current::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -5563,7 +5563,7 @@ void PortableServer::Current::NoContext::_raise () void PortableServer::Current::NoContext::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5571,7 +5571,7 @@ void PortableServer::Current::NoContext::_tao_encode ( void PortableServer::Current::NoContext::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5654,7 +5654,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Ob { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5742,7 +5742,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5836,7 +5836,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::No { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5931,7 +5931,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ID { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5998,7 +5998,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ThreadPo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6047,7 +6047,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Lifespan { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6094,7 +6094,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdUnique { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6141,7 +6141,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdAssign { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6190,7 +6190,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Implicit { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6237,7 +6237,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ServantR { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6284,7 +6284,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::RequestP { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 2a8a99638b8..393d325abe2 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -116,7 +116,7 @@ TAO_NAMESPACE PortableServer static POA_ptr tao_nil (void); static POA_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -201,7 +201,7 @@ TAO_NAMESPACE PortableServer virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); virtual CORBA_Object* _upcast (void *src) const; }; @@ -467,12 +467,12 @@ TAO_NAMESPACE PortableServer virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ForwardRequest *_downcast (CORBA::Exception *); @@ -519,12 +519,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NotAGroupObject *_downcast (CORBA::Exception *); @@ -771,7 +771,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ThreadPolicy_ptr tao_nil (void); static ThreadPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -829,12 +829,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ThreadPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ThreadPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ThreadPolicy_ptr _nil (void) @@ -843,7 +843,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::ThreadPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -918,7 +918,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static LifespanPolicy_ptr tao_nil (void); static LifespanPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -976,12 +976,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static LifespanPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static LifespanPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static LifespanPolicy_ptr _nil (void) @@ -990,7 +990,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::LifespanPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1063,7 +1063,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static IdUniquenessPolicy_ptr tao_nil (void); static IdUniquenessPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1121,12 +1121,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static IdUniquenessPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IdUniquenessPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IdUniquenessPolicy_ptr _nil (void) @@ -1135,7 +1135,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::IdUniquenessPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1208,7 +1208,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static IdAssignmentPolicy_ptr tao_nil (void); static IdAssignmentPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1266,12 +1266,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static IdAssignmentPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IdAssignmentPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IdAssignmentPolicy_ptr _nil (void) @@ -1280,7 +1280,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::IdAssignmentPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1355,7 +1355,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ImplicitActivationPolicy_ptr tao_nil (void); static ImplicitActivationPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1413,12 +1413,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ImplicitActivationPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ImplicitActivationPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ImplicitActivationPolicy_ptr _nil (void) @@ -1427,7 +1427,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::ImplicitActivationPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1504,7 +1504,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantRetentionPolicy_ptr tao_nil (void); static ServantRetentionPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1562,12 +1562,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantRetentionPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantRetentionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantRetentionPolicy_ptr _nil (void) @@ -1576,7 +1576,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::ServantRetentionPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1654,7 +1654,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static RequestProcessingPolicy_ptr tao_nil (void); static RequestProcessingPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1712,12 +1712,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static RequestProcessingPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static RequestProcessingPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static RequestProcessingPolicy_ptr _nil (void) @@ -1726,7 +1726,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::RequestProcessingPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1791,7 +1791,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static POAManager_ptr tao_nil (void); static POAManager_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1849,12 +1849,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static POAManager_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static POAManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static POAManager_ptr _nil (void) @@ -1885,12 +1885,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static AdapterInactive *_downcast (CORBA::Exception *); @@ -1913,7 +1913,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; typedef State &State_out; virtual void activate ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1923,7 +1923,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual void hold_requests ( - CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1931,7 +1931,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual void discard_requests ( - CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1940,7 +1940,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void deactivate ( CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1950,7 +1950,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ::PortableServer::POAManager::State get_state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2015,7 +2015,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static AdapterActivator_ptr tao_nil (void); static AdapterActivator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2073,12 +2073,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static AdapterActivator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static AdapterActivator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static AdapterActivator_ptr _nil (void) @@ -2088,7 +2088,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, - const char * name TAO_ENV_ARG_DECL_WITH_DEFAULTS + const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2152,7 +2152,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantManager_ptr tao_nil (void); static ServantManager_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2210,12 +2210,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantManager_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantManager_ptr _nil (void) @@ -2281,7 +2281,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantActivator_ptr tao_nil (void); static ServantActivator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2339,12 +2339,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantActivator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantActivator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantActivator_ptr _nil (void) @@ -2354,7 +2354,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual ::PortableServer::Servant incarnate ( const PortableServer::ObjectId & oid, - PortableServer::POA_ptr adapter TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::POA_ptr adapter ACE_ENV_ARG_DECL_WITH_DEFAULTS ) #if (TAO_HAS_MINIMUM_CORBA == 0) ACE_THROW_SPEC (( @@ -2372,7 +2372,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean remaining_activations ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2436,7 +2436,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantLocator_ptr tao_nil (void); static ServantLocator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2497,12 +2497,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantLocator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantLocator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantLocator_ptr _nil (void) @@ -2514,7 +2514,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, const char * operation, - PortableServer::ServantLocator::Cookie & the_cookie TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ServantLocator::Cookie & the_cookie ACE_ENV_ARG_DECL_WITH_DEFAULTS ) #if (TAO_HAS_MINIMUM_CORBA == 0) ACE_THROW_SPEC (( @@ -2532,7 +2532,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; PortableServer::POA_ptr adapter, const char * operation, PortableServer::ServantLocator::Cookie the_cookie, - PortableServer::Servant the_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant the_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2596,7 +2596,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static POA_ptr tao_nil (void); static POA_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2655,12 +2655,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static POA_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static POA_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static POA_ptr _nil (void) @@ -2695,12 +2695,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static AdapterAlreadyExists *_downcast (CORBA::Exception *); @@ -2736,12 +2736,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static AdapterNonExistent *_downcast (CORBA::Exception *); @@ -2778,12 +2778,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static InvalidPolicy *_downcast (CORBA::Exception *); @@ -2823,12 +2823,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NoServant *_downcast (CORBA::Exception *); @@ -2865,12 +2865,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ObjectAlreadyActive *_downcast (CORBA::Exception *); @@ -2906,12 +2906,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ObjectNotActive *_downcast (CORBA::Exception *); @@ -2947,12 +2947,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ServantAlreadyActive *_downcast (CORBA::Exception *); @@ -2988,12 +2988,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ServantNotActive *_downcast (CORBA::Exception *); @@ -3029,12 +3029,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static WrongAdapter *_downcast (CORBA::Exception *); @@ -3070,12 +3070,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static WrongPolicy *_downcast (CORBA::Exception *); @@ -3091,7 +3091,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual ::PortableServer::POA_ptr create_POA ( const char * adapter_name, PortableServer::POAManager_ptr a_POAManager, - const CORBA::PolicyList & policies TAO_ENV_ARG_DECL_WITH_DEFAULTS + const CORBA::PolicyList & policies ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3101,7 +3101,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual ::PortableServer::POA_ptr find_POA ( const char * adapter_name, - CORBA::Boolean activate_it TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean activate_it ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3110,7 +3110,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void destroy ( CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3119,7 +3119,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy ( - PortableServer::ThreadPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ThreadPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3128,21 +3128,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy ( - PortableServer::LifespanPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::LifespanPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( - PortableServer::IdUniquenessPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::IdUniquenessPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( - PortableServer::IdAssignmentPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::IdAssignmentPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3151,21 +3151,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( - PortableServer::ImplicitActivationPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ImplicitActivationPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( - PortableServer::ServantRetentionPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ServantRetentionPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( - PortableServer::RequestProcessingPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::RequestProcessingPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3174,28 +3174,28 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual char * the_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::POA_ptr the_parent ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::POAList * the_children ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::POAManager_ptr the_POAManager ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3204,21 +3204,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::AdapterActivator_ptr the_activator ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void the_activator ( - PortableServer::AdapterActivator_ptr the_activator TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::AdapterActivator_ptr the_activator ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::ServantManager_ptr get_servant_manager ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3226,7 +3226,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual void set_servant_manager ( - PortableServer::ServantManager_ptr imgr TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ServantManager_ptr imgr ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3234,7 +3234,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::Servant get_servant ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3243,7 +3243,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual void set_servant ( - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3253,7 +3253,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ::PortableServer::ObjectId * activate_object ( - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3263,7 +3263,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void activate_object_with_id ( const PortableServer::ObjectId & id, - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3273,7 +3273,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual void deactivate_object ( - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3282,7 +3282,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual CORBA::Object_ptr create_reference ( - const char * intf TAO_ENV_ARG_DECL_WITH_DEFAULTS + const char * intf ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3291,7 +3291,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId & oid, - const char * intf TAO_ENV_ARG_DECL_WITH_DEFAULTS + const char * intf ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3299,7 +3299,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::ObjectId * servant_to_id ( - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3308,7 +3308,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual CORBA::Object_ptr servant_to_reference ( - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3317,7 +3317,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::Servant reference_to_servant ( - CORBA::Object_ptr reference TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3327,7 +3327,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::ObjectId * reference_to_id ( - CORBA::Object_ptr reference TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3336,7 +3336,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3345,7 +3345,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual CORBA::Object_ptr id_to_reference ( - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3354,7 +3354,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::CORBA::OctetSeq * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3363,7 +3363,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ObjectId * create_id_for_reference ( - CORBA::Object_ptr the_ref TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3371,7 +3371,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::IDs * reference_to_ids ( - CORBA::Object_ptr the_ref TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3380,7 +3380,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void associate_reference_with_id ( CORBA::Object_ptr ref, - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3389,7 +3389,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void disassociate_reference_with_id ( CORBA::Object_ptr ref, - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3456,7 +3456,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static Current_ptr tao_nil (void); static Current_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -3514,12 +3514,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static Current_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static Current_ptr _nil (void) @@ -3550,12 +3550,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NoContext *_downcast (CORBA::Exception *); @@ -3569,7 +3569,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* end #if !defined */ virtual ::PortableServer::POA_ptr get_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3577,7 +3577,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::ObjectId * get_object_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i index ceea3c99d27..4023c0925a5 100644 --- a/TAO/tao/PortableServer/PortableServerC.i +++ b/TAO/tao/PortableServer/PortableServerC.i @@ -1061,10 +1061,10 @@ tao_PortableServer_ThreadPolicy_nil ( ACE_INLINE PortableServer::ThreadPolicy_ptr tao_PortableServer_ThreadPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ThreadPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1112,10 +1112,10 @@ tao_PortableServer_LifespanPolicy_nil ( ACE_INLINE PortableServer::LifespanPolicy_ptr tao_PortableServer_LifespanPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::LifespanPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1161,10 +1161,10 @@ tao_PortableServer_IdUniquenessPolicy_nil ( ACE_INLINE PortableServer::IdUniquenessPolicy_ptr tao_PortableServer_IdUniquenessPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::IdUniquenessPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1210,10 +1210,10 @@ tao_PortableServer_IdAssignmentPolicy_nil ( ACE_INLINE PortableServer::IdAssignmentPolicy_ptr tao_PortableServer_IdAssignmentPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::IdAssignmentPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1261,10 +1261,10 @@ tao_PortableServer_ImplicitActivationPolicy_nil ( ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr tao_PortableServer_ImplicitActivationPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ImplicitActivationPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1310,10 +1310,10 @@ tao_PortableServer_ServantRetentionPolicy_nil ( ACE_INLINE PortableServer::ServantRetentionPolicy_ptr tao_PortableServer_ServantRetentionPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ServantRetentionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1359,10 +1359,10 @@ tao_PortableServer_RequestProcessingPolicy_nil ( ACE_INLINE PortableServer::RequestProcessingPolicy_ptr tao_PortableServer_RequestProcessingPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::RequestProcessingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1414,10 +1414,10 @@ tao_PortableServer_POAManager_nil ( ACE_INLINE PortableServer::POAManager_ptr tao_PortableServer_POAManager_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::POAManager::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1465,10 +1465,10 @@ tao_PortableServer_AdapterActivator_nil ( ACE_INLINE PortableServer::AdapterActivator_ptr tao_PortableServer_AdapterActivator_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::AdapterActivator::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1514,10 +1514,10 @@ tao_PortableServer_ServantManager_nil ( ACE_INLINE PortableServer::ServantManager_ptr tao_PortableServer_ServantManager_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ServantManager::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1563,10 +1563,10 @@ tao_PortableServer_ServantActivator_nil ( ACE_INLINE PortableServer::ServantActivator_ptr tao_PortableServer_ServantActivator_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ServantActivator::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1612,10 +1612,10 @@ tao_PortableServer_ServantLocator_nil ( ACE_INLINE PortableServer::ServantLocator_ptr tao_PortableServer_ServantLocator_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ServantLocator::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1703,10 +1703,10 @@ tao_PortableServer_POA_nil ( ACE_INLINE PortableServer::POA_ptr tao_PortableServer_POA_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1756,10 +1756,10 @@ tao_PortableServer_Current_nil ( ACE_INLINE PortableServer::Current_ptr tao_PortableServer_Current_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::Current::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 43448eb0b26..fdfb09c078d 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -64,21 +64,21 @@ TAO_ServantBase::~TAO_ServantBase (void) } PortableServer::POA_ptr -TAO_ServantBase::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServantBase::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var object = - TAO_ORB_Core_instance ()->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_ORB_Core_instance ()->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); return PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_ServantBase::_is_a (const char* logical_type_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - const char *id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (logical_type_id, id) == 0) @@ -90,13 +90,13 @@ TAO_ServantBase::_is_a (const char* logical_type_id } CORBA::Boolean -TAO_ServantBase::_non_existent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServantBase::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } CORBA_InterfaceDef_ptr -TAO_ServantBase::_get_interface (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServantBase::_get_interface (ACE_ENV_SINGLE_ARG_DECL) { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -111,7 +111,7 @@ TAO_ServantBase::_get_interface (TAO_ENV_SINGLE_ARG_DECL) return adapter->get_interface (TAO_ORB_Core_instance ()->orb (), this->_interface_repository_id () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int @@ -131,7 +131,7 @@ TAO_ServantBase::_bind (const char *opname, } TAO_Stub * -TAO_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL) { TAO_Stub *stub = 0; @@ -151,15 +151,15 @@ TAO_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL) poa_current_impl->object_key (), this->_interface_repository_id (), poa_current_impl->priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else { - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::Object_var object = poa->servant_to_reference (this TAO_ENV_ARG_PARAMETER); + CORBA::Object_var object = poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the stub object @@ -180,7 +180,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch ( TAO_ServerRequest &req, void *servant_upcall, void *derived_this - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) //CORBA::Environment &ACE_TRY_ENV @@ -223,7 +223,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch ( // Invoke the skeleton, it will demarshal the arguments, // invoke the right operation on the skeleton class // (<derived_this>), and marshal any results. - skel (req, derived_this, servant_upcall TAO_ENV_ARG_PARAMETER); //, ACE_TRY_ENV); + skel (req, derived_this, servant_upcall ACE_ENV_ARG_PARAMETER); //, ACE_TRY_ENV); ACE_TRY_CHECK; // It is our job to send the already marshaled reply, but only @@ -266,7 +266,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch ( TAO_ServerRequest &req, void *servant_upcall, void *derived_this - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL // CORBA::Environment &ACE_TRY_ENV ) { @@ -306,7 +306,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch ( // Invoke the skeleton, it will demarshal the arguments, // invoke the right operation on the skeleton class // (<derived_this>), and marshal any results. - skel (req, derived_this, servant_upcall TAO_ENV_ARG_PARAMETER); + skel (req, derived_this, servant_upcall ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // It is our job to send the already marshaled reply, but only @@ -351,13 +351,13 @@ TAO_RefCountServantBase::~TAO_RefCountServantBase (void) } void -TAO_RefCountServantBase::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RefCountServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ++this->ref_count_; } void -TAO_RefCountServantBase::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RefCountServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { CORBA::ULong new_count = --this->ref_count_; @@ -485,7 +485,7 @@ TAO_ServantBase_var::_retn (void) void TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, void * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::BAD_OPERATION ()); } diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 7604d668c08..4dcc688c811 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -47,30 +47,30 @@ public: // Destructor. virtual PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Returns the default POA for this servant. virtual CORBA::Boolean _is_a (const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Local implementation of the CORBA::Object::_is_a method. - virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Default <_non_existent>: always returns false. virtual CORBA_InterfaceDef_ptr _get_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual void *_downcast (const char *repository_id) = 0; // Get the correct vtable. - virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL); // This is an auxiliar method for _this() and _narrow(). virtual void _dispatch (TAO_ServerRequest &request, void *servant_upcall - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Dispatches a request to the object: find the operation, cast the // type to the most derived type, demarshall all the parameters from // the request and finally invokes the operation, storing the @@ -93,12 +93,12 @@ protected: void *servant_upcall, void *derived_this // CORBA::Environment &ACE_TRY_ENV); - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void asynchronous_upcall_dispatch (TAO_ServerRequest &req, void *servant_upcall, void *derived_this - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //CORBA::Environment &ACE_TRY_ENV); virtual int _find (const char *opname, @@ -153,10 +153,10 @@ public: ~TAO_RefCountServantBase (void); // Destructor. - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Increase reference count by one. - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // 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. @@ -241,13 +241,13 @@ class TAO_PortableServer_Export TAO_Local_ServantBase // registered with the POA. // protected: - TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // This is an auxiliar method for _this(). Make sure *not* to // register with the default POA. void _dispatch (TAO_ServerRequest &request, void *servant_upcall - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Throws CORBA::BAD_OPERATION exception. }; diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i index d8478e202b0..2037908841a 100644 --- a/TAO/tao/PortableServer/Servant_Base.i +++ b/TAO/tao/PortableServer/Servant_Base.i @@ -7,7 +7,7 @@ TAO_Servant_Hash::operator () (PortableServer::Servant servant) const } ACE_INLINE TAO_Stub * -TAO_Local_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL) +TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL) { #if 0 PortableServer::ObjectId_var invalid_oid = @@ -27,10 +27,10 @@ TAO_Local_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL) // the creation of a local stub, hence causing a infinite loop. return TAO_ORB_Core_instance ()->orb ()->create_stub_object (tmp_key, this->_interface_repository_id () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else # if !defined (ACE_HAS_EXCEPTIONS) - ACE_UNUSED_ARG (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_UNUSED_ARG (ACE_ENV_SINGLE_ARG_PARAMETER); #endif return 0; #endif diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index 15b3b623328..eaeb04bc7e2 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -44,7 +44,7 @@ public: /// Dispatch the request to the servant. virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_ServerRequest &req - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Factory method for creating new POA's. virtual TAO_POA *create_POA (const ACE_CString &name, @@ -55,7 +55,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp index 5927d4fcbe0..b862fca42d2 100644 --- a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp @@ -25,7 +25,7 @@ void TAO_ServerRequestInterceptor_Adapter:: receive_request_service_contexts ( TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method implements one of the "starting" server side // interception point. @@ -43,7 +43,7 @@ receive_request_service_contexts ( { this->interceptors_[i]->receive_request_service_contexts ( ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The starting interception point completed successfully. @@ -55,7 +55,7 @@ receive_request_service_contexts ( { ri->forward_reference (exc); this->send_other (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->location_forwarded_ = 1; @@ -67,7 +67,7 @@ receive_request_service_contexts ( void TAO_ServerRequestInterceptor_Adapter:: receive_request (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method implements an "intermediate" server side interception // point. Interceptors are invoked in the same order they were @@ -91,7 +91,7 @@ receive_request (TAO_ServerRequestInfo *ri for (size_t i = 0; i < this->stack_size_; ++i) { this->interceptors_[i]->receive_request (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Note that no interceptors are pushed on to or popped off @@ -103,7 +103,7 @@ receive_request (TAO_ServerRequestInfo *ri { ri->forward_reference (exc); this->send_other (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->location_forwarded_ = 1; @@ -116,7 +116,7 @@ receive_request (TAO_ServerRequestInfo *ri void TAO_ServerRequestInterceptor_Adapter:: send_reply (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -137,7 +137,7 @@ send_reply (TAO_ServerRequestInfo *ri this->interceptors_[this->stack_size_]->send_reply ( ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -149,7 +149,7 @@ send_reply (TAO_ServerRequestInfo *ri void TAO_ServerRequestInterceptor_Adapter:: send_exception (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. @@ -172,7 +172,7 @@ send_exception (TAO_ServerRequestInfo *ri this->interceptors_[this->stack_size_]->send_exception ( ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -180,7 +180,7 @@ send_exception (TAO_ServerRequestInfo *ri { ri->forward_reference (exc); this->send_other (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->location_forwarded_ = 1; @@ -199,11 +199,11 @@ send_exception (TAO_ServerRequestInfo *ri ri->exception (&ACE_ANY_EXCEPTION); - this->send_exception (ri TAO_ENV_ARG_PARAMETER); + this->send_exception (ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus status = - ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Only re-throw the exception if it hasn't been transformed by @@ -220,7 +220,7 @@ send_exception (TAO_ServerRequestInfo *ri void TAO_ServerRequestInterceptor_Adapter:: send_other (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. @@ -243,7 +243,7 @@ send_other (TAO_ServerRequestInfo *ri this->interceptors_[this->stack_size_]->send_other ( ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -251,7 +251,7 @@ send_other (TAO_ServerRequestInfo *ri { ri->forward_reference (exc); this->send_other (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->location_forwarded_ = 1; diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.h b/TAO/tao/PortableServer/ServerInterceptorAdapter.h index 03aab708e15..04678976caf 100644 --- a/TAO/tao/PortableServer/ServerInterceptorAdapter.h +++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.h @@ -71,26 +71,26 @@ public: /// point. void receive_request_service_contexts ( TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method an "intermediate" server side interception point. void receive_request (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method implements one of the "ending" server side /// interception points. void send_reply (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method implements one of the "ending" server side /// interception points. void send_exception (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method implements one of the "ending" server side /// interception points. void send_other (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@} /// Returns true if a LOCATION_FORWARD was generated, and false diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp index 4dea2e6e54b..bf2bb46aec5 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.cpp +++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp @@ -33,7 +33,7 @@ TAO_ServerRequestInfo::TAO_ServerRequestInfo ( } CORBA::ULong -TAO_ServerRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // The request ID returned by this method need not correspond to the @@ -76,14 +76,14 @@ TAO_ServerRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_ServerRequestInfo::operation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->server_request_.operation ()); } Dynamic::ParameterList * -TAO_ServerRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -92,7 +92,7 @@ TAO_ServerRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -101,7 +101,7 @@ TAO_ServerRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ContextList * -TAO_ServerRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -110,7 +110,7 @@ TAO_ServerRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::RequestContext * -TAO_ServerRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -119,7 +119,7 @@ TAO_ServerRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Any * -TAO_ServerRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -128,7 +128,7 @@ TAO_ServerRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Boolean -TAO_ServerRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->server_request_.response_expected (); @@ -136,7 +136,7 @@ TAO_ServerRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) # if TAO_HAS_CORBA_MESSAGING == 1 Messaging::SyncScope -TAO_ServerRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.sync_with_server ()) @@ -149,7 +149,7 @@ TAO_ServerRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL) #endif /* TAO_HAS_CORBA_MESSAGING */ PortableInterceptor::ReplyStatus -TAO_ServerRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ == -1) @@ -162,7 +162,7 @@ TAO_ServerRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Object_ptr -TAO_ServerRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD) @@ -177,7 +177,7 @@ TAO_ServerRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -189,20 +189,20 @@ TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id if (pi_current == 0) ACE_THROW_RETURN (CORBA::INTERNAL (), 0); - pi_current->check_validity (id TAO_ENV_ARG_PARAMETER); + pi_current->check_validity (id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Retrieve the request scope PICurrent object. TAO_PICurrent_Impl &rsc = this->server_request_.rs_pi_current (); - return rsc.get_slot (id TAO_ENV_ARG_PARAMETER); + return rsc.get_slot (id ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ServerRequestInfo::get_request_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Service_Context &service_context_list = @@ -210,13 +210,13 @@ TAO_ServerRequestInfo::get_request_service_context ( return this->get_service_context_i (service_context_list, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ServerRequestInfo::get_reply_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Service_Context &service_context_list = @@ -224,14 +224,14 @@ TAO_ServerRequestInfo::get_reply_service_context ( return this->get_service_context_i (service_context_list, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ServerRequestInfo::get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create a new service context to be returned. Assume @@ -267,7 +267,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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION @@ -304,14 +304,14 @@ TAO_ServerRequestInfo::sending_exception (TAO_ENV_SINGLE_ARG_DECL) // = TAO specific method done since there currently is no simple way // to extract exceptions from an Any CORBA::Exception * -TAO_ServerRequestInfo::_sending_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerRequestInfo::_sending_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->caught_exception_; } char * -TAO_ServerRequestInfo::server_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) @@ -325,7 +325,7 @@ TAO_ServerRequestInfo::server_id (TAO_ENV_SINGLE_ARG_DECL) } char * -TAO_ServerRequestInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) @@ -338,7 +338,7 @@ TAO_ServerRequestInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL) } PortableInterceptor::AdapterName * -TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Fill in later @@ -354,7 +354,7 @@ TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL) { CORBA::StringSeq *adapter_name = 0; adapter_name = - this->servant_upcall_->poa ().adapter_name (TAO_ENV_SINGLE_ARG_PARAMETER); + this->servant_upcall_->poa ().adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return adapter_name; @@ -366,7 +366,7 @@ TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL) } CORBA::OctetSeq * -TAO_ServerRequestInfo::object_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) @@ -409,11 +409,11 @@ TAO_ServerRequestInfo::object_id (TAO_ENV_SINGLE_ARG_DECL) } CORBA::OctetSeq * -TAO_ServerRequestInfo::adapter_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) - return this->servant_upcall_->poa ().id (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->servant_upcall_->poa ().id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, CORBA::COMPLETED_NO), @@ -422,7 +422,7 @@ TAO_ServerRequestInfo::adapter_id (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Implemented in the generated skeleton. @@ -434,7 +434,7 @@ TAO_ServerRequestInfo::target_most_derived_interface ( CORBA::Policy_ptr TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Currently, it is only possible to retrieve the server policy @@ -458,7 +458,7 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type // object reference!!! CORBA::Policy_var policy = policies.get_policy_by_index (i); - CORBA::PolicyType ptype = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType ptype = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); if (ptype == type) @@ -482,7 +482,7 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type void TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, const CORBA::Any &data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -494,7 +494,7 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, if (pi_current == 0) ACE_THROW (CORBA::INTERNAL ()); - pi_current->check_validity (id TAO_ENV_ARG_PARAMETER); + pi_current->check_validity (id ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Retrieve the "request scope current" (RSC). @@ -507,13 +507,13 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, if (tsc != 0) tsc->copy (rsc, 1); // Deep copy - rsc.set_slot (id, data TAO_ENV_ARG_PARAMETER); + rsc.set_slot (id, data ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Boolean TAO_ServerRequestInfo::target_is_a (const char * /* id */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Implemented in the generated skeleton. @@ -526,7 +526,7 @@ void TAO_ServerRequestInfo::add_reply_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the service context from the list diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h index 3bd363ad2bd..bf2d856464b 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.h +++ b/TAO/tao/PortableServer/ServerRequestInfo.h @@ -65,43 +65,43 @@ 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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the operation name for the current request. virtual char * operation ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of arguments passed to the current operation. virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of exceptions the current operation is capable /// of throwing. virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ContextList * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::RequestContext * operation_context ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns true for a two-way operation, and false otherwis.e virtual CORBA::Boolean response_expected ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) ; #if TAO_HAS_CORBA_MESSAGING == 1 @@ -109,7 +109,7 @@ public: /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. virtual Messaging::SyncScope sync_scope ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_CORBA_MESSAGING */ @@ -118,20 +118,20 @@ public: /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT, /// TRANSPORT_RETRY. virtual PortableInterceptor::ReplyStatus reply_status ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// If the reply status is PortableInterceptor::LOCATION_FORWARD or /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the /// object reference to which the request was forwarded. virtual CORBA::Object_ptr forward_reference ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) ; /// Retrieve data from the "request scope" PICurrent object. virtual CORBA::Any * get_slot ( PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); @@ -139,14 +139,14 @@ public: /// from the request service context list. virtual IOP::ServiceContext * get_request_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return an Any containing the exception being sent, if any. @@ -155,7 +155,7 @@ public: * @note There is no trivial way to extract the exception from an Any. */ virtual CORBA::Any * sending_exception ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -164,51 +164,51 @@ public: * possible. */ virtual CORBA::Exception * _sending_exception ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the ObjectId for the target object. virtual CORBA::OctetSeq * object_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the AdapterId for the POA handling the current request. virtual CORBA::OctetSeq * adapter_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the server_id of the server. The value is passed to /// the ORB via -ORBServerId parameter. - virtual char * server_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the ORBId value that is passed to the ORB::Init call. - virtual char * orb_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the name of the object adapter that services requests for /// the invoked object. virtual PortableInterceptor::AdapterName * adapter_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + /// Return the most derived interface of the target object. virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_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_server_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Insert data into the "request scope" PICurrent object. virtual void set_slot ( PortableInterceptor::SlotId id, const CORBA::Any & data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); @@ -216,7 +216,7 @@ public: /// RepositoryId. virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the IOP::ServiceContext to the reply (outgoing) @@ -224,7 +224,7 @@ public: virtual void add_reply_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); public: @@ -262,7 +262,7 @@ protected: IOP::ServiceContext *get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp index 971f0e6cf42..46779d234b7 100644 --- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp @@ -36,16 +36,16 @@ TAO_Strategized_Object_Proxy_Broker::~TAO_Strategized_Object_Proxy_Broker (void) TAO_Object_Proxy_Impl & TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr object - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -53,7 +53,7 @@ TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr object void TAO_Strategized_Object_Proxy_Broker::create_proxy (int strategy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h index 94e90a7dc65..bcd2e1133cc 100644 --- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h @@ -44,12 +44,12 @@ public: ~TAO_Strategized_Object_Proxy_Broker (void); virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: void create_proxy (int collocation_strategy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp index c7de619af4e..8a0aec21337 100644 --- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp +++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp @@ -23,7 +23,7 @@ TAO_ThruPOA_Object_Proxy_Impl::~TAO_ThruPOA_Object_Proxy_Impl (void) CORBA::Boolean TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Object_Adapter::Servant_Upcall servant_upcall (target->_stubobj ()->servant_orb_var ()->orb_core ()); @@ -33,9 +33,9 @@ TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, target->_object_key (), "_is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return servant_upcall.servant ()->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER); + return servant_upcall.servant ()->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER); } @@ -43,7 +43,7 @@ TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, CORBA::Boolean TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean _tao_retval = 0; @@ -59,10 +59,10 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target target->_object_key (), "_non_existent", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return servant_upcall.servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return servant_upcall.servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { @@ -79,7 +79,7 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target CORBA_InterfaceDef_ptr TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -93,10 +93,10 @@ TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target target->_object_key (), "_get_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return servant_upcall.servant ()->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + return servant_upcall.servant ()->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h index fdb1cf2225d..4bfa5073345 100644 --- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h +++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h @@ -49,16 +49,16 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); #if (TAO_HAS_MINIMUM_CORBA == 0) virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA_InterfaceDef_ptr _get_interface ( const CORBA::Object_ptr target - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h index bbe4bbbdfe6..c121d52b57b 100644 --- a/TAO/tao/PortableServer/poa_macros.h +++ b/TAO/tao/PortableServer/poa_macros.h @@ -25,12 +25,12 @@ ACE_CHECK_RETURN (RETURN) #define TAO_POA_GUARD \ - TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER); \ + TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \ ACE_UNUSED_ARG (poa_guard); \ ACE_CHECK #define TAO_POA_GUARD_RETURN(RETURN) \ - TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER); \ + TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \ ACE_UNUSED_ARG (poa_guard); \ ACE_CHECK_RETURN (RETURN) diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 5b08ea1692d..e93edd40a4a 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -24,13 +24,13 @@ TAO_Profile::~TAO_Profile (void) void TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Sanity checks. - this->verify_orb_configuration (TAO_ENV_SINGLE_ARG_PARAMETER); + this->verify_orb_configuration (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->verify_profile_version (TAO_ENV_SINGLE_ARG_PARAMETER); + this->verify_profile_version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ---------------------------------------------------------------- @@ -41,7 +41,7 @@ TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component void TAO_Profile::policies (CORBA::PolicyList *policy_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -67,7 +67,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list { TAO_OutputCDR out_CDR; policy_value_seq[i].ptype = - (*policy_list)[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + (*policy_list)[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; out_CDR << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER); @@ -122,14 +122,14 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list #else /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_UNUSED_ARG (policy_list); - TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ } CORBA::PolicyList& -TAO_Profile::policies (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Profile::policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -189,7 +189,7 @@ TAO_Profile::policies (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) this->orb_core_->orb ()->create_policy ( policy_value_seq[i].ptype, dummy_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (policy.in ())) @@ -255,7 +255,7 @@ TAO_Profile::the_stub (void) } void -TAO_Profile::verify_orb_configuration (TAO_ENV_SINGLE_ARG_DECL) +TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL) { // If the ORB isn't configured to support tagged components, then // throw an exception. @@ -286,7 +286,7 @@ TAO_Profile::verify_orb_configuration (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Profile::verify_profile_version (TAO_ENV_SINGLE_ARG_DECL) +TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL) { // GIOP 1.0 does not support tagged components. Throw an exception // if the profile is a GIOP 1.0 profile. @@ -324,10 +324,10 @@ TAO_Profile::supports_multicast (void) const void TAO_Profile::addressing_mode (CORBA::Short addr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ** See race condition note about addressing mode in Profile.h ** - switch (addr) + switch (addr) { case TAO_Target_Specification::Key_Addr: case TAO_Target_Specification::Profile_Addr: @@ -370,7 +370,7 @@ TAO_Unknown_Profile::endpoint_count (void) void TAO_Unknown_Profile::parse_string (const char * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // @@ THROW something???? } @@ -382,7 +382,7 @@ TAO_Unknown_Profile::object_key_delimiter (void) const } char * -TAO_Unknown_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Unknown_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // @@ THROW something? return 0; @@ -437,7 +437,7 @@ TAO_Unknown_Profile::is_equivalent (const TAO_Profile* other_profile) CORBA::ULong TAO_Unknown_Profile::hash (CORBA::ULong max - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return (ACE::hash_pjw (ACE_reinterpret_cast (const char*, this->body_.get_buffer ()), diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index df49d2cbf79..a1fb45772ba 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -79,7 +79,7 @@ public: /// Add the given tagged component to the profile. void add_tagged_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The object key delimiter. virtual char object_key_delimiter (void) const = 0; @@ -87,11 +87,11 @@ public: /// Initialize this object using the given input string. /// Supports URL style of object references virtual void parse_string (const char *string - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Return a string representation for this profile. client must /// deallocate memory. - virtual char* to_string (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL) = 0; /// Initialize this object using the given CDR octet string. virtual int decode (TAO_InputCDR& cdr) = 0; @@ -132,7 +132,7 @@ public: /// Return a hash value for this object. virtual CORBA::ULong hash (CORBA::ULong max - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /** * This method is used to get the IOP::TaggedProfile. The profile @@ -147,10 +147,10 @@ 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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Accessor for the client exposed policies of this profile. - virtual CORBA::PolicyList& policies (TAO_ENV_SINGLE_ARG_DECL); + virtual CORBA::PolicyList& policies (ACE_ENV_SINGLE_ARG_DECL); /// Sets the TAO_Stub to which this profile is associated. virtual void the_stub (TAO_Stub *stub); @@ -163,33 +163,33 @@ public: /** * Set the addressing mode if a remote servant replies with - * an addressing mode exception. If this profile doesn't + * an addressing mode exception. If this profile doesn't * support a particular addressing mode, this method needs to * be overridden signal the appropriate error. * * ** RACE CONDITION NOTE ** - * + * * Currently, getting and setting the addressing mode is not * protected by a mutex. Theoretically, this could cause a race * condition if one thread sends a request, then gets an exception * from the remote servant to change the addressing mode, and then - * another thread sends a different request to the same servant - * using the wrong addressing mode. The result of this is that + * another thread sends a different request to the same servant + * using the wrong addressing mode. The result of this is that * we'll get another address change exception. (Annoying, but not * that bad.) * - * In practice at the current time, the above theoretical case + * In practice at the current time, the above theoretical case * never happens since the target specification always uses the * object key except for MIOP requests. Remote ORBs can't respond * to MIOP requests even to send exceptions, so even in this case, * the race condition can't happen. * * Therefore, for the time being, there is no lock to protect the - * addressing mode. Given that the addressing mode is checked in + * addressing mode. Given that the addressing mode is checked in * the critical path, this decision seems like a good thing. */ virtual void addressing_mode (CORBA::Short addr_mode - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Return the current addressing mode for this profile. @@ -204,11 +204,11 @@ private: /// Verify that the current ORB's configuration supports tagged /// components in IORs. - void verify_orb_configuration (TAO_ENV_SINGLE_ARG_DECL); + void verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL); /// Verify that the given profile supports tagged components, /// i.e. is not a GIOP 1.0 profile. - void verify_profile_version (TAO_ENV_SINGLE_ARG_DECL); + void verify_profile_version (ACE_ENV_SINGLE_ARG_DECL); // Profiles should not be copied! ACE_UNIMPLEMENTED_FUNC (TAO_Profile (const TAO_Profile&)) @@ -285,9 +285,9 @@ public: // = The TAO_Profile methods look above virtual void parse_string (const char *string - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual char object_key_delimiter (void) const; - virtual char* to_string (TAO_ENV_SINGLE_ARG_DECL); + virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL); virtual int decode (TAO_InputCDR& cdr); virtual int encode (TAO_OutputCDR &stream) const; virtual int encode_endpoints (void); @@ -297,7 +297,7 @@ public: virtual size_t endpoint_count (void); virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile); virtual CORBA::ULong hash (CORBA::ULong max - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual IOP::TaggedProfile &create_tagged_profile (void); private: diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index 26ec85f7fd9..c722caf2875 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -36,7 +36,7 @@ public: /// Initialize the protocols hooks instance. virtual void init_hooks (TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual int call_client_protocols_hook (int &send_buffer_size, int &recv_buffer_size, @@ -52,12 +52,12 @@ public: virtual void rt_service_context (TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean restart - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void add_rt_service_context_hook (TAO_Service_Context &service_context, CORBA::Policy *model_policy, CORBA::Short &client_priority - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean @@ -78,31 +78,31 @@ public: */ //@{ virtual int get_thread_CORBA_priority (CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual int get_thread_native_priority (CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual int get_thread_CORBA_and_native_priority (CORBA::Short &, CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual int set_thread_CORBA_priority (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual int set_thread_native_priority (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; //@} /// Sets the default_policies for ORB. /// 1. Sets ORB-level policy defaults for this ORB. Currently sets /// default RTCORBA policies: ClientProtocolPolicy. - virtual int set_default_policies (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL) = 0; /// Sets the default ServerProtocolPolicy. virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index 9cba7514220..0550a51140b 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -15,14 +15,14 @@ TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void) TAO_Priority_Mapping_Manager_ptr TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return TAO_Priority_Mapping_Manager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TAO_Priority_Mapping_Manager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO_Priority_Mapping_Manager_ptr TAO_Priority_Mapping_Manager::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_Priority_Mapping_Manager::_nil (); diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 3fa4907dd04..039e62c8e87 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -67,11 +67,11 @@ 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_Priority_Mapping_Manager_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_Priority_Mapping_Manager_ptr _nil (void) { @@ -124,7 +124,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 * TAO_ENV_ARG_DECL_NOT_USED); + static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * upcast (void *); private: diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i index 145ef13c934..718af03a334 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i @@ -119,10 +119,10 @@ TAO_Priority_Mapping_Manager_var::nil (void) ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr TAO_Priority_Mapping_Manager_var::narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_Priority_Mapping_Manager::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_Priority_Mapping_Manager::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index c17161d2278..90c2865f8a8 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -507,10 +507,10 @@ tao_RTCORBA_PriorityModelPolicy_nil ( RTCORBA::PriorityModelPolicy_ptr tao_RTCORBA_PriorityModelPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::PriorityModelPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::PriorityModelPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -634,10 +634,10 @@ RTCORBA::PriorityModelPolicy_var::tao_nil (void) ::RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::PriorityModelPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::PriorityModelPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -719,15 +719,15 @@ RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void) RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PriorityModelPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return PriorityModelPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -819,10 +819,10 @@ tao_RTCORBA_ThreadpoolPolicy_nil ( RTCORBA::ThreadpoolPolicy_ptr tao_RTCORBA_ThreadpoolPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::ThreadpoolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::ThreadpoolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -946,10 +946,10 @@ RTCORBA::ThreadpoolPolicy_var::tao_nil (void) ::RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::ThreadpoolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::ThreadpoolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1031,15 +1031,15 @@ RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void) RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ThreadpoolPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ThreadpoolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1127,10 +1127,10 @@ tao_RTCORBA_ProtocolProperties_nil ( RTCORBA::ProtocolProperties_ptr tao_RTCORBA_ProtocolProperties_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::ProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::ProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1254,10 +1254,10 @@ RTCORBA::ProtocolProperties_var::tao_nil (void) ::RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::ProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::ProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1339,15 +1339,15 @@ RTCORBA::ProtocolProperties::~ProtocolProperties (void) RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1523,10 +1523,10 @@ tao_RTCORBA_ServerProtocolPolicy_nil ( RTCORBA::ServerProtocolPolicy_ptr tao_RTCORBA_ServerProtocolPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::ServerProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::ServerProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1650,10 +1650,10 @@ RTCORBA::ServerProtocolPolicy_var::tao_nil (void) ::RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::ServerProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::ServerProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1735,15 +1735,15 @@ RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void) RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServerProtocolPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServerProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1835,10 +1835,10 @@ tao_RTCORBA_ClientProtocolPolicy_nil ( RTCORBA::ClientProtocolPolicy_ptr tao_RTCORBA_ClientProtocolPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::ClientProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::ClientProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1962,10 +1962,10 @@ RTCORBA::ClientProtocolPolicy_var::tao_nil (void) ::RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::ClientProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::ClientProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2047,15 +2047,15 @@ RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void) RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ClientProtocolPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ClientProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2147,10 +2147,10 @@ tao_RTCORBA_PrivateConnectionPolicy_nil ( RTCORBA::PrivateConnectionPolicy_ptr tao_RTCORBA_PrivateConnectionPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::PrivateConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::PrivateConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2274,10 +2274,10 @@ RTCORBA::PrivateConnectionPolicy_var::tao_nil (void) ::RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::PrivateConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::PrivateConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2359,15 +2359,15 @@ RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void) RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PrivateConnectionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return PrivateConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2455,10 +2455,10 @@ tao_RTCORBA_TCPProtocolProperties_nil ( RTCORBA::TCPProtocolProperties_ptr tao_RTCORBA_TCPProtocolProperties_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::TCPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::TCPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2582,10 +2582,10 @@ RTCORBA::TCPProtocolProperties_var::tao_nil (void) ::RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::TCPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::TCPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2682,15 +2682,15 @@ RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void) RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TCPProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TCPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2778,10 +2778,10 @@ tao_RTCORBA_GIOPProtocolProperties_nil ( RTCORBA::GIOPProtocolProperties_ptr tao_RTCORBA_GIOPProtocolProperties_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::GIOPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::GIOPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2905,10 +2905,10 @@ RTCORBA::GIOPProtocolProperties_var::tao_nil (void) ::RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::GIOPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::GIOPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2990,15 +2990,15 @@ RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void) RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return GIOPProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return GIOPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3086,10 +3086,10 @@ tao_RTCORBA_UnixDomainProtocolProperties_nil ( RTCORBA::UnixDomainProtocolProperties_ptr tao_RTCORBA_UnixDomainProtocolProperties_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::UnixDomainProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::UnixDomainProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3213,10 +3213,10 @@ RTCORBA::UnixDomainProtocolProperties_var::tao_nil (void) ::RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::UnixDomainProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::UnixDomainProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3298,15 +3298,15 @@ RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void) RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return UnixDomainProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return UnixDomainProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3394,10 +3394,10 @@ tao_RTCORBA_SharedMemoryProtocolProperties_nil ( RTCORBA::SharedMemoryProtocolProperties_ptr tao_RTCORBA_SharedMemoryProtocolProperties_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::SharedMemoryProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::SharedMemoryProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3521,10 +3521,10 @@ RTCORBA::SharedMemoryProtocolProperties_var::tao_nil (void) ::RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::SharedMemoryProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::SharedMemoryProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3606,15 +3606,15 @@ RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void) RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return SharedMemoryProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return SharedMemoryProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3993,10 +3993,10 @@ tao_RTCORBA_PriorityBandedConnectionPolicy_nil ( RTCORBA::PriorityBandedConnectionPolicy_ptr tao_RTCORBA_PriorityBandedConnectionPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4120,10 +4120,10 @@ RTCORBA::PriorityBandedConnectionPolicy_var::tao_nil (void) ::RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::PriorityBandedConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::PriorityBandedConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4205,15 +4205,15 @@ RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void) RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return PriorityBandedConnectionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return PriorityBandedConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4301,10 +4301,10 @@ tao_RTCORBA_Current_nil ( RTCORBA::Current_ptr tao_RTCORBA_Current_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4428,10 +4428,10 @@ RTCORBA::Current_var::tao_nil (void) ::RTCORBA::Current_ptr RTCORBA::Current_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4513,15 +4513,15 @@ RTCORBA::Current::~Current (void) RTCORBA::Current_ptr RTCORBA::Current::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::Current_ptr RTCORBA::Current::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4609,10 +4609,10 @@ tao_RTCORBA_Mutex_nil ( RTCORBA::Mutex_ptr tao_RTCORBA_Mutex_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::Mutex::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::Mutex::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4736,10 +4736,10 @@ RTCORBA::Mutex_var::tao_nil (void) ::RTCORBA::Mutex_ptr RTCORBA::Mutex_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::Mutex::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::Mutex::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4821,15 +4821,15 @@ RTCORBA::Mutex::~Mutex (void) RTCORBA::Mutex_ptr RTCORBA::Mutex::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Mutex::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Mutex::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::Mutex_ptr RTCORBA::Mutex::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4905,10 +4905,10 @@ tao_RTCORBA_RTORB_nil ( RTCORBA::RTORB_ptr tao_RTCORBA_RTORB_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTCORBA::RTORB::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTCORBA::RTORB::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5032,10 +5032,10 @@ RTCORBA::RTORB_var::tao_nil (void) ::RTCORBA::RTORB_ptr RTCORBA::RTORB_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTCORBA::RTORB::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTCORBA::RTORB::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5117,15 +5117,15 @@ RTCORBA::RTORB::~RTORB (void) RTCORBA::RTORB_ptr RTCORBA::RTORB::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTORB::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RTORB::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTCORBA::RTORB_ptr RTCORBA::RTORB::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -5220,7 +5220,7 @@ void RTCORBA::RTORB::MutexNotFound::_raise () void RTCORBA::RTORB::MutexNotFound::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5228,7 +5228,7 @@ void RTCORBA::RTORB::MutexNotFound::_tao_encode ( void RTCORBA::RTORB::MutexNotFound::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5288,7 +5288,7 @@ void RTCORBA::RTORB::InvalidThreadpool::_raise () void RTCORBA::RTORB::InvalidThreadpool::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5296,7 +5296,7 @@ void RTCORBA::RTORB::InvalidThreadpool::_tao_encode ( void RTCORBA::RTORB::InvalidThreadpool::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5347,7 +5347,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::Threadpoo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLane TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLane ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5438,7 +5438,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::Threadpoo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLanes TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLanes ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5501,7 +5501,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, RTCORBA::PriorityModel & { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityModel TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityModel ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5631,7 +5631,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityB { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBand TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBand ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5722,7 +5722,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityB { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBands TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBands ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index f7ff8be6f89..77c8a3cbd10 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -367,7 +367,7 @@ TAO_NAMESPACE RTCORBA static PriorityModelPolicy_ptr tao_nil (void); static PriorityModelPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -425,12 +425,12 @@ TAO_NAMESPACE RTCORBA static PriorityModelPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PriorityModelPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PriorityModelPolicy_ptr _nil (void) @@ -439,14 +439,14 @@ TAO_NAMESPACE RTCORBA } virtual RTCORBA::PriorityModel priority_model ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual RTCORBA::Priority server_priority ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -512,7 +512,7 @@ TAO_NAMESPACE RTCORBA static ThreadpoolPolicy_ptr tao_nil (void); static ThreadpoolPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -570,12 +570,12 @@ TAO_NAMESPACE RTCORBA static ThreadpoolPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ThreadpoolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ThreadpoolPolicy_ptr _nil (void) @@ -584,7 +584,7 @@ TAO_NAMESPACE RTCORBA } virtual RTCORBA::ThreadpoolId threadpool ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -648,7 +648,7 @@ TAO_NAMESPACE RTCORBA static ProtocolProperties_ptr tao_nil (void); static ProtocolProperties_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -707,12 +707,12 @@ class TAO_RTCORBA_Export ProtocolProperties static ProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ProtocolProperties_ptr _nil (void) @@ -1010,7 +1010,7 @@ class TAO_RTCORBA_Export ProtocolProperties static ServerProtocolPolicy_ptr tao_nil (void); static ServerProtocolPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1068,12 +1068,12 @@ class TAO_RTCORBA_Export ProtocolProperties static ServerProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerProtocolPolicy_ptr _nil (void) @@ -1082,7 +1082,7 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual RTCORBA::ProtocolList * protocols ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1148,7 +1148,7 @@ class TAO_RTCORBA_Export ProtocolProperties static ClientProtocolPolicy_ptr tao_nil (void); static ClientProtocolPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1206,12 +1206,12 @@ class TAO_RTCORBA_Export ProtocolProperties static ClientProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ClientProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ClientProtocolPolicy_ptr _nil (void) @@ -1220,7 +1220,7 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual RTCORBA::ProtocolList * protocols ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1286,7 +1286,7 @@ class TAO_RTCORBA_Export ProtocolProperties static PrivateConnectionPolicy_ptr tao_nil (void); static PrivateConnectionPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1344,12 +1344,12 @@ class TAO_RTCORBA_Export ProtocolProperties static PrivateConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PrivateConnectionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PrivateConnectionPolicy_ptr _nil (void) @@ -1415,7 +1415,7 @@ class TAO_RTCORBA_Export ProtocolProperties static TCPProtocolProperties_ptr tao_nil (void); static TCPProtocolProperties_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1473,12 +1473,12 @@ class TAO_RTCORBA_Export ProtocolProperties static TCPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TCPProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TCPProtocolProperties_ptr _nil (void) @@ -1487,7 +1487,7 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual CORBA::Long send_buffer_size ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1495,14 +1495,14 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void send_buffer_size ( CORBA::Long send_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Long recv_buffer_size ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1510,14 +1510,14 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void recv_buffer_size ( CORBA::Long recv_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Boolean keep_alive ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1525,14 +1525,14 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void keep_alive ( CORBA::Boolean keep_alive - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Boolean dont_route ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1540,14 +1540,14 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void dont_route ( CORBA::Boolean dont_route - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Boolean no_delay ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1555,7 +1555,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void no_delay ( CORBA::Boolean no_delay - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1619,7 +1619,7 @@ class TAO_RTCORBA_Export ProtocolProperties static GIOPProtocolProperties_ptr tao_nil (void); static GIOPProtocolProperties_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1677,12 +1677,12 @@ class TAO_RTCORBA_Export ProtocolProperties static GIOPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static GIOPProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static GIOPProtocolProperties_ptr _nil (void) @@ -1748,7 +1748,7 @@ class TAO_RTCORBA_Export ProtocolProperties static UnixDomainProtocolProperties_ptr tao_nil (void); static UnixDomainProtocolProperties_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1806,12 +1806,12 @@ class TAO_RTCORBA_Export ProtocolProperties static UnixDomainProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static UnixDomainProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static UnixDomainProtocolProperties_ptr _nil (void) @@ -1820,7 +1820,7 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual CORBA::Long send_buffer_size ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1828,14 +1828,14 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void send_buffer_size ( CORBA::Long send_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Long recv_buffer_size ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1843,7 +1843,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void recv_buffer_size ( CORBA::Long recv_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1907,7 +1907,7 @@ class TAO_RTCORBA_Export ProtocolProperties static SharedMemoryProtocolProperties_ptr tao_nil (void); static SharedMemoryProtocolProperties_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1965,12 +1965,12 @@ class TAO_RTCORBA_Export ProtocolProperties static SharedMemoryProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static SharedMemoryProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static SharedMemoryProtocolProperties_ptr _nil (void) @@ -1979,7 +1979,7 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual CORBA::Long preallocate_buffer_size ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1987,14 +1987,14 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void preallocate_buffer_size ( CORBA::Long preallocate_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual char * mmap_filename ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2002,14 +2002,14 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void mmap_filename ( const char * mmap_filename - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual char * mmap_lockname ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2017,7 +2017,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void mmap_lockname ( const char * mmap_lockname - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2302,7 +2302,7 @@ class TAO_RTCORBA_Export ProtocolProperties static PriorityBandedConnectionPolicy_ptr tao_nil (void); static PriorityBandedConnectionPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2360,12 +2360,12 @@ class TAO_RTCORBA_Export ProtocolProperties static PriorityBandedConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PriorityBandedConnectionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static PriorityBandedConnectionPolicy_ptr _nil (void) @@ -2374,7 +2374,7 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual RTCORBA::PriorityBands * priority_bands ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2438,7 +2438,7 @@ class TAO_RTCORBA_Export ProtocolProperties static Current_ptr tao_nil (void); static Current_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2496,12 +2496,12 @@ class TAO_RTCORBA_Export ProtocolProperties static Current_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Current_ptr _nil (void) @@ -2510,7 +2510,7 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual RTCORBA::Priority the_priority ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2518,7 +2518,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void the_priority ( RTCORBA::Priority the_priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2582,7 +2582,7 @@ class TAO_RTCORBA_Export ProtocolProperties static Mutex_ptr tao_nil (void); static Mutex_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2640,12 +2640,12 @@ class TAO_RTCORBA_Export ProtocolProperties static Mutex_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Mutex_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Mutex_ptr _nil (void) @@ -2654,14 +2654,14 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual void lock ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void unlock ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2669,7 +2669,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual CORBA::Boolean try_lock ( TimeBase::TimeT max_wait - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2733,7 +2733,7 @@ class TAO_RTCORBA_Export ProtocolProperties static RTORB_ptr tao_nil (void); static RTORB_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2791,12 +2791,12 @@ class TAO_RTCORBA_Export ProtocolProperties static RTORB_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RTORB_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static RTORB_ptr _nil (void) @@ -2805,7 +2805,7 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual RTCORBA::Mutex_ptr create_mutex ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2813,7 +2813,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void destroy_mutex ( RTCORBA::Mutex_ptr the_mutex - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2842,12 +2842,12 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static MutexNotFound *_downcast (CORBA::Exception *); @@ -2863,7 +2863,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual RTCORBA::Mutex_ptr create_named_mutex ( const char * name, CORBA::Boolean_out created_flag - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2871,7 +2871,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual RTCORBA::Mutex_ptr open_named_mutex ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2884,7 +2884,7 @@ class TAO_RTCORBA_Export ProtocolProperties CORBA::Boolean keep_alive, CORBA::Boolean dont_route, CORBA::Boolean no_delay - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2913,12 +2913,12 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static InvalidThreadpool *_narrow (CORBA::Exception *); @@ -2939,7 +2939,7 @@ class TAO_RTCORBA_Export ProtocolProperties CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2952,7 +2952,7 @@ class TAO_RTCORBA_Export ProtocolProperties CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2960,7 +2960,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual void destroy_threadpool ( RTCORBA::ThreadpoolId threadpool - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2970,7 +2970,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy ( RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2978,7 +2978,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy ( RTCORBA::ThreadpoolId threadpool - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2986,7 +2986,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy ( const RTCORBA::PriorityBands & priority_bands - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2994,7 +2994,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy ( const RTCORBA::ProtocolList & protocols - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3002,14 +3002,14 @@ class TAO_RTCORBA_Export ProtocolProperties virtual RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy ( const RTCORBA::ProtocolList & protocols - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp index f49b60d835a..006e3847de7 100644 --- a/TAO/tao/RTCORBA/RT_Current.cpp +++ b/TAO/tao/RTCORBA/RT_Current.cpp @@ -28,16 +28,16 @@ TAO_RT_Current::~TAO_RT_Current (void) } RTCORBA::Priority -TAO_RT_Current::the_priority (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::Priority priority; - TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); int result = tph->get_thread_CORBA_priority (priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == -1) @@ -48,15 +48,15 @@ TAO_RT_Current::the_priority (TAO_ENV_SINGLE_ARG_DECL) void TAO_RT_Current::the_priority (RTCORBA::Priority the_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; int result = tph->set_thread_CORBA_priority (the_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == -1) diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h index 074c77428da..464a679b49c 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -50,11 +50,11 @@ public: /// Default constructor. TAO_RT_Current (TAO_ORB_Core *orb_core); - virtual RTCORBA::Priority the_priority (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual RTCORBA::Priority the_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void the_priority (RTCORBA::Priority the_priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 515421473a5..494c432ae3e 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp @@ -43,7 +43,7 @@ RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void) TAO_Invocation_Endpoint_Selector * RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize selection state with all RTCORBA policies affecting // endpoint selection. @@ -64,17 +64,17 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation } CORBA::Policy_var priority_model_policy = - rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // state.private_connection_ = // rt_stub->private_connection (); CORBA::Policy_var client_protocol_policy = - TAO_RT_Endpoint_Utils::client_protocol_policy (invocation TAO_ENV_ARG_PARAMETER); + TAO_RT_Endpoint_Utils::client_protocol_policy (invocation ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation TAO_ENV_ARG_PARAMETER); + CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ -106,7 +106,7 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation CORBA::Short server_priority = 0; CORBA::Boolean is_client_propagated = 0; - TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); tph->get_selector_hook (priority_model_policy.in (), @@ -145,7 +145,7 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation void RT_Endpoint_Selector_Factory:: init_client_protocol (TAO_GIOP_Invocation * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RT_Endpoint_Selector_Factory:init_client_protocol - Is deprecated!"))); /* @@ -155,7 +155,7 @@ init_client_protocol (TAO_GIOP_Invocation * ACE_TRY { invocation->endpoint_selection_state_.client_protocol_policy_ = - rt_stub->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER); + rt_stub->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::INV_POLICY, ex) diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h index 1efa78fc1d7..d0d36a772c4 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h @@ -65,7 +65,7 @@ public: /// initialize the endpoint selection state instance. virtual TAO_Invocation_Endpoint_Selector *get_selector ( TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: @@ -74,12 +74,12 @@ protected: /// Initializes RTCORBA::ClientProtocolPolicy in the endpoint /// selection state. void init_client_protocol (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Initializes RTCORBA::PriorityBandsPolicy in the endpoint /// selection state. // void init_bands (TAO_GIOP_Invocation *invocation, - // TAO_ENV_SINGLE_ARG_DECL); + // ACE_ENV_SINGLE_ARG_DECL); private: /// The possible endpoint selector strategies that can be diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp index a40e7fa42b6..0bebf0d6146 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp @@ -11,7 +11,7 @@ ACE_RCSID(tao, RT_Endpoint_Utils, "$Id$") CORBA::Policy * TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Policy *bands_policy = CORBA::Policy::_nil (); TAO_RT_Stub *rt_stub = @@ -20,7 +20,7 @@ TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation ACE_TRY { bands_policy = - rt_stub->effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER); + rt_stub->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::INV_POLICY, ex) @@ -41,7 +41,7 @@ TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation CORBA::Policy * TAO_RT_Endpoint_Utils::client_protocol_policy (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *, invocation->stub ()); @@ -49,7 +49,7 @@ TAO_RT_Endpoint_Utils::client_protocol_policy (TAO_GIOP_Invocation *invocation CORBA::Policy *retval = 0; ACE_TRY { - retval = rt_stub->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = rt_stub->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::INV_POLICY, ex) diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h index 26f39e1d7d8..6f3cf0d5c87 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h @@ -37,10 +37,10 @@ class TAO_RTCORBA_Export TAO_RT_Endpoint_Utils { public: static CORBA::Policy *priority_bands_policy (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); static CORBA::Policy *client_protocol_policy (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + 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 707bc3fe74e..34a3236e2d8 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -24,7 +24,7 @@ ACE_RCSID(tao, RT_Invocation_Endpoint_Selectors, "$Id$") void TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *, @@ -44,14 +44,14 @@ TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocati TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (), ACE_reinterpret_cast (long, invocation->stub ())); - status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER); + status = invocation->perform_call (private_desc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { TAO_Base_Transport_Property default_desc (invocation->endpoint ()); - status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER); + status = invocation->perform_call (default_desc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -76,18 +76,18 @@ TAO_Priority_Endpoint_Selector::~TAO_Priority_Endpoint_Selector (void) void TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *, invocation->stub ()); CORBA::Short client_priority; // Get client priority. - TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (tph->get_thread_CORBA_priority (client_priority - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) == -1) ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); @@ -158,7 +158,7 @@ TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation { if (invocation->inconsistent_policies ().ptr ()) { - CORBA::Policy_var priority_model_policy = rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Policy_var priority_model_policy = rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; invocation->inconsistent_policies ()->length (1); @@ -177,14 +177,14 @@ TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (), ACE_reinterpret_cast (long, invocation->stub ())); - status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER); + status = invocation->perform_call (private_desc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { TAO_Base_Transport_Property default_desc (invocation->endpoint ()); - status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER); + status = invocation->perform_call (default_desc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -223,21 +223,21 @@ TAO_Bands_Endpoint_Selector::~TAO_Bands_Endpoint_Selector (void) void TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *, invocation->stub ()); TAO_Protocols_Hooks *protocol_hooks = - invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + invocation->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Figure out target priority. CORBA::Policy_var priority_model_policy = - rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Short server_priority = 0; @@ -255,7 +255,7 @@ TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation int status = protocol_hooks->get_thread_CORBA_priority (p // side effect - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (status == -1) { @@ -366,14 +366,14 @@ TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (), ACE_reinterpret_cast (long, invocation->stub ())); - status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER); + status = invocation->perform_call (private_desc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { TAO_Base_Transport_Property default_desc (invocation->endpoint ()); - status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER); + status = invocation->perform_call (default_desc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -400,15 +400,15 @@ TAO_Protocol_Endpoint_Selector::~TAO_Protocol_Endpoint_Selector (void) void TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { /// Narrow down to the right policy. CORBA::Policy_var cp = - TAO_RT_Endpoint_Utils::client_protocol_policy (invocation TAO_ENV_ARG_PARAMETER); + TAO_RT_Endpoint_Utils::client_protocol_policy (invocation ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTCORBA::ClientProtocolPolicy_var cp_policy = - RTCORBA::ClientProtocolPolicy::_narrow (cp.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::ClientProtocolPolicy::_narrow (cp.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; /// Cast to TAO_ClientProtocolPolicy @@ -454,14 +454,14 @@ TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (), ACE_reinterpret_cast (long, invocation->stub ())); - status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER); + status = invocation->perform_call (private_desc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { TAO_Base_Transport_Property default_desc (invocation->endpoint ()); - status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER); + status = invocation->perform_call (default_desc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -498,7 +498,7 @@ TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation void TAO_Protocol_Endpoint_Selector::next (TAO_GIOP_Invocation * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("You Are not Suppesed to call: TAO_Protocol_Endpoint_Selector::next!!!\n"))); // invocation->profile_index ()++; @@ -510,7 +510,7 @@ void TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation *invocation, const TAO_MProfile& /* mprofile */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Location forwarding is currently not supported when using // RTCORBA::ClientProtocolPolicy. With the current profile @@ -522,7 +522,7 @@ TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation // a location forward reply, we act as if the profile we used // didn't work, and we try the next one. Should we throw not // supported exception instead? - this->next (invocation TAO_ENV_ARG_PARAMETER); + this->next (invocation ACE_ENV_ARG_PARAMETER); } void diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h index af531a3c749..9b1d43a673f 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h @@ -43,7 +43,7 @@ class TAO_RTCORBA_Export TAO_RT_Default_Endpoint_Selector : { public: virtual void select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; // **************************************************************** @@ -68,7 +68,7 @@ public: virtual ~TAO_Priority_Endpoint_Selector (void); virtual void select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Helper for <select_endpoint>. int is_multihomed (TAO_Endpoint *endpoint); @@ -96,7 +96,7 @@ public: virtual ~TAO_Bands_Endpoint_Selector (void); virtual void select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; // **************************************************************** @@ -122,12 +122,12 @@ public: virtual ~TAO_Protocol_Endpoint_Selector (void); virtual void select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void next (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void forward (TAO_GIOP_Invocation *invocation, const TAO_MProfile &mprofile - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void success (TAO_GIOP_Invocation *invocation); virtual void close_connection (TAO_GIOP_Invocation *invocation); }; diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp index 48c3e5c36d4..8470e3bf6f8 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.cpp +++ b/TAO/tao/RTCORBA/RT_Mutex.cpp @@ -13,7 +13,7 @@ TAO_RT_Mutex::~TAO_RT_Mutex (void) } void -TAO_RT_Mutex::lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Mutex::lock (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->mu_.acquire () != 0) @@ -21,7 +21,7 @@ TAO_RT_Mutex::lock (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_RT_Mutex::unlock (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Mutex::unlock (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->mu_.release () != 0) @@ -30,7 +30,7 @@ TAO_RT_Mutex::unlock (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time - TAO_ENV_ARG_DECL) + 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 e045ad430a6..bc5e5cb1ab9 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -56,11 +56,11 @@ public: virtual ~TAO_RT_Mutex (void); /// Acquire the lock. - virtual void lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Release the lock. - virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -70,7 +70,7 @@ public: * using this operation in your program designs. */ virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 410cdedadfd..d3ca63fd5fb 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -34,41 +34,41 @@ TAO_RT_ORB::~TAO_RT_ORB (void) } RTCORBA::Mutex_ptr -TAO_RT_ORB::create_mutex (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_ORB::create_mutex (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->mutex_mgr_.create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->mutex_mgr_.create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->mutex_mgr_.destroy_mutex (mutex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } RTCORBA::Mutex_ptr TAO_RT_ORB::create_named_mutex (const char *name, CORBA::Boolean_out created_flag - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mutex_mgr_.create_named_mutex (name, created_flag - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } RTCORBA::Mutex_ptr TAO_RT_ORB::open_named_mutex (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)) { return this->mutex_mgr_.open_named_mutex (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } //////////////////////////////////////////////////////////////////////////////// @@ -82,7 +82,7 @@ TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void) } RTCORBA::Mutex_ptr -TAO_Named_RT_Mutex_Manager::create_mutex (TAO_ENV_SINGLE_ARG_DECL) +TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *mutex = 0; @@ -103,7 +103,7 @@ TAO_Named_RT_Mutex_Manager::create_mutex (TAO_ENV_SINGLE_ARG_DECL) #if (TAO_HAS_NAMED_RT_MUTEXES == 1) void TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *tao_mutex = @@ -132,7 +132,7 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex #else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ void TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -141,7 +141,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_NAMED_RT_MUTEXES == 1) @@ -199,7 +199,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)) { @@ -235,7 +235,7 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size, CORBA::Boolean keep_alive, CORBA::Boolean dont_route, CORBA::Boolean no_delay - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException )) { TAO_TCP_Properties *tmp; @@ -260,7 +260,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->tp_manager_->create_threadpool (stacksize, @@ -270,7 +270,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } RTCORBA::ThreadpoolId @@ -280,7 +280,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->tp_manager_->create_threadpool_with_lanes (stacksize, @@ -289,23 +289,23 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)) { this->tp_manager_->destroy_threadpool (threadpool - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } RTCORBA::PriorityModelPolicy_ptr TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityModelPolicy *tmp; @@ -320,7 +320,7 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model, RTCORBA::ThreadpoolPolicy_ptr TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ThreadpoolPolicy *tmp; @@ -336,7 +336,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityBandedConnectionPolicy *tmp; @@ -350,7 +350,7 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const } RTCORBA::PrivateConnectionPolicy_ptr -TAO_RT_ORB::create_private_connection_policy (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_ORB::create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PrivateConnectionPolicy *tmp; @@ -365,7 +365,7 @@ TAO_RT_ORB::create_private_connection_policy (TAO_ENV_SINGLE_ARG_DECL) RTCORBA::ServerProtocolPolicy_ptr TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ServerProtocolPolicy *tmp; @@ -380,7 +380,7 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco RTCORBA::ClientProtocolPolicy_ptr TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ClientProtocolPolicy *tmp; diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index c9f7ddd89ab..fee075c7569 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -54,20 +54,20 @@ public: /// Destructor. ~TAO_Named_RT_Mutex_Manager (void); - RTCORBA::Mutex_ptr create_mutex (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void destroy_mutex (RTCORBA::Mutex_ptr the_mutex - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::Mutex_ptr open_named_mutex (const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound )); @@ -110,7 +110,7 @@ public: * consistant priority inheritance/piority ceiling semantics * can be guaranteed. */ - virtual RTCORBA::Mutex_ptr create_mutex (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -119,7 +119,7 @@ public: * 0. */ virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -129,12 +129,12 @@ public: */ virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name, CORBA::Boolean_out created_flag - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS ) + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound )); @@ -150,7 +150,7 @@ public: CORBA::Boolean keep_alive, CORBA::Boolean dont_route, CORBA::Boolean no_delay - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException )); /// Create a RTCORBA threadpool to manage a set of threads without lanes. @@ -162,7 +162,7 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -176,12 +176,12 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)); @@ -190,13 +190,13 @@ public: create_priority_model_policy ( RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -206,7 +206,7 @@ public: virtual RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (const RTCORBA::PriorityBands & priority_bands - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -215,7 +215,7 @@ public: * to the server. */ virtual RTCORBA::PrivateConnectionPolicy_ptr - create_private_connection_policy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -224,7 +224,7 @@ public: */ virtual RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (const RTCORBA::ProtocolList & protocols - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -233,7 +233,7 @@ public: */ virtual RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (const RTCORBA::ProtocolList & protocols - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Get the Thread Pool Manager. diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 72112c0bfba..02660a31634 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -44,7 +44,7 @@ TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type, void TAO_RT_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ -121,7 +121,7 @@ TAO_RT_ORBInitializer::pre_init ( info->register_initial_reference ("PriorityMappingManager", manager - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ This is busted. TAO_ORBInitInfo should do proper reference @@ -129,7 +129,7 @@ TAO_RT_ORBInitializer::pre_init ( // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -158,7 +158,7 @@ TAO_RT_ORBInitializer::pre_init ( info->register_initial_reference (TAO_OBJID_RTORB, rt_orb - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create the RT_Current. @@ -175,7 +175,7 @@ TAO_RT_ORBInitializer::pre_init ( info->register_initial_reference (TAO_OBJID_RTCURRENT, current - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_); @@ -185,11 +185,11 @@ TAO_RT_ORBInitializer::pre_init ( void TAO_RT_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -197,7 +197,7 @@ TAO_RT_ORBInitializer::post_init ( void TAO_RT_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register the RTCORBA policy factories. @@ -213,18 +213,18 @@ TAO_RT_ORBInitializer::register_policy_factories ( CORBA::PolicyType type = RTCORBA::PRIORITY_MODEL_POLICY_TYPE; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h index b36cd5f78a0..344edd06fa9 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.h +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h @@ -55,11 +55,11 @@ public: long scope_policy); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -67,7 +67,7 @@ private: /// Register RTCORBA policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 3a0b8f2a0a3..cbf84917ad9 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -137,7 +137,7 @@ TAO_RT_ORB_Loader::init (int argc, orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp index 03055fd71e9..a312808d23a 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp @@ -13,7 +13,7 @@ CORBA::Policy_ptr TAO_RT_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h index ef5adece152..ba25cc18c1e 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.h +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h @@ -45,7 +45,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 807c128cd02..d0104fcfb73 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -36,28 +36,28 @@ TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void) } RTCORBA::PriorityModel -TAO_PriorityModelPolicy::priority_model (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityModelPolicy::priority_model (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->priority_model_; } RTCORBA::Priority -TAO_PriorityModelPolicy::server_priority (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityModelPolicy::server_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->server_priority_; } CORBA::PolicyType -TAO_PriorityModelPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityModelPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::PRIORITY_MODEL_POLICY_TYPE; } CORBA::Policy_ptr -TAO_PriorityModelPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityModelPolicy* tmp; @@ -70,7 +70,7 @@ TAO_PriorityModelPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) return tmp; } -void TAO_PriorityModelPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +void TAO_PriorityModelPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -135,21 +135,21 @@ TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy (void) } RTCORBA::ThreadpoolId -TAO_ThreadpoolPolicy::threadpool (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ThreadpoolPolicy::threadpool (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->id_; } CORBA::PolicyType -TAO_ThreadpoolPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ThreadpoolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::THREADPOOL_POLICY_TYPE; } CORBA::Policy_ptr -TAO_ThreadpoolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ThreadpoolPolicy* tmp; @@ -162,7 +162,7 @@ TAO_ThreadpoolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) return tmp; } -void TAO_ThreadpoolPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +void TAO_ThreadpoolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -198,14 +198,14 @@ TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void) } CORBA::PolicyType -TAO_PrivateConnectionPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PrivateConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE; } CORBA::Policy_ptr -TAO_PrivateConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PrivateConnectionPolicy* tmp; @@ -219,7 +219,7 @@ TAO_PrivateConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_PrivateConnectionPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PrivateConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -253,7 +253,7 @@ TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy (void) RTCORBA::PriorityBands * TAO_PriorityBandedConnectionPolicy::priority_bands ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::PriorityBands *tmp; @@ -267,14 +267,14 @@ TAO_PriorityBandedConnectionPolicy::priority_bands ( } CORBA::PolicyType -TAO_PriorityBandedConnectionPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PriorityBandedConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE; } CORBA::Policy_ptr -TAO_PriorityBandedConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityBandedConnectionPolicy *tmp; @@ -287,7 +287,7 @@ TAO_PriorityBandedConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) return tmp; } -void TAO_PriorityBandedConnectionPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +void TAO_PriorityBandedConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -345,7 +345,7 @@ TAO_TCP_Properties::~TAO_TCP_Properties (void) } CORBA::Long -TAO_TCP_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TCP_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; @@ -353,14 +353,14 @@ TAO_TCP_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_TCP_Properties::send_buffer_size (CORBA::Long send_buffer_size - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long -TAO_TCP_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TCP_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; @@ -368,14 +368,14 @@ TAO_TCP_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_TCP_Properties::recv_buffer_size (CORBA::Long recv_buffer_size - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; } CORBA::Boolean -TAO_TCP_Properties::keep_alive (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TCP_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->keep_alive_; @@ -383,14 +383,14 @@ TAO_TCP_Properties::keep_alive (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_TCP_Properties::keep_alive (CORBA::Boolean keep_alive - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->keep_alive_ = keep_alive; } CORBA::Boolean -TAO_TCP_Properties::dont_route (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TCP_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->dont_route_; @@ -398,13 +398,13 @@ TAO_TCP_Properties::dont_route (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_TCP_Properties::dont_route (CORBA::Boolean dont_route - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->dont_route_ = dont_route; } -CORBA::Boolean TAO_TCP_Properties::no_delay (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Boolean TAO_TCP_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->no_delay_; @@ -412,7 +412,7 @@ CORBA::Boolean TAO_TCP_Properties::no_delay (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_TCP_Properties::no_delay (CORBA::Boolean no_delay - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->no_delay_ = no_delay; @@ -464,7 +464,7 @@ TAO_Unix_Domain_Properties::~TAO_Unix_Domain_Properties (void) } CORBA::Long -TAO_Unix_Domain_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Unix_Domain_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; @@ -472,14 +472,14 @@ TAO_Unix_Domain_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_Unix_Domain_Properties::send_buffer_size (CORBA::Long send_buffer_size - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long -TAO_Unix_Domain_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Unix_Domain_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; @@ -487,7 +487,7 @@ TAO_Unix_Domain_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_Unix_Domain_Properties::recv_buffer_size (CORBA::Long recv_buffer_size - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; @@ -523,7 +523,7 @@ TAO_SMEM_Properties::~TAO_SMEM_Properties (void) CORBA::Long -TAO_SMEM_Properties::preallocate_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SMEM_Properties::preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->preallocate_buffer_size_; @@ -531,14 +531,14 @@ TAO_SMEM_Properties::preallocate_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_SMEM_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->preallocate_buffer_size_ = preallocate_buffer_size; } char * -TAO_SMEM_Properties::mmap_filename (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SMEM_Properties::mmap_filename (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mmap_filename_.rep (); @@ -546,14 +546,14 @@ TAO_SMEM_Properties::mmap_filename (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_SMEM_Properties::mmap_filename (const char * mmap_filename - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->mmap_filename_.set (mmap_filename); } char * -TAO_SMEM_Properties::mmap_lockname (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SMEM_Properties::mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mmap_lockname_.rep (); @@ -561,7 +561,7 @@ TAO_SMEM_Properties::mmap_lockname (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_SMEM_Properties::mmap_lockname (const char * mmap_lockname - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->mmap_lockname_.set (mmap_lockname); @@ -609,7 +609,7 @@ TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy (void) } RTCORBA::ProtocolList * -TAO_ServerProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::ProtocolList *tmp; @@ -623,14 +623,14 @@ TAO_ServerProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL) } CORBA::PolicyType -TAO_ServerProtocolPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE; } CORBA::Policy_ptr -TAO_ServerProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ServerProtocolPolicy* tmp; @@ -644,7 +644,7 @@ TAO_ServerProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_ServerProtocolPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -664,7 +664,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, CORBA::Policy_var policy = orb_core->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { RTCORBA::ServerProtocolPolicy_var server_protocols_policy; @@ -674,7 +674,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, { server_protocols_policy = RTCORBA::ServerProtocolPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server_protocols = @@ -694,7 +694,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, properties = RTCORBA::ProtocolProperties::_narrow ( protocols[j].transport_protocol_properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (protocol_type, @@ -706,7 +706,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, properties = RTCORBA::ProtocolProperties::_narrow ( protocols[j].transport_protocol_properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (protocol_type, "uiop") == 0) @@ -727,7 +727,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, { server_protocols_policy = RTCORBA::ServerProtocolPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server_protocols = @@ -747,7 +747,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, properties = RTCORBA::ProtocolProperties::_narrow ( protocols[j].transport_protocol_properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (protocol_type, "iiop") == 0) @@ -759,7 +759,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, properties = RTCORBA::ProtocolProperties::_narrow ( protocols[j].transport_protocol_properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (protocol_type, "uiop") == 0) @@ -774,16 +774,16 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, { RTCORBA::TCPProtocolProperties_var tcp_properties = RTCORBA::TCPProtocolProperties::_narrow (properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; send_buffer_size = - tcp_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER); + tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; recv_buffer_size = - tcp_properties->recv_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER); + tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - no_delay = tcp_properties->no_delay (TAO_ENV_SINGLE_ARG_PARAMETER); + no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -791,17 +791,17 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, { RTCORBA::UnixDomainProtocolProperties_var uiop_properties = RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (uiop_properties.in ())) { // Extract and locally store properties of interest. send_buffer_size = - uiop_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER); + uiop_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; recv_buffer_size = - uiop_properties->recv_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER); + uiop_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -854,7 +854,7 @@ TAO_ClientProtocolPolicy::~TAO_ClientProtocolPolicy () } RTCORBA::ProtocolList * -TAO_ClientProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::ProtocolList *tmp; @@ -868,14 +868,14 @@ TAO_ClientProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL) } CORBA::PolicyType -TAO_ClientProtocolPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ClientProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE; } CORBA::Policy_ptr -TAO_ClientProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ClientProtocolPolicy* tmp; @@ -889,7 +889,7 @@ TAO_ClientProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_ClientProtocolPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ClientProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -908,7 +908,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, CORBA::Policy_var policy = orb_core->policy_manager ()->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { RTCORBA::ClientProtocolPolicy_var client_protocols_policy; @@ -918,7 +918,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, { client_protocols_policy = RTCORBA::ClientProtocolPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; client_protocols = @@ -938,7 +938,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, properties = RTCORBA::ProtocolProperties::_narrow ( protocols[j].transport_protocol_properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (protocol_type, "iiop") == 0) @@ -949,7 +949,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, properties = RTCORBA::ProtocolProperties::_narrow ( protocols[j].transport_protocol_properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (protocol_type, "uiop") == 0) @@ -971,7 +971,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, { client_protocols_policy = RTCORBA::ClientProtocolPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; client_protocols = @@ -990,7 +990,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, properties = RTCORBA::ProtocolProperties::_narrow ( protocols[j].transport_protocol_properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (protocol_type, "iiop") == 0) @@ -1002,7 +1002,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, properties = RTCORBA::ProtocolProperties::_narrow ( protocols[j].transport_protocol_properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (protocol_type, "uiop") == 0) @@ -1017,16 +1017,16 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, { RTCORBA::TCPProtocolProperties_var tcp_properties = RTCORBA::TCPProtocolProperties::_narrow (properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; send_buffer_size = - tcp_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER); + tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; recv_buffer_size = - tcp_properties->recv_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER); + tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - no_delay = tcp_properties->no_delay (TAO_ENV_SINGLE_ARG_PARAMETER); + no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1034,14 +1034,14 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, { RTCORBA::UnixDomainProtocolProperties_var uiop_properties = RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (uiop_properties.in ())) { // Extract and locally store properties of interest. send_buffer_size = - uiop_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER); + uiop_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; recv_buffer_size = uiop_properties->recv_buffer_size (); diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index fb5ff0db0ad..bafe86a0ca5 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -64,19 +64,19 @@ public: */ RTCORBA::PriorityModel get_priority_model (void); - virtual RTCORBA::PriorityModel priority_model (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual RTCORBA::PriorityModel priority_model (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual RTCORBA::Priority server_priority (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual RTCORBA::Priority server_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of the object state. @@ -129,16 +129,16 @@ public: /// Copy constructor. TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs); - virtual RTCORBA::ThreadpoolId threadpool (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual RTCORBA::ThreadpoolId threadpool (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -181,13 +181,13 @@ public: /// Copy constructor. TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs); - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -234,16 +234,16 @@ public: RTCORBA::PriorityBands &priority_bands_rep (void); virtual RTCORBA::PriorityBands * priority_bands - (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of the current object. @@ -304,16 +304,16 @@ public: RTCORBA::ProtocolList & protocols_rep (void); virtual RTCORBA::ProtocolList * protocols - (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); static int hook (TAO_ORB_Core *orb_core, @@ -369,13 +369,13 @@ public: RTCORBA::ProtocolList & protocols_rep (void); virtual RTCORBA::ProtocolList * protocols - (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); static int hook (TAO_ORB_Core *orb_core, @@ -384,7 +384,7 @@ public: int &no_delay, const char* protocol_type); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // = CDR Encoder/Decoder. @@ -440,39 +440,39 @@ public: CORBA::Boolean dont_route = 0, CORBA::Boolean no_delay = 1); - virtual CORBA::Long send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_buffer_size (CORBA::Long send_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void recv_buffer_size (CORBA::Long recv_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean keep_alive (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void keep_alive (CORBA::Boolean keep_alive - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean dont_route (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void dont_route (CORBA::Boolean dont_route - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean no_delay (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void no_delay (CORBA::Boolean no_delay - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -520,18 +520,18 @@ public: CORBA::Long recv_buffer_size = ACE_DEFAULT_MAX_SOCKET_BUFSIZ); - virtual CORBA::Long send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_buffer_size (CORBA::Long send_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void recv_buffer_size (CORBA::Long recv_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -587,25 +587,25 @@ public: // = IDL interface methods. virtual CORBA::Long preallocate_buffer_size - (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void preallocate_buffer_size (CORBA::Long preallocate_buffer_size - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * mmap_filename (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * mmap_filename (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void mmap_filename (const char * mmap_filename - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * mmap_lockname (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void mmap_lockname (const char * mmap_lockname - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 5fc01232ee9..1bbcb2199a2 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -32,19 +32,19 @@ TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void) void TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_core_ = orb_core; // Save a reference to the priority mapping manager. CORBA::Object_var obj = orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->mapping_manager_ = TAO_Priority_Mapping_Manager::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -106,7 +106,7 @@ void TAO_RT_Protocols_Hooks::rt_service_context (TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean restart - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If the restart flag is true, then this call for a // reinvocation. We need not prepare the Service Context List once @@ -116,18 +116,18 @@ TAO_RT_Protocols_Hooks::rt_service_context (TAO_Stub *stub, TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *, stub); CORBA::Policy *priority_model_policy = - rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (priority_model_policy) { CORBA::Policy *priority_model_policy = - rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Short client_priority; int status = this->get_thread_CORBA_priority (client_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (status == -1) ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); @@ -135,7 +135,7 @@ TAO_RT_Protocols_Hooks::rt_service_context (TAO_Stub *stub, this->add_rt_service_context_hook (service_context, priority_model_policy, client_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -150,12 +150,12 @@ void TAO_RT_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &service_context, CORBA::Policy *model_policy, CORBA::Short &client_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::PriorityModelPolicy_var model_policy_ptr = RTCORBA::PriorityModelPolicy::_narrow (model_policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_PriorityModelPolicy *priority_model = @@ -233,13 +233,13 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook ( int TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Short native_priority = 0; int result = this->get_thread_CORBA_and_native_priority (priority, native_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == -1) @@ -250,7 +250,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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_hthread_t current; ACE_Thread::self (current); @@ -274,11 +274,11 @@ TAO_RT_Protocols_Hooks::get_thread_native_priority (CORBA::Short &native_priorit int TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &priority, CORBA::Short &native_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int result = this->get_thread_native_priority (native_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (result == -1) return result; @@ -299,7 +299,7 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &prio int TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Priority_Mapping *priority_mapping = this->mapping_manager_.in ()->mapping (); @@ -309,12 +309,12 @@ TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority return -1; return this->set_thread_native_priority (native_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int TAO_RT_Protocols_Hooks::set_thread_native_priority (CORBA::Short native_priority - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_hthread_t current; ACE_Thread::self (current); @@ -326,7 +326,7 @@ TAO_RT_Protocols_Hooks::set_thread_native_priority (CORBA::Short native_priority } int -TAO_RT_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Protocols_Hooks::set_default_policies (ACE_ENV_SINGLE_ARG_DECL) { // Set RTCORBA policy defaults. // Set RTCORBA::ServerProtocolPolicy and @@ -368,7 +368,7 @@ TAO_RT_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL) server_protocol_policy; this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Set ClientProtocolPolicy. @@ -385,7 +385,7 @@ TAO_RT_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL) client_protocol_policy; this->orb_core_->get_default_policies ()->set_policy (client_protocol_policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -393,7 +393,7 @@ TAO_RT_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL) int TAO_RT_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::ProtocolList protocols; @@ -438,7 +438,7 @@ TAO_RT_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registr server_protocol_policy; this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h index b4a585f9ec5..ffcdd065c30 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h @@ -36,7 +36,7 @@ public: /// Initialize the protocols hooks instance. virtual void init_hooks (TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Invoke the client_protocols hook if present. /** @@ -92,12 +92,12 @@ public: virtual void rt_service_context (TAO_Stub *stub, TAO_Service_Context &service_context, CORBA::Boolean restart - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void add_rt_service_context_hook (TAO_Service_Context &service_context, CORBA::Policy *model_policy, CORBA::Short &client_priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean @@ -118,29 +118,29 @@ public: */ //@{ virtual int get_thread_CORBA_priority (CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual int get_thread_native_priority (CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual int get_thread_CORBA_and_native_priority (CORBA::Short &, CORBA::Short & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual int set_thread_CORBA_priority (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual int set_thread_native_priority (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); //@} /// 1. Sets ORB-level policy defaults for this ORB. Currently sets /// default RTCORBA policies: ClientProtocolPolicy. - virtual int set_default_policies (TAO_ENV_SINGLE_ARG_DECL); + virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL); int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: TAO_ORB_Core *orb_core_; diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp index 283edf28bd9..90f833ec3f5 100644 --- a/TAO/tao/RTCORBA/RT_Stub.cpp +++ b/TAO/tao/RTCORBA/RT_Stub.cpp @@ -32,10 +32,10 @@ TAO_RT_Stub::~TAO_RT_Stub (void) } void -TAO_RT_Stub::parse_policies (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::parse_policies (ACE_ENV_SINGLE_ARG_DECL) { CORBA::PolicyList_var policy_list - = this->base_profiles_.policy_list (TAO_ENV_SINGLE_ARG_PARAMETER); + = this->base_profiles_.policy_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = policy_list->length (); @@ -60,11 +60,11 @@ TAO_RT_Stub::parse_policies (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Policy * -TAO_RT_Stub::exposed_priority_model (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL) { if (!this->are_policies_parsed_) { - this->parse_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); } @@ -78,11 +78,11 @@ TAO_RT_Stub::exposed_priority_model (CORBA::Policy_ptr policy) } CORBA::Policy * -TAO_RT_Stub::exposed_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL) { if (!this->are_policies_parsed_) { - this->parse_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); } @@ -97,11 +97,11 @@ TAO_RT_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy) } CORBA::Policy * -TAO_RT_Stub::exposed_client_protocol (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL) { if (!this->are_policies_parsed_) { - this->parse_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); } @@ -120,44 +120,44 @@ TAO_RT_Stub::exposed_client_protocol (CORBA::Policy_ptr policy) CORBA::Policy_ptr TAO_RT_Stub::get_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE) - return this->effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER); if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE) - return this->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER); - return this->TAO_Stub::get_policy (type TAO_ENV_ARG_PARAMETER); + return this->TAO_Stub::get_policy (type ACE_ENV_ARG_PARAMETER); } CORBA::Policy_ptr TAO_RT_Stub::get_client_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE) - return this->effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER); if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE) - return this->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER); - return this->TAO_Stub::get_client_policy (type TAO_ENV_ARG_PARAMETER); + return this->TAO_Stub::get_client_policy (type ACE_ENV_ARG_PARAMETER); } TAO_Stub * TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Validity check. Make sure requested policies are allowed to be // set at this scope. @@ -167,7 +167,7 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies, if (CORBA::is_nil (policy)) continue; - CORBA::PolicyType type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE || @@ -179,7 +179,7 @@ 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 TAO_ENV_ARG_PARAMETER); + return this->TAO_Stub::set_policy_overrides(policies, set_add ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_CORBA_MESSAGING */ @@ -291,7 +291,7 @@ TAO_RT_Stub::priority_banded_connection (void) } CORBA::Policy * -TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL) { // Get effective override. CORBA::Policy_var override = @@ -299,7 +299,7 @@ TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL) // Get the value from the ior. CORBA::Policy_var exposed = - this->exposed_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER); + this->exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); // Reconcile client-exposed and locally set values. @@ -311,7 +311,7 @@ TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL) RTCORBA::PriorityBandedConnectionPolicy_var override_policy_var = RTCORBA::PriorityBandedConnectionPolicy::_narrow (override.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); TAO_PriorityBandedConnectionPolicy *override_policy = @@ -320,7 +320,7 @@ TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL) RTCORBA::PriorityBandedConnectionPolicy_var exposed_policy_var = RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); TAO_PriorityBandedConnectionPolicy *exposed_policy = @@ -342,7 +342,7 @@ TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Policy * -TAO_RT_Stub::effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL) { // Get effective override. CORBA::Policy_var override = @@ -350,7 +350,7 @@ TAO_RT_Stub::effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL) // Get the value from the ior. CORBA::Policy_var exposed = - this->exposed_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER); + this->exposed_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); // Reconcile client-exposed and locally set values. @@ -362,7 +362,7 @@ TAO_RT_Stub::effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL) RTCORBA::ClientProtocolPolicy_var override_policy_var = RTCORBA::ClientProtocolPolicy::_narrow (override.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); TAO_ClientProtocolPolicy *override_policy = @@ -371,7 +371,7 @@ TAO_RT_Stub::effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL) RTCORBA::ClientProtocolPolicy_var exposed_policy_var = RTCORBA::ClientProtocolPolicy::_narrow (exposed.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); TAO_ClientProtocolPolicy *exposed_policy = diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index 96403604062..9c5e0fe4ee6 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -57,17 +57,17 @@ public: * types. */ CORBA::Policy_ptr get_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_CORBA_MESSAGING */ @@ -76,17 +76,17 @@ public: /// 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 (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Policy_ptr exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL); /// 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 (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Policy_ptr exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL); /// Returns the CORBA::Policy (which will be narrowed and used /// as RTCORBA::ClientProtocolPolicy) exported /// in object's IOR. - CORBA::Policy_ptr exposed_client_protocol (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Policy_ptr exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL); CORBA::Policy *private_connection (void); @@ -103,16 +103,16 @@ public: // the policy value exported in the Object's IOR. CORBA::Policy * - effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Policy * - effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); private: /// Helper method used to parse the policies. - void parse_policies (TAO_ENV_SINGLE_ARG_DECL); + void parse_policies (ACE_ENV_SINGLE_ARG_DECL); void exposed_priority_model (CORBA::Policy_ptr policy); diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp index 3eb67cc1b34..0b3beafe280 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp @@ -13,7 +13,7 @@ TAO_Stub * TAO_RT_Stub_Factory::create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ TODO: As soon as the RT_STUB is done change this to // create an RT_STUB diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h index 7f5cf343c28..7938f9a9544 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.h +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h @@ -46,7 +46,7 @@ public: virtual TAO_Stub *create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Stub_Factory) diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp index 249471330ae..46713f34cb0 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp @@ -39,11 +39,11 @@ TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (voi } int -TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL) { int result = this->default_lane_resources_->open_acceptor_registry (0 - TAO_ENV_ARG_PARAMETER); + 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 aa13c96f4ef..5301a0550f6 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -47,7 +47,7 @@ public: void finalize (void); /// Open default resources. - int open_default_resources (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int open_default_resources (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown reactor. void shutdown_reactor (void); diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 032de681bf3..10010ebd177 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -101,7 +101,7 @@ TAO_Thread_Pool_Threads::svc (void) ACE_TRY_NEW_ENV { // Run the ORB. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -135,7 +135,7 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool, CORBA::Short lane_priority, CORBA::ULong static_threads, CORBA::ULong dynamic_threads - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) : pool_ (pool), id_ (id), lane_priority_ (lane_priority), @@ -151,7 +151,7 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool, } void -TAO_Thread_Lane::validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL) +TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL) { // Check that the priority is in bounds. if (this->lane_priority_ < RTCORBA::minPriority || @@ -164,12 +164,12 @@ TAO_Thread_Lane::validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL) // Get the priority mapping manager. CORBA::Object_var obj = orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_Priority_Mapping_Manager_var mapping_manager = TAO_Priority_Mapping_Manager::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTCORBA::PriorityMapping *pm = @@ -192,17 +192,17 @@ TAO_Thread_Lane::validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Thread_Lane::open (TAO_ENV_SINGLE_ARG_DECL) +TAO_Thread_Lane::open (ACE_ENV_SINGLE_ARG_DECL) { // Validate and map priority. - this->validate_and_map_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_and_map_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Open the acceptor registry. int result = 0; result = this->resources_.open_acceptor_registry (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == -1) @@ -377,7 +377,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : manager_ (manager), id_ (id), stack_size_ (stack_size), @@ -401,7 +401,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, default_priority, static_threads, dynamic_threads - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, @@ -412,7 +412,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : manager_ (manager), id_ (id), stack_size_ (stack_size), @@ -440,18 +440,18 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, lanes[i].lane_priority, lanes[i].static_threads, lanes[i].dynamic_threads - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void -TAO_Thread_Pool::open (TAO_ENV_SINGLE_ARG_DECL) +TAO_Thread_Pool::open (ACE_ENV_SINGLE_ARG_DECL) { // Open all the lanes. for (CORBA::ULong i = 0; i != this->number_of_lanes_; ++i) { - this->lanes_[i]->open (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lanes_[i]->open (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -678,7 +678,7 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_THREAD_POOL_MANAGER_GUARD; @@ -691,7 +691,7 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } RTCORBA::ThreadpoolId @@ -701,7 +701,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_THREAD_POOL_MANAGER_GUARD; @@ -713,12 +713,12 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)) { @@ -726,7 +726,7 @@ TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool ACE_CHECK; this->destroy_threadpool_i (threadpool - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } RTCORBA::ThreadpoolId @@ -737,7 +737,7 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the thread pool. @@ -753,12 +753,12 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return this->create_threadpool_helper (thread_pool - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } RTCORBA::ThreadpoolId @@ -768,7 +768,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the thread pool. @@ -783,24 +783,24 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return this->create_threadpool_helper (thread_pool - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } RTCORBA::ThreadpoolId TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool - TAO_ENV_ARG_DECL) + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + thread_pool->open (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Create the static threads. @@ -835,7 +835,7 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool void TAO_Thread_Pool_Manager::destroy_threadpool_i (RTCORBA::ThreadpoolId thread_pool_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)) { diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index e231b22a34b..9e18d09619f 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -106,13 +106,13 @@ public: CORBA::Short lane_priority, CORBA::ULong static_threads, CORBA::ULong dynamic_threads - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Destructor. ~TAO_Thread_Lane (void); /// Open the lane. - void open (TAO_ENV_SINGLE_ARG_DECL); + void open (ACE_ENV_SINGLE_ARG_DECL); /// Finalize the resources. void finalize (void); @@ -157,7 +157,7 @@ public: private: /// Validate lane's priority and map it to a native value. - void validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL); + void validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL); TAO_Thread_Pool &pool_; CORBA::ULong id_; @@ -204,7 +204,7 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Constructor (for pools with lanes). TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, @@ -215,13 +215,13 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Destructor. ~TAO_Thread_Pool (void); /// Open the pool. - void open (TAO_ENV_SINGLE_ARG_DECL); + void open (ACE_ENV_SINGLE_ARG_DECL); /// Finalize the resources. void finalize (void); @@ -315,7 +315,7 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Create a threadpool with lanes. @@ -326,12 +326,12 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Destroy a threadpool. void destroy_threadpool (RTCORBA::ThreadpoolId threadpool - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)); @@ -362,7 +362,7 @@ private: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::ThreadpoolId @@ -372,17 +372,17 @@ private: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void destroy_threadpool_i (RTCORBA::ThreadpoolId threadpool - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)); RTCORBA::ThreadpoolId create_threadpool_helper (TAO_Thread_Pool *thread_pool - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // @} diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index c4069c6cb16..12730fb9dfb 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -140,10 +140,10 @@ RTPortableServer::POA_var::tao_nil (void) ::RTPortableServer::POA_ptr RTPortableServer::POA_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::RTPortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::RTPortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -225,15 +225,15 @@ RTPortableServer::POA::~POA (void) RTPortableServer::POA_ptr RTPortableServer::POA::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return POA::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } RTPortableServer::POA_ptr RTPortableServer::POA::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index 8b5a9cc1b75..8d932f76938 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -98,7 +98,7 @@ TAO_NAMESPACE RTPortableServer static POA_ptr tao_duplicate (POA_ptr); static void tao_release (POA_ptr); static POA_ptr tao_nil (void); - static POA_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static POA_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -153,11 +153,11 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA static POA_ptr _duplicate (POA_ptr obj); static POA_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static POA_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static POA_ptr _nil (void) { @@ -167,7 +167,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA virtual CORBA::Object_ptr create_reference_with_priority ( const char * intf, RTCORBA::Priority priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -178,7 +178,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA const PortableServer::ObjectId & oid, const char * intf, RTCORBA::Priority priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -188,7 +188,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA virtual PortableServer::ObjectId * activate_object_with_priority ( PortableServer::Servant p_servant, RTCORBA::Priority priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -200,7 +200,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA const PortableServer::ObjectId & oid, PortableServer::Servant p_servant, RTCORBA::Priority priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.i b/TAO/tao/RTPortableServer/RTPortableServerC.i index 1272b5b0b97..f36831389a4 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.i +++ b/TAO/tao/RTPortableServer/RTPortableServerC.i @@ -50,10 +50,10 @@ tao_RTPortableServer_POA_nil ( ACE_INLINE RTPortableServer::POA_ptr tao_RTPortableServer_POA_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RTPortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER); + return RTPortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp index 31c3f6c82f6..669baf5ea01 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp @@ -17,7 +17,7 @@ ACE_RCSID(RTCORBA, RT_Collocation_Resolver, "$Id$") CORBA::Boolean TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { // Make sure that the servant is in the same ORB that created this // object. @@ -33,7 +33,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object TAO_Object_Adapter::Servant_Upcall servant_upcall (orb_core); TAO_POA *poa = servant_upcall.lookup_POA (object->_object_key () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the thread pool associated with this POA. @@ -96,7 +96,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object servant_upcall.system_id_, servant_upcall, servant_upcall.current_context_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the priority that the servant will run at. diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h index 6439b5a7aaa..e8ce8277d2f 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h @@ -38,7 +38,7 @@ public: /// Is <object> collocated? virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver) diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 816edeb04ec..bb73f5a0c6e 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -36,7 +36,7 @@ TAO_RT_POA::TAO_RT_POA (const TAO_POA::String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : TAO_POA (name, poa_manager, policies, @@ -45,14 +45,14 @@ TAO_RT_POA::TAO_RT_POA (const TAO_POA::String &name, thread_lock, orb_core, object_adapter - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), thread_pool_ (0) { ACE_CHECK; // Parse the RT policies and update our policy cache. this->parse_rt_policies (this->policies () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -69,7 +69,7 @@ TAO_RT_POA::new_POA (const String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_RT_POA *poa; @@ -82,7 +82,7 @@ TAO_RT_POA::new_POA (const String &name, thread_lock, orb_core, object_adapter - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -91,7 +91,7 @@ TAO_RT_POA::new_POA (const String &name, void TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { { CORBA::Policy_var policy = @@ -99,20 +99,20 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies RTCORBA::PriorityModelPolicy_var priority_model = RTCORBA::PriorityModelPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (priority_model.in ())) { RTCORBA::PriorityModel rt_priority_model = - priority_model->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->cached_policies ().priority_model ( TAO_POA_Cached_Policies::PriorityModel (rt_priority_model)); RTCORBA::Priority priority = - priority_model->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->cached_policies ().server_priority (priority); @@ -122,13 +122,13 @@ 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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_RT_POA::validate_priority (RTCORBA::Priority priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (priority < RTCORBA::minPriority || priority > RTCORBA::maxPriority) @@ -164,7 +164,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority RTCORBA::PriorityBandedConnectionPolicy_var priority_bands = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_PriorityBandedConnectionPolicy *priority_bands_i = @@ -193,7 +193,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority } void -TAO_RT_POA::validate_policies (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL) { // For each of the above operations, if the POA supports the // IMPLICIT_ACTIVATION option for the ImplicitActivationPolicy then @@ -226,12 +226,12 @@ TAO_Stub * TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Client exposed policies. CORBA::PolicyList_var client_exposed_policies = this->client_exposed_policies (priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Server protocol policy. @@ -240,7 +240,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key, RTCORBA::ServerProtocolPolicy_var server_protocol_policy = RTCORBA::ServerProtocolPolicy::_narrow (protocol.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_ServerProtocolPolicy *server_protocol = @@ -266,7 +266,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key, client_exposed_policies._retn (), &filter, *acceptor_registry - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // If this POA has the SERVER_DECLARED policy, create the IOR with @@ -288,7 +288,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key, client_exposed_policies._retn (), &filter, lanes[i]->resources ().acceptor_registry () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_ASSERT (0); @@ -302,7 +302,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key, RTCORBA::PriorityBandedConnectionPolicy_var priority_bands = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_PriorityBandedConnectionPolicy *priority_bands_i = @@ -314,7 +314,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key, client_exposed_policies._retn (), &filter, priority_bands_i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_Stub * @@ -323,7 +323,7 @@ TAO_RT_POA::create_stub_object (const TAO_ObjectKey &object_key, CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, TAO_PriorityBandedConnectionPolicy *priority_bands - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int error = 0; @@ -398,7 +398,7 @@ TAO_RT_POA::create_stub_object (const TAO_ObjectKey &object_key, this->orb_core_.create_stub_object (mprofile, type_id, policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } size_t @@ -442,7 +442,7 @@ TAO_RT_POA::lane_required (TAO_Thread_Lane *lane, CORBA::PolicyList * TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::PolicyList *client_exposed_policies = 0; ACE_NEW_THROW_EX (client_exposed_policies, @@ -453,7 +453,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority // Add in all of the client exposed policies. this->policies_.add_client_exposed_fixed_policies (client_exposed_policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Check if the priority model policy has been set, and if so, let @@ -498,7 +498,7 @@ PortableServer::POA_ptr TAO_RT_POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -506,7 +506,7 @@ TAO_RT_POA::create_POA (const char *adapter_name, PortableServer::POA_ptr poa = this->TAO_POA::create_POA (adapter_name, poa_manager, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (poa); return poa; } @@ -514,13 +514,13 @@ TAO_RT_POA::create_POA (const char *adapter_name, PortableServer::POA_ptr TAO_RT_POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)) { PortableServer::POA_ptr poa = this->TAO_POA::find_POA (adapter_name, activate_it - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (poa); return poa; } @@ -528,12 +528,12 @@ TAO_RT_POA::find_POA (const char *adapter_name, void TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_POA::destroy (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -542,12 +542,12 @@ TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects, PortableServer::ThreadPolicy_ptr TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ThreadPolicy_ptr policy = this->TAO_POA::create_thread_policy (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (policy); return policy; } @@ -556,24 +556,24 @@ TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value PortableServer::LifespanPolicy_ptr TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::LifespanPolicy_ptr policy = this->TAO_POA::create_lifespan_policy (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (policy); return policy; } PortableServer::IdUniquenessPolicy_ptr TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdUniquenessPolicy_ptr policy = this->TAO_POA::create_id_uniqueness_policy (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (policy); return policy; } @@ -581,12 +581,12 @@ TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue PortableServer::IdAssignmentPolicy_ptr TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdAssignmentPolicy_ptr policy = this->TAO_POA::create_id_assignment_policy (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (policy); return policy; } @@ -596,24 +596,24 @@ TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue PortableServer::ImplicitActivationPolicy_ptr TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ImplicitActivationPolicy_ptr policy = this->TAO_POA::create_implicit_activation_policy (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (policy); return policy; } PortableServer::ServantRetentionPolicy_ptr TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ServantRetentionPolicy_ptr policy = this->TAO_POA::create_servant_retention_policy (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (policy); return policy; } @@ -621,12 +621,12 @@ TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPol PortableServer::RequestProcessingPolicy_ptr TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::RequestProcessingPolicy_ptr policy = this->TAO_POA::create_request_processing_policy (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (policy); return policy; } @@ -635,41 +635,41 @@ TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingP #endif /* TAO_HAS_MINIMUM_POA == 0 */ char * -TAO_RT_POA::the_name (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { char * name = - this->TAO_POA::the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + this->TAO_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (name); return name; } PortableServer::POA_ptr -TAO_RT_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_ptr parent = - this->TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_PARAMETER); + this->TAO_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (parent); return parent; } PortableServer::POAList * -TAO_RT_POA::the_children (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_children (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAList *children = - this->TAO_POA::the_children (TAO_ENV_SINGLE_ARG_PARAMETER); + this->TAO_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (children); return children; } PortableServer::POAManager_ptr -TAO_RT_POA::the_POAManager (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAManager_ptr poa_manager = - this->TAO_POA::the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->TAO_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (poa_manager); return poa_manager; } @@ -678,67 +678,67 @@ TAO_RT_POA::the_POAManager (TAO_ENV_SINGLE_ARG_DECL) #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::AdapterActivator_ptr -TAO_RT_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::AdapterActivator_ptr activator = - this->TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_PARAMETER); + this->TAO_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (activator); return activator; } void TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_POA::the_activator (adapter_activator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::ServantManager_ptr -TAO_RT_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { PortableServer::ServantManager_ptr servant_manager = - this->TAO_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->TAO_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (servant_manager); return servant_manager; } void TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { this->TAO_POA::set_servant_manager (imgr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::Servant -TAO_RT_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = - this->TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_PARAMETER); + this->TAO_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (servant); return servant; } void TAO_RT_POA::set_servant (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { this->TAO_POA::set_servant (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -746,14 +746,14 @@ TAO_RT_POA::set_servant (PortableServer::Servant servant PortableServer::ObjectId * TAO_RT_POA::activate_object (PortableServer::Servant p_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_POA::activate_object (p_servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (object_id); return object_id; } @@ -761,7 +761,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -769,31 +769,31 @@ TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id, { this->TAO_POA::activate_object_with_id (id, p_servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { this->TAO_POA::deactivate_object (oid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Object_ptr TAO_RT_POA::create_reference (const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_POA::create_reference (intf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (obj); return obj; } @@ -801,42 +801,42 @@ TAO_RT_POA::create_reference (const char *intf CORBA::Object_ptr TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_POA::create_reference_with_id (oid, intf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (obj); return obj; } PortableServer::ObjectId * TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_POA::servant_to_id (p_servant - TAO_ENV_ARG_PARAMETER); + 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_POA::servant_to_reference (p_servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (obj); return obj; } @@ -844,7 +844,7 @@ TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant PortableServer::Servant TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, @@ -852,58 +852,58 @@ TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference { PortableServer::Servant servant = this->TAO_POA::reference_to_servant (reference - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (servant); return servant; } PortableServer::ObjectId * TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_POA::reference_to_id (reference - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (object_id); return object_id; } PortableServer::Servant TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_POA::id_to_servant (oid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (servant); return servant; } CORBA::Object_ptr TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_POA::id_to_reference (oid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (obj); return obj; } CORBA::OctetSeq * -TAO_RT_POA::id (TAO_ENV_SINGLE_ARG_DECL) +TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->TAO_POA::id (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->TAO_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index e77404726e1..b39a0f553bf 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -54,20 +54,20 @@ public: // RTCORBA specific methods CORBA::Object_ptr create_reference_with_priority (const char * intf, RTCORBA::Priority priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant, RTCORBA::Priority priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); @@ -75,7 +75,7 @@ public: void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid, PortableServer::Servant p_servant, RTCORBA::Priority priority - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -86,175 +86,175 @@ public: PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - char * the_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr the_parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAList *the_children (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAManager_ptr the_POAManager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::AdapterActivator_ptr the_activator (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::ServantManager_ptr get_servant_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); void set_servant (PortableServer::Servant servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); void deactivate_object (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::OctetSeq *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // End standard POA interface methods. virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_RT_POA (const String &name, TAO_POA_Manager &poa_manager, @@ -264,7 +264,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual ~TAO_RT_POA (void); @@ -281,22 +281,22 @@ protected: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual TAO_Stub *key_to_stub_i (const TAO_ObjectKey &key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void validate_priority (RTCORBA::Priority priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); - void validate_policies (TAO_ENV_SINGLE_ARG_DECL); + void validate_policies (ACE_ENV_SINGLE_ARG_DECL); // Parse the policy list for RT policies and update our // cached policy instance. void parse_rt_policies (TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); size_t endpoint_count (void); @@ -305,7 +305,7 @@ protected: CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, TAO_PriorityBandedConnectionPolicy *priority_bands - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int lane_required (TAO_Thread_Lane *lane, TAO_PriorityBandedConnectionPolicy *priority_bands); diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i index 30cbbb17de3..2a1dc09cde9 100644 --- a/TAO/tao/RTPortableServer/RT_POA.i +++ b/TAO/tao/RTPortableServer/RT_POA.i @@ -7,37 +7,37 @@ ACE_INLINE CORBA::Object_ptr TAO_RT_POA::create_reference_with_priority (const char * intf, RTCORBA::Priority priority - TAO_ENV_ARG_DECL) + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - this->validate_priority (priority TAO_ENV_ARG_PARAMETER); + this->validate_priority (priority ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); return this->create_reference_i (intf - TAO_ENV_ARG_PARAMETER); + 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 - TAO_ENV_ARG_DECL) + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - this->validate_priority (priority TAO_ENV_ARG_PARAMETER); + this->validate_priority (priority ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Lock access for the duration of this transaction. @@ -45,22 +45,22 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI return this->create_reference_with_id_i (oid, intf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::ObjectId * TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant, RTCORBA::Priority priority - TAO_ENV_ARG_DECL) + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - this->validate_priority (priority TAO_ENV_ARG_PARAMETER); + this->validate_priority (priority ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Lock access for the duration of this transaction. @@ -68,24 +68,24 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant, return this->activate_object_i (servant, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid, PortableServer::Servant servant, RTCORBA::Priority priority - TAO_ENV_ARG_DECL) + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->validate_priority (priority TAO_ENV_ARG_PARAMETER); + this->validate_priority (priority ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Lock access for the duration of this transaction. @@ -94,7 +94,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId this->activate_object_with_id_i (oid, servant, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void * diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 5134dbdeffb..df8c3609239 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -38,18 +38,18 @@ TAO_POA_RT_Policy_Validator::acceptor_registry (void) void TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->validate_thread_pool (policies TAO_ENV_ARG_PARAMETER); + this->validate_thread_pool (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->validate_lifespan (policies TAO_ENV_ARG_PARAMETER); + this->validate_lifespan (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->validate_server_protocol (policies TAO_ENV_ARG_PARAMETER); + this->validate_server_protocol (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->validate_priorities (policies TAO_ENV_ARG_PARAMETER); + this->validate_priorities (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -65,7 +65,7 @@ TAO_POA_RT_Policy_Validator::legal_policy_impl (CORBA::PolicyType type) void TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + 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 @@ -75,7 +75,7 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies RTCORBA::ServerProtocolPolicy_var server_protocol_policy = RTCORBA::ServerProtocolPolicy::_narrow (protocol.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_ServerProtocolPolicy *server_protocol = @@ -111,7 +111,7 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies void TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize to the default priority/priority model. CORBA::Short priority = @@ -124,17 +124,17 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies RTCORBA::PriorityModelPolicy_var priority_model = RTCORBA::PriorityModelPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (priority_model.in ())) { - priority = priority_model->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + priority = priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; rt_priority_model = TAO_POA_Cached_Policies::PriorityModel ( - priority_model->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER)); + priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; // Check that the priority is in bounds. @@ -156,7 +156,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies RTCORBA::PriorityBandedConnectionPolicy_var priority_bands = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_PriorityBandedConnectionPolicy *bands_policy = @@ -300,18 +300,18 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies void TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->thread_pool_ = TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If this POA is using a RTCORBA thread pool, make sure the // lifespan policy is not persistent since we cannot support it @@ -322,11 +322,11 @@ TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies policies.get_cached_policy (TAO_CACHED_POLICY_LIFESPAN); PortableServer::LifespanPolicy_var lifespan_policy = PortableServer::LifespanPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::LifespanPolicyValue lifespan = - lifespan_policy->value (TAO_ENV_SINGLE_ARG_PARAMETER); + lifespan_policy->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (lifespan == PortableServer::PERSISTENT) @@ -338,7 +338,7 @@ TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies void TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Check if the user has specified the priority model policy. CORBA::Policy_var priority_model = @@ -353,7 +353,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies if (!CORBA::is_nil (priority_model.in ())) { // If so, we'll use that policy. - policies.set_policy (priority_model.in () TAO_ENV_ARG_PARAMETER); + policies.set_policy (priority_model.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -371,7 +371,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies if (!CORBA::is_nil (server_protocol.in ())) { // If so, we'll use that policy. - policies.set_policy (server_protocol.in () TAO_ENV_ARG_PARAMETER); + policies.set_policy (server_protocol.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -389,7 +389,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies if (!CORBA::is_nil (thread_pool.in ())) { // If so, we'll use that policy. - policies.set_policy (thread_pool.in () TAO_ENV_ARG_PARAMETER); + policies.set_policy (thread_pool.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -399,31 +399,31 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies TAO_Thread_Pool * TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core, TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Policy_var policy = policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL); RTCORBA::ThreadpoolPolicy_var thread_pool_policy = RTCORBA::ThreadpoolPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + thread_pool_policy->threadpool (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the RTORB. CORBA::Object_var object = - orb_core.resolve_rt_orb (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_core.resolve_rt_orb (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_RT_ORB *tao_rt_orb = diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h index 593132f89f6..4c5227fa427 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h @@ -40,7 +40,7 @@ public: static TAO_Thread_Pool *extract_thread_pool (TAO_ORB_Core &orb_core, TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); static TAO_Acceptor_Registry *extract_acceptor_registry (TAO_ORB_Core &orb_core, TAO_Thread_Pool *thread_pool); @@ -53,11 +53,11 @@ protected: * if that is not the case. */ void validate_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Add/merge policies. void merge_policies_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Return whether the specified policy type is legal for the @@ -69,16 +69,16 @@ protected: private: void validate_server_protocol (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void validate_priorities (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void validate_thread_pool (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void validate_lifespan (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_Acceptor_Registry *acceptor_registry (void); diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 27106dc1cec..d8ec4a0e834 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -24,11 +24,11 @@ RT_Priority_Model_Processing::~RT_Priority_Model_Processing (void) { if (this->state_ == PRIORITY_RESET_REQUIRED) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->post_invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + this->post_invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -45,7 +45,7 @@ void RT_Priority_Model_Processing::pre_invoke ( TAO_Service_Context &request_service_context, TAO_Service_Context &reply_service_context - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Thread_Pool *thread_pool = (TAO_Thread_Pool *) this->poa_.thread_pool (); @@ -84,12 +84,12 @@ RT_Priority_Model_Processing::pre_invoke ( // Remember current thread's priority. TAO_Protocols_Hooks *tph = - this->poa_.orb_core ().get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_.orb_core ().get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (tph->get_thread_CORBA_and_native_priority (this->original_CORBA_priority_, this->original_native_priority_ - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) == -1) ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); @@ -171,7 +171,7 @@ RT_Priority_Model_Processing::pre_invoke ( target_priority != this->original_CORBA_priority_) { if (tph->set_thread_CORBA_priority (target_priority - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) == -1) ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); @@ -181,7 +181,7 @@ RT_Priority_Model_Processing::pre_invoke ( { CORBA::Short native_priority; tph->get_thread_native_priority (native_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s processing using %s ") @@ -230,7 +230,7 @@ RT_Priority_Model_Processing::pre_invoke ( void RT_Priority_Model_Processing::post_invoke ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { if (this->state_ == PRIORITY_RESET_REQUIRED) { @@ -239,11 +239,11 @@ RT_Priority_Model_Processing::post_invoke ( // Reset the priority of the current thread back to its original // value. TAO_Protocols_Hooks *tph = - this->poa_.orb_core ().get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_.orb_core ().get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (tph->set_thread_native_priority (this->original_native_priority_ - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) == -1) ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); } @@ -258,7 +258,7 @@ TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void) void TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_ServerRequest &req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // RTCORBA PriorityModelPolicy processing (may need to be // moved/adjusted when POA threadpools are added). This is the @@ -270,19 +270,19 @@ TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant // Set thread's priority. priority_processing.pre_invoke (req.request_service_context (), req.reply_service_context () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Servant dispatch. servant_upcall.servant ()->_dispatch (req, &servant_upcall - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Reset thread's priority to its original value. If this method // isn't reached, i.e., because of an exception, the reset takes // place in Priority_Model_Processing destructor. - priority_processing.post_invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_processing.post_invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -295,7 +295,7 @@ TAO_RT_Servant_Dispatcher::create_POA (const ACE_CString &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_RT_POA *poa; @@ -308,7 +308,7 @@ TAO_RT_Servant_Dispatcher::create_POA (const ACE_CString &name, thread_lock, orb_core, object_adapter - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h index d0f0c5edb1e..5ef3f563923 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h @@ -45,7 +45,7 @@ public: /// Dispatch the request to the servant. virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_ServerRequest &req - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Factory method for creating new POA's. virtual TAO_POA *create_POA (const ACE_CString &name, @@ -56,7 +56,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; /** @@ -94,11 +94,11 @@ public: // priority. void pre_invoke (TAO_Service_Context &request_service_context, TAO_Service_Context &reply_service_context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Resets the priority of the current thread back to its original // value, if necessary. - void post_invoke (TAO_ENV_SINGLE_ARG_DECL); + void post_invoke (ACE_ENV_SINGLE_ARG_DECL); private: diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp index e5897583de0..931ed08662e 100644 --- a/TAO/tao/Reactive_Flushing_Strategy.cpp +++ b/TAO/tao/Reactive_Flushing_Strategy.cpp @@ -29,14 +29,14 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport, int result = 0; // @@ Should we pass this down? Can we? - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_ORB_Core *orb_core = transport->orb_core (); while (!msg->all_data_sent () && result >= 0) { - result = orb_core->run (max_wait_time, 1 TAO_ENV_ARG_PARAMETER); + result = orb_core->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -53,14 +53,14 @@ int TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport) { // @@ Should we pass this down? Can we? - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_ORB_Core *orb_core = transport->orb_core (); while (!transport->queue_is_empty ()) { - int result = orb_core->run (0, 1 TAO_ENV_ARG_PARAMETER); + int result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp index b4ba0c82dd3..f386547bec5 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.cpp +++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp @@ -23,7 +23,7 @@ TAO_Remote_Object_Proxy_Broker::~TAO_Remote_Object_Proxy_Broker (void) TAO_Object_Proxy_Impl & TAO_Remote_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return this->remote_proxy_impl_; } diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h index de68214b209..00753be7fc8 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.h +++ b/TAO/tao/Remote_Object_Proxy_Broker.h @@ -37,7 +37,7 @@ public: ~TAO_Remote_Object_Proxy_Broker (void); virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_Remote_Object_Proxy_Impl remote_proxy_impl_; diff --git a/TAO/tao/Remote_Object_Proxy_Impl.cpp b/TAO/tao/Remote_Object_Proxy_Impl.cpp index 91804983854..e6d7ef635ef 100644 --- a/TAO/tao/Remote_Object_Proxy_Impl.cpp +++ b/TAO/tao/Remote_Object_Proxy_Impl.cpp @@ -25,7 +25,7 @@ TAO_Remote_Object_Proxy_Impl::~TAO_Remote_Object_Proxy_Impl (void) CORBA::Boolean TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Here we go remote to answer the question. CORBA::Boolean _tao_retval = 0; @@ -50,13 +50,13 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, // ACE_TRY_ENV.clear (); for (;;) { - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); TAO_OutputCDR &_tao_out = _tao_call.out_stream (); @@ -66,7 +66,7 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); int _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_RESTART) @@ -95,7 +95,7 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, CORBA::Boolean TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean _tao_retval = 0; @@ -122,17 +122,17 @@ TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target // ACE_TRY_ENV.clear (); for (;;) { - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (_invoke_status == TAO_INVOKE_RESTART) @@ -166,7 +166,7 @@ TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target CORBA_InterfaceDef_ptr TAO_Remote_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -180,7 +180,7 @@ TAO_Remote_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target } return adapter->get_interface_remote (target - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/Remote_Object_Proxy_Impl.h b/TAO/tao/Remote_Object_Proxy_Impl.h index b43bee455e1..0be4323cacb 100644 --- a/TAO/tao/Remote_Object_Proxy_Impl.h +++ b/TAO/tao/Remote_Object_Proxy_Impl.h @@ -39,16 +39,16 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); #if (TAO_HAS_MINIMUM_CORBA == 0) virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA_InterfaceDef_ptr _get_interface ( const CORBA::Object_ptr target - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/RequestInfo_Util.cpp index cf4a53ef73c..28c042faedb 100644 --- a/TAO/tao/RequestInfo_Util.cpp +++ b/TAO/tao/RequestInfo_Util.cpp @@ -9,7 +9,7 @@ ACE_RCSID (tao, RequestInfo_Util, "$Id$") Dynamic::ParameterList * -TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_DECL) +TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL) { Dynamic::ParameterList *parameter_list = 0; ACE_NEW_THROW_EX (parameter_list, @@ -26,7 +26,7 @@ TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_DECL) +TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL) { Dynamic::ExceptionList *exception_list = 0; ACE_NEW_THROW_EX (exception_list, @@ -43,7 +43,7 @@ TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ContextList * -TAO_RequestInfo_Util::make_context_list (TAO_ENV_SINGLE_ARG_DECL) +TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL) { Dynamic::ContextList *context_list = 0; ACE_NEW_THROW_EX (context_list, @@ -60,7 +60,7 @@ TAO_RequestInfo_Util::make_context_list (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::RequestContext * -TAO_RequestInfo_Util::make_request_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL) { Dynamic::RequestContext *request_context = 0; ACE_NEW_THROW_EX (request_context, @@ -78,7 +78,7 @@ TAO_RequestInfo_Util::make_request_context (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Any *any = 0; diff --git a/TAO/tao/RequestInfo_Util.h b/TAO/tao/RequestInfo_Util.h index c757ec4025e..b2c854d1ed8 100644 --- a/TAO/tao/RequestInfo_Util.h +++ b/TAO/tao/RequestInfo_Util.h @@ -44,19 +44,19 @@ public: */ //@{ static Dynamic::ParameterList * make_parameter_list ( - TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_SINGLE_ARG_DECL); static Dynamic::ExceptionList * make_exception_list ( - TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_SINGLE_ARG_DECL); static Dynamic::ContextList * make_context_list ( - TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_SINGLE_ARG_DECL); static Dynamic::RequestContext * make_request_context ( - TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_SINGLE_ARG_DECL); static CORBA::Any * make_any (CORBA::Boolean tk_void_any - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@} }; diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp index afd5eb958a6..586c2d5fd9a 100644 --- a/TAO/tao/Request_Dispatcher.cpp +++ b/TAO/tao/Request_Dispatcher.cpp @@ -14,13 +14,13 @@ void TAO_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Dispatch based on object key orb_core->adapter_registry ()->dispatch (request.object_key (), request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h index 4231dd684ef..b0f2d3a5b7b 100644 --- a/TAO/tao/Request_Dispatcher.h +++ b/TAO/tao/Request_Dispatcher.h @@ -39,7 +39,7 @@ public: virtual void dispatch (TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp index fc63264d7c5..c0414ca9eb6 100644 --- a/TAO/tao/Sequence.cpp +++ b/TAO/tao/Sequence.cpp @@ -24,7 +24,7 @@ void TAO_Base_Sequence::_shrink_buffer (CORBA::ULong, CORBA::ULong) void TAO_Base_Sequence::_downcast (void*, CORBA_Object* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // default is no op. // @@ TODO Maybe throw an exception? diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index 1e93f297116..d348bbdb710 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -73,7 +73,7 @@ public: /// object reference into the right type. virtual void _downcast (void *target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Used for sequences of object to convert from the derived type /// into the Object class. diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp index 6f7bcefcf98..bd37ea592c0 100644 --- a/TAO/tao/Sequence_T.cpp +++ b/TAO/tao/Sequence_T.cpp @@ -608,11 +608,11 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl, template <class T, class T_var> void TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target, CORBA_Object* src - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { T **tmp = ACE_static_cast (T**, target); - *tmp = T_var::tao_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = T_var::tao_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -777,11 +777,11 @@ TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl, template <class T, class T_var, size_t MAX> void TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target, CORBA_Object* src - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { T **tmp = ACE_static_cast (T**, target); - *tmp = T_var::tao_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = T_var::tao_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h index fe1ff095b0d..a6024391145 100644 --- a/TAO/tao/Sequence_T.h +++ b/TAO/tao/Sequence_T.h @@ -650,7 +650,7 @@ public: CORBA::ULong old_length); virtual void _downcast (void* target, CORBA_Object* src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void* src) const; }; @@ -711,7 +711,7 @@ public: CORBA::ULong old_length); virtual void _downcast (void* target, CORBA_Object* src - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA_Object* _upcast (void* src) const; }; diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp index b649fdf7a38..09a7467ef57 100644 --- a/TAO/tao/Service_Callbacks.cpp +++ b/TAO/tao/Service_Callbacks.cpp @@ -47,7 +47,7 @@ void TAO_Service_Callbacks::service_context_list (TAO_Stub *& /*stub*/ , IOP::ServiceContextList & /*service_list*/, CORBA::Boolean - TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) + ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) { return; } @@ -56,7 +56,7 @@ int TAO_Service_Callbacks::raise_comm_failure ( TAO_GIOP_Invocation * /*invoke*/, TAO_Profile * /*profile*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW_RETURN (CORBA::COMM_FAILURE ( CORBA_SystemException::_tao_minor_code ( @@ -70,7 +70,7 @@ int TAO_Service_Callbacks::raise_transient_failure ( TAO_GIOP_Invocation * /*invoke*/, TAO_Profile * /*profile*/ - TAO_ENV_ARG_DECL) + 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 ec15ab0b0f4..dd8583a216c 100644 --- a/TAO/tao/Service_Callbacks.h +++ b/TAO/tao/Service_Callbacks.h @@ -70,19 +70,19 @@ public: virtual void service_context_list (TAO_Stub *&stub, IOP::ServiceContextList &service_list, CORBA::Boolean restart - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Allow the service layer to decide whether the COMM_FAILURE /// exception should be thrown or a reinvocation is needed virtual int raise_comm_failure (TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Allow the service layer to decide whether the TRANSIENT /// exception should be thrown or a reinvocation is needed virtual int raise_transient_failure (TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** diff --git a/TAO/tao/Services.cpp b/TAO/tao/Services.cpp index 9aa4a1e5aa1..2878309c9f4 100644 --- a/TAO/tao/Services.cpp +++ b/TAO/tao/Services.cpp @@ -286,7 +286,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceDetail *&_ ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equal (CORBA::_tc_ServiceDetail TAO_ENV_ARG_PARAMETER)) return 0; // not equal + if (!type->equal (CORBA::_tc_ServiceDetail ACE_ENV_ARG_PARAMETER)) return 0; // not equal ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { @@ -355,7 +355,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceInformatio ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equal (CORBA::_tc_ServiceInformation TAO_ENV_ARG_PARAMETER)) return 0; // not equal + if (!type->equal (CORBA::_tc_ServiceInformation ACE_ENV_ARG_PARAMETER)) return 0; // not equal ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index 25c13db8ed0..1f37cbdbc2e 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -95,7 +95,7 @@ TAO_DIOP_Connector::close (void) int TAO_DIOP_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { TAO_Transport *&transport = invocation->transport (); // ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -190,7 +190,7 @@ TAO_DIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_DIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_DIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@host:port/object_key diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index 7a946bbe269..f98c68b7ad2 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -54,7 +54,7 @@ public: int close (void); int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int preconnect (const char *preconnections); TAO_Profile *create_profile (TAO_InputCDR& cdr); @@ -66,7 +66,7 @@ protected: /// = More TAO_Connector methods, please check the documentation on /// Pluggable.h - virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); /// Obtain tcp properties that must be used by this connector, i.e., /// initialize <tcp_properties_>. diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 25f4b6abaee..41401ee8b9c 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -163,7 +163,7 @@ TAO_DIOP_Profile::decode (TAO_InputCDR& cdr) void TAO_DIOP_Profile::parse_string (const char *ior - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!ior || !*ior) { @@ -329,7 +329,7 @@ TAO_DIOP_Profile::is_equivalent (const TAO_Profile *other_profile) CORBA::ULong TAO_DIOP_Profile::hash (CORBA::ULong max - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; @@ -374,7 +374,7 @@ TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp) } char * -TAO_DIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { 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 7891c0bbdde..1c270d87f0b 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -80,7 +80,7 @@ public: /// Initialize this object using the given input string. /// Url-style string contain only one endpoint. virtual void parse_string (const char *string - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Return a string representation for this profile. @@ -88,7 +88,7 @@ public: * This is used to create url-style reference. Only one * endpoint is included into the string. */ - virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL); + virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); /// Initialize this object using the given CDR octet string. virtual int decode (TAO_InputCDR& cdr); @@ -145,7 +145,7 @@ public: /// Return a hash value for this object. virtual CORBA::ULong hash (CORBA::ULong max - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Please refer to Profile.h for the documentation of this /// function. diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 74f4b4bcef4..0b1bb5aa53c 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -118,7 +118,7 @@ TAO_SHMIOP_Connector::close (void) int TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -427,7 +427,7 @@ TAO_SHMIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_SHMIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_SHMIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@port/object_key diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index 608b4dce9f4..a98be96fdbe 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -60,7 +60,7 @@ public: int close (void); int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int preconnect (const char *preconnections); TAO_Profile *create_profile (TAO_InputCDR& cdr); @@ -72,7 +72,7 @@ protected: // = More TAO_Connector methods, please check the documentation on // Pluggable.h - virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); public: diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index ff808afa49f..99bb7f2f3b8 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -176,7 +176,7 @@ TAO_SHMIOP_Profile::decode (TAO_InputCDR& cdr) void TAO_SHMIOP_Profile::parse_string (const char *string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!string || !*string) { @@ -356,7 +356,7 @@ TAO_SHMIOP_Profile::is_equivalent (const TAO_Profile *other_profile) CORBA::ULong TAO_SHMIOP_Profile::hash (CORBA::ULong max - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; @@ -389,7 +389,7 @@ TAO_SHMIOP_Profile::add_endpoint (TAO_SHMIOP_Endpoint *endp) } char * -TAO_SHMIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SHMIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { 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 2e5565d84b9..78262af04f9 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -78,11 +78,11 @@ public: /// Initialize this object using the given input string. virtual void parse_string (const char *string - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return a string representation for this profile. /// client must deallocate memory. - char * to_string (TAO_ENV_SINGLE_ARG_DECL); + char * to_string (ACE_ENV_SINGLE_ARG_DECL); /// Initialize this object using the given CDR octet string. int decode (TAO_InputCDR& cdr); @@ -139,7 +139,7 @@ public: /// Return a hash value for this object. CORBA::ULong hash (CORBA::ULong max - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Please refer to Profile.h for the documentation of this method IOP::TaggedProfile &create_tagged_profile (void); diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 69d0f11d632..c0ffb93c02f 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -551,7 +551,7 @@ TAO_UIOP_Acceptor::init_uiop_properties (void) int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size (); int no_delay = 0; - TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (tph != 0) diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index fd5615d9f11..8b60c725163 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -119,7 +119,7 @@ TAO_UIOP_Connector::close (void) int TAO_UIOP_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -396,7 +396,7 @@ TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_UIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_UIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) { TAO_Profile *profile = 0; ACE_NEW_THROW_EX (profile, @@ -462,13 +462,13 @@ TAO_UIOP_Connector::init_uiop_properties (void) // lookup and caching are not done based on protocol // properties. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; int send_buffer_size = this->orb_core ()->orb_params ()->sock_sndbuf_size (); int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size (); int no_delay = 0; - TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (tph != 0) diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index 96817b8545f..ab2c169ffc9 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -64,7 +64,7 @@ public: int close (void); int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int preconnect (const char *preconnections); TAO_Profile *create_profile (TAO_InputCDR& cdr); @@ -81,7 +81,7 @@ protected: * Please check the documentation in Pluggable.h. */ //@{ - virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); /// Obtains uiop properties that must be used by this connector, i.e., /// initializes <uiop_properties_>. diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index 4db5801dca5..769dca3b406 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -98,7 +98,7 @@ TAO_UIOP_Profile::endpoint_count (void) void TAO_UIOP_Profile::parse_string (const char *string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!string || !*string) { @@ -206,7 +206,7 @@ TAO_UIOP_Profile::is_equivalent (const TAO_Profile *other_profile) CORBA::ULong TAO_UIOP_Profile::hash (CORBA::ULong max - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; @@ -240,7 +240,7 @@ TAO_UIOP_Profile::add_endpoint (TAO_UIOP_Endpoint *endp) char * -TAO_UIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { 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 e88a037339a..ac792c9820e 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -77,11 +77,11 @@ public: /// Initialize this object using the given input string. virtual void parse_string (const char *string - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Return a string representation for this profile. /// client must deallocate memory. - virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL); + virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); /// Initialize this object using the given CDR octet string. virtual int decode (TAO_InputCDR& cdr); @@ -138,7 +138,7 @@ public: /// Return a hash value for this object. virtual CORBA::ULong hash (CORBA::ULong max - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Please see the Profile.h for the documentation of this method virtual IOP::TaggedProfile &create_tagged_profile (void); diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index 1f8cc76c277..2cbe38ae513 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -210,7 +210,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *& { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (CORBA::_tc_StringSeq TAO_ENV_ARG_PARAMETER); + type->equivalent (CORBA::_tc_StringSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -303,7 +303,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq * { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (CORBA::_tc_WStringSeq TAO_ENV_ARG_PARAMETER); + type->equivalent (CORBA::_tc_WStringSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index cae38a4a02c..c49c57b0311 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -162,7 +162,7 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles) int TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // We are creating the IOR info. Let us not be disturbed. So grab a @@ -180,7 +180,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, { this->get_profile_ior_info (*this->forward_profiles_, tmp_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->forwarded_ior_info_ = tmp_info; @@ -207,7 +207,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, { this->get_profile_ior_info (this->base_profiles_, tmp_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->ior_info_ = tmp_info; @@ -235,7 +235,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, int TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, IOP::IOR *&ior_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -273,10 +273,10 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, CORBA::ULong TAO_Stub::hash (CORBA::ULong max - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // we rely on the profile objects that its address info - return this->base_profiles_.hash (max TAO_ENV_ARG_PARAMETER); + return this->base_profiles_.hash (max ACE_ENV_ARG_PARAMETER); } // Expensive comparison of objref data, to see if two objrefs @@ -398,7 +398,7 @@ private: CORBA::Policy_ptr TAO_Stub::get_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->policies_ == 0) @@ -420,12 +420,12 @@ TAO_Stub::get_policy (CORBA::PolicyType type // e.g., to add methods for policy specific reconciliation, etc. return this->get_client_policy (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Policy_ptr TAO_Stub::get_client_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // No need to lock, the stub only changes its policies at // construction time... @@ -435,7 +435,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type if (this->policies_ != 0) { result = this->policies_->get_policy (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); } @@ -443,7 +443,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type { TAO_Policy_Current &policy_current = this->orb_core_->policy_current (); result = policy_current.get_policy (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); } @@ -457,7 +457,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type if (policy_manager != 0) { result = policy_manager->get_policy (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); } } @@ -466,7 +466,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type { result = this->orb_core_-> get_default_policies ()->get_policy (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); } @@ -476,7 +476,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type TAO_Stub * TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Notice the use of an explicit constructor.... auto_ptr<TAO_Policy_Set> policy_manager ( @@ -486,31 +486,31 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, { policy_manager->set_policy_overrides (policies, set_add - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else if (this->policies_ == 0) { policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else { policy_manager->copy_from (this->policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); policy_manager->set_policy_overrides (policies, set_add - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (), this->base_profiles_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); stub->policies_ = policy_manager.release (); @@ -523,25 +523,25 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::PolicyList * TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->policies_ == 0) return 0; return this->policies_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Use Locate Request to establish connection/make sure the object // is there ... TAO_GIOP_Locate_Request_Invocation locate_request (this, this->orb_core_.get ()); - locate_request.init_inconsistent_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + locate_request.init_inconsistent_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ For some combinations of RTCORBA policies, location forwarding @@ -552,10 +552,10 @@ TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies { for (;;) { - locate_request.start (TAO_ENV_SINGLE_ARG_PARAMETER); + locate_request.start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - int status = locate_request.invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + int status = locate_request.invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We'll get this only if the object was, in fact, forwarded. diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 3726efd75ea..ad0fdb90550 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -107,21 +107,21 @@ public: * types. */ virtual CORBA::Policy_ptr get_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean validate_connection (CORBA::PolicyList_out inconsistent_policies - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -161,7 +161,7 @@ public: * equivalent). */ CORBA::ULong hash (CORBA::ULong maximum - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Implement the is_equivalent() method for the CORBA::Object CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj); @@ -283,7 +283,7 @@ public: */ int create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -313,7 +313,7 @@ private: /// THREAD-SAFE Create the IOR info int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h index abe076c36df..5fa3dae9617 100644 --- a/TAO/tao/Stub_Factory.h +++ b/TAO/tao/Stub_Factory.h @@ -49,7 +49,7 @@ public: virtual TAO_Stub *create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; #include "ace/post.h" diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index b8f946f8763..185110e2394 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -300,10 +300,10 @@ TAO::BufferingConstraintPolicy_var::tao_nil (void) ::TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO::BufferingConstraintPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -384,15 +384,15 @@ TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void) TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return BufferingConstraintPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return BufferingConstraintPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -551,7 +551,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::BufferingCons { CORBA::TypeCode_var type = _tao_any.type (); CORBA::Boolean result = - type->equivalent (TAO::_tc_BufferingConstraint TAO_ENV_ARG_PARAMETER); + type->equivalent (TAO::_tc_BufferingConstraint ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index a7b10c3ff0c..18971c54055 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -176,7 +176,7 @@ TAO_NAMESPACE TAO static BufferingConstraintPolicy_ptr tao_duplicate (BufferingConstraintPolicy_ptr); static void tao_release (BufferingConstraintPolicy_ptr); static BufferingConstraintPolicy_ptr tao_nil (void); - static BufferingConstraintPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static BufferingConstraintPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -231,11 +231,11 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); static BufferingConstraintPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static BufferingConstraintPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static BufferingConstraintPolicy_ptr _nil (void) { @@ -243,7 +243,7 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy } virtual TAO::BufferingConstraint buffering_constraint ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i index 72d73691ccf..b05d24f8ae2 100644 --- a/TAO/tao/TAOC.i +++ b/TAO/tao/TAOC.i @@ -200,10 +200,10 @@ tao_TAO_BufferingConstraintPolicy_nil ( ACE_INLINE TAO::BufferingConstraintPolicy_ptr tao_TAO_BufferingConstraintPolicy_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO::BufferingConstraintPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp index c0be2f8005f..100b355798b 100644 --- a/TAO/tao/Thread_Lane_Resources.cpp +++ b/TAO/tao/Thread_Lane_Resources.cpp @@ -97,7 +97,7 @@ TAO_Thread_Lane_Resources::leader_follower (void) int TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { /// Access the acceptor registry. TAO_Acceptor_Registry &ar = @@ -108,7 +108,7 @@ TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address ar.open (&this->orb_core_, this->leader_follower ().reactor (), ignore_address - TAO_ENV_ARG_PARAMETER); + 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 7bf51b5e16f..bc038346759 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -50,7 +50,7 @@ public: /// Open the acceptor registry. int open_acceptor_registry (int ignore_address - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Finalize resources. void finalize (void); diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index 54d5da90568..4c5270a1535 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -48,7 +48,7 @@ public: virtual void finalize (void) = 0; /// Open default resources. - virtual int open_default_resources (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; + virtual int open_default_resources (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; /// Shutdown reactor. virtual void shutdown_reactor (void) = 0; diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index d9067f95c14..dac0b617bad 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -359,7 +359,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::UtcT *&_ { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TimeBase::_tc_UtcT TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TimeBase::_tc_UtcT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -442,7 +442,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::Interval { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (TimeBase::_tc_IntervalT TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (TimeBase::_tc_IntervalT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index 36ced983c1f..3513fb7342d 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -141,10 +141,10 @@ CORBA_TypeCodeFactory_var::tao_nil (void) ::CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::CORBA_TypeCodeFactory::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::CORBA_TypeCodeFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -226,15 +226,15 @@ CORBA_TypeCodeFactory::~CORBA_TypeCodeFactory (void) CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_TypeCodeFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return CORBA_TypeCodeFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h index 219e40e20e4..c12cd2ee338 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h @@ -97,7 +97,7 @@ public: static CORBA_TypeCodeFactory_ptr tao_duplicate (CORBA_TypeCodeFactory_ptr); static void tao_release (CORBA_TypeCodeFactory_ptr); static CORBA_TypeCodeFactory_ptr tao_nil (void); - static CORBA_TypeCodeFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CORBA_TypeCodeFactory_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -152,11 +152,11 @@ public: static CORBA_TypeCodeFactory_ptr _duplicate (CORBA_TypeCodeFactory_ptr obj); static CORBA_TypeCodeFactory_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_TypeCodeFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_TypeCodeFactory_ptr _nil (void) { @@ -167,7 +167,7 @@ public: const char * id, const char * name, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -178,7 +178,7 @@ public: const char * name, CORBA::TypeCode_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -188,7 +188,7 @@ public: const char * id, const char * name, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -198,7 +198,7 @@ public: const char * id, const char * name, CORBA::TypeCode_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -208,7 +208,7 @@ public: const char * id, const char * name, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -217,7 +217,7 @@ public: virtual CORBA::TypeCode_ptr create_interface_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -225,7 +225,7 @@ public: virtual CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -233,7 +233,7 @@ public: virtual CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -242,7 +242,7 @@ public: virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -251,7 +251,7 @@ public: virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -260,7 +260,7 @@ public: virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -272,7 +272,7 @@ public: CORBA::Short type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA_ValueMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -282,7 +282,7 @@ public: const char * id, const char * name, CORBA::TypeCode_ptr boxed_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -291,7 +291,7 @@ public: virtual CORBA::TypeCode_ptr create_native_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -299,7 +299,7 @@ public: virtual CORBA::TypeCode_ptr create_recursive_tc ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -308,7 +308,7 @@ public: virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -317,7 +317,7 @@ public: virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -326,7 +326,7 @@ public: virtual CORBA::TypeCode_ptr create_component_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -335,7 +335,7 @@ public: virtual CORBA::TypeCode_ptr create_home_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl index bb6a7fe62f0..93d615564c7 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl @@ -50,10 +50,10 @@ tao_CORBA_TypeCodeFactory_nil ( ACE_INLINE CORBA_TypeCodeFactory_ptr tao_CORBA_TypeCodeFactory_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return CORBA_TypeCodeFactory::_narrow (p TAO_ENV_ARG_PARAMETER); + return CORBA_TypeCodeFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp index 2461a250150..f3b9aa51a7c 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp @@ -15,7 +15,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc ( const char * id, const char * name, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -24,7 +24,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc ( return tcf.create_struct_tc (id, name, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -33,7 +33,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( const char * name, CORBA::TypeCode_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -43,7 +43,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( name, discriminator_type, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -51,7 +51,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( const char * id, const char * name, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -60,7 +60,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( return tcf.create_enum_tc (id, name, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -68,7 +68,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc ( const char * id, const char * name, CORBA::TypeCode_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -77,7 +77,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc ( return tcf.create_alias_tc (id, name, original_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -85,7 +85,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc ( const char * id, const char * name, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -94,14 +94,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc ( return tcf.create_exception_tc (id, name, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -109,40 +109,40 @@ TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc ( return tcf.create_interface_tc (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_string_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_string_tc (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_wstring_tc (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -150,14 +150,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc ( return tcf.create_fixed_tc (digits, scale - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -165,14 +165,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc ( return tcf.create_sequence_tc (bound, element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -180,7 +180,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_array_tc ( return tcf.create_array_tc (length, element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -190,7 +190,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc ( CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA_ValueMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -201,7 +201,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc ( type_modifier, concrete_base, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -209,7 +209,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc ( const char * id, const char * name, CORBA::TypeCode_ptr boxed_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -218,14 +218,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc ( return tcf.create_value_box_tc (id, name, boxed_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_native_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -233,27 +233,27 @@ TAO_TypeCodeFactory_Adapter_Impl::create_native_tc ( return tcf.create_native_tc (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_recursive_tc (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -261,14 +261,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc ( return tcf.create_abstract_interface_tc (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc ( const char * id, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -276,7 +276,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc ( return tcf.create_local_interface_tc (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // ********************************************************************* diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h index 45764d9a832..4d751336df5 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h @@ -43,7 +43,7 @@ public: const char *id, const char *name, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -52,7 +52,7 @@ public: const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -60,7 +60,7 @@ public: const char *id, const char *name, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -68,7 +68,7 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -76,47 +76,47 @@ public: const char *id, const char *name, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -126,7 +126,7 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA_ValueMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -134,34 +134,34 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_recursive_tc ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp index f3af1fe9ae1..882d11ecc90 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp @@ -27,7 +27,7 @@ CORBA::Object_ptr TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr, int, char * [] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h index 7a02e826e44..cc6528ca3f0 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h @@ -39,7 +39,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv [] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Overload the base class method to create a new instance // of a TypeCodeFactory object. diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index 182ba3b48d2..6d4637b2259 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -17,7 +17,7 @@ TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i (void) TAO_TypeCodeFactory_i * TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) { @@ -55,7 +55,7 @@ TAO_TypeCodeFactory_i::create_struct_tc ( const char *id, const char *name, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -63,7 +63,7 @@ TAO_TypeCodeFactory_i::create_struct_tc ( name, members, CORBA::tk_struct - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -72,7 +72,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -92,7 +92,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::Boolean good_disc_type = this->valid_disc_type (discriminator_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!good_disc_type) @@ -131,7 +131,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( { CORBA::Boolean equiv = members[i].type.in ()->equivalent (members[i - 1].type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); // If adjacent names are the same and their types are equivalent, @@ -179,7 +179,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( // Valid member type? valid_member = this->valid_content_type (tc_holder - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_member) @@ -208,7 +208,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::Boolean equiv = discriminator_type->equivalent (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!equiv) @@ -224,7 +224,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( this->unique_label_values (members, discriminator_type, raw_default_index - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!unique_labels) @@ -265,7 +265,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( if (index == raw_default_index) { // This is the default label - we have to find a legal value. - CORBA::TCKind kind = discriminator_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); this->compute_default_label (kind, @@ -284,7 +284,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( (void) TAO_Marshal_Object::perform_append (tc.in (), &in, &cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } @@ -318,7 +318,7 @@ TAO_TypeCodeFactory_i::create_enum_tc ( const char *id, const char *name, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -400,7 +400,7 @@ TAO_TypeCodeFactory_i::create_alias_tc ( const char *id, const char *name, CORBA::TypeCode_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -420,7 +420,7 @@ TAO_TypeCodeFactory_i::create_alias_tc ( CORBA::Boolean valid_content = this->valid_content_type (original_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_content) @@ -471,7 +471,7 @@ TAO_TypeCodeFactory_i::create_exception_tc ( const char *id, const char *name, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -479,27 +479,27 @@ TAO_TypeCodeFactory_i::create_exception_tc ( name, members, CORBA::tk_except - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_objref - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_string_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -527,7 +527,7 @@ TAO_TypeCodeFactory_i::create_string_tc ( CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_wstring_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -556,7 +556,7 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_fixed_tc ( CORBA::UShort /* digits */, CORBA::UShort /* scale */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -568,13 +568,13 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean valid_element = this->valid_content_type (element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_element) @@ -616,13 +616,13 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean valid_element = this->valid_content_type (element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_element) @@ -667,7 +667,7 @@ TAO_TypeCodeFactory_i::create_value_tc ( CORBA::ValueModifier /* type_modifier */, CORBA::TypeCode_ptr /* concrete_base */, const CORBA_ValueMemberSeq & /* members */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -680,7 +680,7 @@ TAO_TypeCodeFactory_i::create_value_box_tc ( const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -701,7 +701,7 @@ TAO_TypeCodeFactory_i::create_value_box_tc ( CORBA::Boolean valid_content = this->valid_content_type (boxed_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_content) @@ -745,20 +745,20 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_native_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_native - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_recursive_tc ( const char * /* id */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -770,56 +770,56 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_abstract_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_abstract_interface - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_local_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_local_interface - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_component_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_home_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, CORBA::tk_home - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void @@ -1008,7 +1008,7 @@ TAO_TypeCodeFactory_i::create_tc_common ( const char *id, const char *name, CORBA::TCKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1061,7 +1061,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( const char *name, const CORBA_StructMemberSeq &members, CORBA::TCKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1111,7 +1111,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( tc_holder = members[index].type.in (); valid_member = this->valid_content_type (tc_holder - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_member) @@ -1221,9 +1221,9 @@ TAO_TypeCodeFactory_i::valid_id (const char *id) CORBA::Boolean TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (kind == CORBA::tk_null @@ -1240,9 +1240,9 @@ CORBA::Boolean TAO_TypeCodeFactory_i::unique_label_values (const CORBA_UnionMemberSeq &members, CORBA::TypeCode_ptr disc_tc, CORBA::ULong default_index_slot - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - CORBA::TCKind disc_kind = disc_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind disc_kind = disc_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = members.length (); @@ -1392,9 +1392,9 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA_UnionMemberSeq &members, CORBA::Boolean TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (kind == CORBA::tk_enum diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h index ad58d903275..919faf28219 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h @@ -50,7 +50,7 @@ public: /// = LocalObject methods static TAO_TypeCodeFactory_i *_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -58,7 +58,7 @@ public: const char *id, const char *name, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -67,7 +67,7 @@ public: const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -75,7 +75,7 @@ public: const char *id, const char *name, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -83,7 +83,7 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -91,47 +91,47 @@ public: const char *id, const char *name, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -141,7 +141,7 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA_ValueMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -149,48 +149,48 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_recursive_tc ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_component_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_home_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -206,7 +206,7 @@ private: const char *id, const char *name, CORBA::TCKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -216,7 +216,7 @@ private: const char *name, const CORBA_StructMemberSeq &members, CORBA::TCKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -225,13 +225,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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); CORBA::Boolean unique_label_values (const CORBA_UnionMemberSeq &members, CORBA::TypeCode_ptr disc_tc, CORBA::ULong default_index_slot - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// A string in a TAO typecode contains padding to give it a /// total size which is a multiple of 4 bytes. diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp index 16c3ba57982..52fbf2498fa 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.cpp +++ b/TAO/tao/TypeCodeFactory_Adapter.cpp @@ -17,7 +17,7 @@ TAO_TypeCodeFactory_Adapter::create_struct_tc ( const char * /* id */, const char * /* name */, const CORBA_StructMemberSeq & /* members */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -30,7 +30,7 @@ TAO_TypeCodeFactory_Adapter::create_union_tc ( const char * /* name */, CORBA::TypeCode_ptr /* discriminator_type */, const CORBA_UnionMemberSeq & /* members */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42,7 +42,7 @@ TAO_TypeCodeFactory_Adapter::create_enum_tc ( const char * /* id */, const char * /* name */, const CORBA_EnumMemberSeq & /* members */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -54,7 +54,7 @@ TAO_TypeCodeFactory_Adapter::create_alias_tc ( const char * /* id */, const char * /* name */, CORBA::TypeCode_ptr /* original_type */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -66,7 +66,7 @@ TAO_TypeCodeFactory_Adapter::create_exception_tc ( const char * /* id */, const char * /* name */, const CORBA_StructMemberSeq & /* members */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -77,7 +77,7 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_interface_tc ( const char * /* id */, const char * /* name */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -87,7 +87,7 @@ TAO_TypeCodeFactory_Adapter::create_interface_tc ( CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_string_tc ( CORBA::ULong /* bound */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -97,7 +97,7 @@ TAO_TypeCodeFactory_Adapter::create_string_tc ( CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_wstring_tc ( CORBA::ULong /* bound */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -108,7 +108,7 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_fixed_tc ( CORBA::UShort /* digits */, CORBA::UShort /* scale */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -119,7 +119,7 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_sequence_tc ( CORBA::ULong /* bound */, CORBA::TypeCode_ptr /* element_type */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -130,7 +130,7 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_array_tc ( CORBA::ULong /* length */, CORBA::TypeCode_ptr /* element_type */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -144,7 +144,7 @@ TAO_TypeCodeFactory_Adapter::create_value_tc ( CORBA::ValueModifier /* type_modifier */, CORBA::TypeCode_ptr /* concrete_base */, const CORBA_ValueMemberSeq & /* members */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -156,7 +156,7 @@ TAO_TypeCodeFactory_Adapter::create_value_box_tc ( const char * /* id */, const char * /* name */, CORBA::TypeCode_ptr /* boxed_type */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -167,7 +167,7 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_native_tc ( const char * /* id */, const char * /* name */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -177,7 +177,7 @@ TAO_TypeCodeFactory_Adapter::create_native_tc ( CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_recursive_tc ( const char * /* id */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -188,7 +188,7 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_abstract_interface_tc ( const char * /* id */, const char * /* name */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -199,7 +199,7 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter::create_local_interface_tc ( const char * /* id */, const char * /* name */ - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index 995b566f073..3500d37aa5a 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -41,7 +41,7 @@ public: const char *id, const char *name, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -50,7 +50,7 @@ public: const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -58,7 +58,7 @@ public: const char *id, const char *name, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -66,7 +66,7 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -74,47 +74,47 @@ public: const char *id, const char *name, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -124,7 +124,7 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA_ValueMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -132,34 +132,34 @@ public: const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_recursive_tc ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 254bfb5eb31..8d871401477 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -42,7 +42,7 @@ void CORBA_TypeCode::Bounds::_raise (void) void CORBA_TypeCode::Bounds::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << this->_id ()) @@ -51,7 +51,7 @@ void CORBA_TypeCode::Bounds::_tao_encode ( } void CORBA_TypeCode::Bounds::_tao_decode (TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -84,7 +84,7 @@ void CORBA_TypeCode::BadKind::_raise (void) void CORBA_TypeCode::BadKind::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << this->_id ()) @@ -93,7 +93,7 @@ void CORBA_TypeCode::BadKind::_tao_encode ( } void CORBA_TypeCode::BadKind::_tao_decode (TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -261,7 +261,7 @@ CORBA_TypeCode::~CORBA_TypeCode (void) CORBA::TypeCode_ptr CORBA_TypeCode::member_type (CORBA::ULong slot - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::TypeCode_ptr typecode = 0; @@ -279,7 +279,7 @@ CORBA_TypeCode::member_type (CORBA::ULong slot { typecode = CORBA::TypeCode::_duplicate ( this->private_member_type (slot - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) ); } @@ -290,7 +290,7 @@ CORBA_TypeCode::member_type (CORBA::ULong slot const char * CORBA_TypeCode::member_name (CORBA::ULong slot - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (this->private_state_->tc_member_count_known_ && this->private_state_->tc_member_name_list_known_) @@ -308,14 +308,14 @@ CORBA_TypeCode::member_name (CORBA::ULong slot else { return this->private_member_name (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } // Return the label of the i-th member. Applicable only to CORBA::tk_union CORBA::Any_ptr CORBA_TypeCode::member_label (CORBA::ULong slot - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::Any_ptr retval = 0; @@ -339,7 +339,7 @@ CORBA_TypeCode::member_label (CORBA::ULong slot else { CORBA::Any_ptr label = this->private_member_label (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_NEW_RETURN (retval, @@ -352,7 +352,7 @@ CORBA_TypeCode::member_label (CORBA::ULong slot // only applicable to CORBA::tk_unions CORBA::TypeCode_ptr -CORBA_TypeCode::discriminator_type (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const { if (this->kind_ != CORBA::tk_union) ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (CORBA::TypeCode_ptr)0); @@ -363,7 +363,7 @@ CORBA_TypeCode::discriminator_type (TAO_ENV_SINGLE_ARG_DECL) const ); CORBA::TypeCode_ptr type = - this->private_discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->private_discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return CORBA_TypeCode::_duplicate (type); @@ -371,7 +371,7 @@ CORBA_TypeCode::discriminator_type (TAO_ENV_SINGLE_ARG_DECL) const // only applicable to CORBA::tk_unions CORBA::Long -CORBA_TypeCode::default_index (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::default_index (ACE_ENV_SINGLE_ARG_DECL) const { if (this->kind_ != CORBA::tk_union) ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); @@ -379,12 +379,12 @@ CORBA_TypeCode::default_index (TAO_ENV_SINGLE_ARG_DECL) const if (this->private_state_->tc_default_index_used_known_) return this->private_state_->tc_default_index_used_; else - return this->private_default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->private_default_index (ACE_ENV_SINGLE_ARG_PARAMETER); } // returns the length. Applicable only to string, sequence, and arrays CORBA::ULong -CORBA_TypeCode::length (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::length (ACE_ENV_SINGLE_ARG_DECL) const { // a switch stmt, unfortunately, doesn't get inlined if (this->kind_ == CORBA::tk_sequence @@ -395,7 +395,7 @@ CORBA_TypeCode::length (TAO_ENV_SINGLE_ARG_DECL) const if (this->private_state_->tc_length_known_) return this->private_state_->tc_length_; else - return this->private_length (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->private_length (ACE_ENV_SINGLE_ARG_PARAMETER); } else ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); @@ -403,7 +403,7 @@ CORBA_TypeCode::length (TAO_ENV_SINGLE_ARG_DECL) const // returns the typecode. Applicable only to string, sequence, and arrays CORBA::TypeCode_ptr -CORBA_TypeCode::content_type (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::content_type (ACE_ENV_SINGLE_ARG_DECL) const { if (this->kind_ == CORBA::tk_sequence || this->kind_ == CORBA::tk_array @@ -416,7 +416,7 @@ CORBA_TypeCode::content_type (TAO_ENV_SINGLE_ARG_DECL) const else { CORBA::TypeCode_ptr tmp = - this->private_content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->private_content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return CORBA_TypeCode::_duplicate (tmp); @@ -428,7 +428,7 @@ CORBA_TypeCode::content_type (TAO_ENV_SINGLE_ARG_DECL) const } CORBA::TypeCode_ptr -CORBA_TypeCode::concrete_base_type (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const { if (this->private_state_->tc_concrete_base_type_known_) { @@ -439,9 +439,9 @@ CORBA_TypeCode::concrete_base_type (TAO_ENV_SINGLE_ARG_DECL) const else { CORBA::TypeCode_ptr tmp = - this->private_concrete_base_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->private_concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - + return CORBA_TypeCode::_duplicate (tmp); } } @@ -666,7 +666,7 @@ TC_Private_State::~TC_Private_State (void) CORBA::string_free (this->tc_member_name_list_ [i]); this->tc_member_name_list_ [i] = 0; } - + delete [] this->tc_member_name_list_; this->tc_member_name_list_ = 0; } @@ -680,13 +680,13 @@ TC_Private_State::~TC_Private_State (void) { CORBA::release (this->tc_member_type_list_[i]); } - + // Now free up the array. delete [] this->tc_member_type_list_; this->tc_member_type_list_ = 0; } this->tc_member_count_ = 0; - + // free up concrete base value typecode if (this->tc_concrete_base_type_known_) { @@ -696,7 +696,7 @@ TC_Private_State::~TC_Private_State (void) } break; } - + default: // nothing to do break; @@ -707,7 +707,7 @@ TC_Private_State::~TC_Private_State (void) CORBA::Boolean CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { // This will catch applications that haven't initialized an ORB. if (CORBA::is_nil (tc)) @@ -731,14 +731,14 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc, while (status) { - rcvr = rcvr->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + rcvr = rcvr->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - status = (rcvr->kind (TAO_ENV_SINGLE_ARG_PARAMETER) == CORBA::tk_alias); + status = (rcvr->kind (ACE_ENV_SINGLE_ARG_PARAMETER) == CORBA::tk_alias); ACE_CHECK_RETURN (0); } - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); status = (kind == CORBA::tk_alias); @@ -750,17 +750,17 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc, while (status) { - tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); status = (kind == CORBA::tk_alias); } - kind = rcvr->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = rcvr->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::TCKind other_kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind other_kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (kind != other_kind) @@ -770,10 +770,10 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc, // typecode kinds are same return rcvr->private_equal (tcvar.in (), equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->kind_ != kind) // simple case @@ -782,7 +782,7 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc, // typecode kinds are same return this->private_equal (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // check if typecodes are equal. Equality is based on a mix of structural @@ -791,7 +791,7 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc, CORBA::Boolean CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { // We come in here only if the typecode kinds of both are same // Handle each complex typecode separately. @@ -821,48 +821,48 @@ CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc, case CORBA::tk_objref: return this->private_equal_objref (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_struct: return this->private_equal_struct (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_union: return this->private_equal_union (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_enum: return this->private_equal_enum (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_string: return this->private_equal_string (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_wstring: return this->private_equal_wstring (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_sequence: return this->private_equal_sequence (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_array: return this->private_equal_array (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_alias: return this->private_equal_alias (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_except: return this->private_equal_except (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); case CORBA::tk_value: return this->private_equal_valuetype (tc, equiv_only - TAO_ENV_ARG_PARAMETER); - + ACE_ENV_ARG_PARAMETER); + case ~0u: // indirection { // indirection offset must be same @@ -878,15 +878,15 @@ CORBA::Boolean CORBA_TypeCode::private_equal_objref ( CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { // compare the repoID and name, of which the name is optional as per GIOP // spec. However, the repoID is mandatory. - const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!ACE_OS::strcmp (my_id, tc_id)) @@ -900,10 +900,10 @@ CORBA_TypeCode::private_equal_objref ( else { // same repository IDs. Now check their names - const char *myname = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *myname = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tcname = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tcname = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ((ACE_OS::strlen (myname) > 1) && @@ -925,15 +925,15 @@ CORBA::Boolean CORBA_TypeCode::private_equal_struct ( CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { // For structs the repoID and names are optional. However, if provided, // we must compare them - const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // compare repoIDs if they exist @@ -954,10 +954,10 @@ CORBA_TypeCode::private_equal_struct ( // Skipped by equivalent(). if (!equiv_only) { - const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Compare names if they exist. @@ -968,10 +968,10 @@ CORBA_TypeCode::private_equal_struct ( } // Check if the member count is same. - CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (my_count != tc_count) @@ -1003,11 +1003,11 @@ CORBA_TypeCode::private_equal_struct ( if (!equiv_only) { const char *my_member_name = - this->member_name (i TAO_ENV_ARG_PARAMETER); + this->member_name (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); const char *tc_member_name = - tc->member_name (i TAO_ENV_ARG_PARAMETER); + tc->member_name (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ACE_OS::strlen (my_member_name) > 1 @@ -1019,11 +1019,11 @@ CORBA_TypeCode::private_equal_struct ( // now compare the typecodes of the members CORBA::TypeCode_var my_member_tc = this->member_type (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::TypeCode_var tc_member_tc = tc->member_type (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // One of our members may be recursive, but not through us. @@ -1036,7 +1036,7 @@ CORBA_TypeCode::private_equal_struct ( CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (), equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!flag) @@ -1049,14 +1049,14 @@ CORBA_TypeCode::private_equal_struct ( CORBA::Boolean CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { // For unions the repoID and names are optional. However, if provided, we // must compare them - const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // compare repoIDs if they exist @@ -1077,10 +1077,10 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc, // Skipped by equivalent(). if (!equiv_only) { - const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Compare names if they exist. @@ -1093,36 +1093,36 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc, // check if the discriminant type is same CORBA::TypeCode_var my_discrim = - this->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::TypeCode_var tc_discrim = - tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean status = my_discrim->equ_common (tc_discrim.in (), equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!status) return 0; // check the default used - CORBA::Long my_default = this->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long my_default = this->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::Long tc_default = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long tc_default = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (my_default != tc_default) return 0; // check if the member count is same - CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (my_count != tc_count) @@ -1156,11 +1156,11 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc, if (!equiv_only) { const char *my_member_name = this->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); const char *tc_member_name = tc->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ACE_OS::strlen (my_member_name) > 1 @@ -1172,11 +1172,11 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc, // now compare the typecodes of the members CORBA::TypeCode_var my_member_tc = this->member_type (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::TypeCode_var tc_member_tc = tc->member_type (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // One of our members may be recursive, but not through us. @@ -1188,7 +1188,7 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc, CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (), equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!flag) @@ -1201,14 +1201,14 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc, CORBA::Boolean CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { // For enums the repoID and names are optional. However, if provided, we // must compare them - const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // compare repoIDs if they exist @@ -1229,10 +1229,10 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc, // Skipped by equivalent(). if (!equiv_only) { - const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Compare names if they exist. @@ -1244,10 +1244,10 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc, } // check if the member count is same - CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (my_count != tc_count) @@ -1259,11 +1259,11 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc, if (!equiv_only) { const char *my_member_name = this->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); const char *tc_member_name = tc->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ACE_OS::strlen (my_member_name) > 1 @@ -1281,14 +1281,14 @@ CORBA::Boolean CORBA_TypeCode::private_equal_string ( CORBA::TypeCode_ptr tc, CORBA::Boolean /* equiv_only */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { // compare the lengths - CORBA::ULong my_len = this->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong my_len = this->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong tc_len = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong tc_len = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return (my_len == tc_len); @@ -1298,14 +1298,14 @@ CORBA::Boolean CORBA_TypeCode::private_equal_wstring ( CORBA::TypeCode_ptr tc, CORBA::Boolean /* equiv_only */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { // compare the lengths - CORBA::ULong my_len = this->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong my_len = this->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong tc_len = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong tc_len = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return (my_len == tc_len); @@ -1315,30 +1315,30 @@ CORBA::Boolean CORBA_TypeCode::private_equal_sequence ( CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { // this involves comparing the typecodes of the element type as well // as the bounds - CORBA::TypeCode_var my_elem = this->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var my_elem = this->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::TypeCode_var tc_elem = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc_elem = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean status = my_elem->equ_common (tc_elem.in (), equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!status) return 0; // now check if bounds are same - CORBA::ULong my_len = this->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong my_len = this->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong tc_len = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong tc_len = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return (my_len == tc_len); @@ -1347,31 +1347,31 @@ CORBA_TypeCode::private_equal_sequence ( CORBA::Boolean CORBA_TypeCode::private_equal_array (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { // exactly like sequence return this->private_equal_sequence (tc, equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { // for structs the repoID and names are optional. However, if provided, // we must compare them - const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // compare repoIDs if they exist @@ -1385,28 +1385,28 @@ CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc, return 0; // now compare element typecodes - CORBA::TypeCode_var my_elem = this->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var my_elem = this->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::TypeCode_var tc_elem = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc_elem = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return my_elem->equ_common (tc_elem.in (), equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { // exactly similar to structs, except that the repository ID is mandatory - const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (my_id, tc_id)) @@ -1423,10 +1423,10 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc, // Now compare names. They may be optional - skipped by equivalent(). if (!equiv_only) { - const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Compare names if they exist. @@ -1438,10 +1438,10 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc, } // check if the member count is same - CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (my_count != tc_count) @@ -1453,11 +1453,11 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc, if (!equiv_only) { const char *my_member_name = this->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); const char *tc_member_name = tc->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ACE_OS::strlen (my_member_name) > 1 @@ -1468,15 +1468,15 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc, } // now compare the typecodes of the members - CORBA::TypeCode_var my_member_tc = this->member_type (i TAO_ENV_ARG_PARAMETER); + CORBA::TypeCode_var my_member_tc = this->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::TypeCode_var tc_member_tc = tc->member_type (i TAO_ENV_ARG_PARAMETER); + CORBA::TypeCode_var tc_member_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (), equiv_only - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!flag) @@ -1492,15 +1492,15 @@ CORBA::Boolean CORBA_TypeCode::private_equal_valuetype ( CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { // compare the repoID and name, of which the name is optional as per GIOP // spec. However, the repoID is mandatory. - const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!ACE_OS::strcmp (my_id, tc_id)) @@ -1514,10 +1514,10 @@ CORBA_TypeCode::private_equal_valuetype ( else { // same repository IDs. Now check their names - const char *myname = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *myname = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - const char *tcname = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *tcname = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ((ACE_OS::strlen (myname) > 1) && @@ -1543,7 +1543,7 @@ CORBA_TypeCode::private_equal_valuetype ( // Valid only for objref, struct, union, enum, alias, and except. Raises // BadKind exception for the rest of the cases. const char * -CORBA_TypeCode::private_id (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::private_id (ACE_ENV_SINGLE_ARG_DECL) const { switch (this->kind_) { @@ -1583,7 +1583,7 @@ CORBA_TypeCode::private_id (TAO_ENV_SINGLE_ARG_DECL) const // return the name. The string is owned by the typecode const char * -CORBA_TypeCode::private_name (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::private_name (ACE_ENV_SINGLE_ARG_DECL) const { switch (this->kind_) { @@ -1637,7 +1637,7 @@ CORBA_TypeCode::private_name (TAO_ENV_SINGLE_ARG_DECL) const // For the rest of the cases, raises the BadKind exception. CORBA::ULong -CORBA_TypeCode::private_member_count (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const { switch (kind_) { @@ -1757,7 +1757,7 @@ CORBA_TypeCode::private_member_count (TAO_ENV_SINGLE_ARG_DECL) const CORBA::TypeCode_ptr CORBA_TypeCode::private_member_type (CORBA::ULong slot - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::ULong temp, mcount; @@ -1772,7 +1772,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot { case CORBA::tk_except: case CORBA::tk_struct: // index from 0 - mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0); { @@ -1813,7 +1813,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot CORBA_TypeCode::_tao_decode (this, stream, member_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -1828,7 +1828,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot ACE_NOTREACHED (break;) case CORBA::tk_union: // index from 0 - mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0); { @@ -1859,7 +1859,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot // get the typecode for the discriminator CORBA::TypeCode_ptr disc_tc = - this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); // compute the typecodes for all the members and return the // required one ACE_CHECK_RETURN (0); @@ -1871,7 +1871,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot CORBA::TypeCode::traverse_status status = TAO_Marshal_Object::perform_skip (disc_tc, &stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE @@ -1883,7 +1883,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot CORBA_TypeCode::_tao_decode (this, stream, member_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } this->private_state_->tc_member_type_list_known_ = 1; @@ -1896,7 +1896,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot ACE_NOTREACHED (break); case CORBA::tk_value: - mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0); { @@ -1968,12 +1968,12 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot CORBA_TypeCode::_tao_decode (this, stream, member_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!stream.skip_ulong ()) // skip member visibility ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), - CORBA::TypeCode::_nil ()); + CORBA::TypeCode::_nil ()); } this->private_state_->tc_member_type_list_known_ = 1; @@ -1998,7 +1998,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot // CORBA::tk_except const char * CORBA_TypeCode::private_member_name (CORBA::ULong slot - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::ULong temp, mcount; @@ -2009,7 +2009,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot this->byte_order_); CORBA::TypeCode_var tc = 0; - mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); // out of bounds ACE_CHECK_RETURN ((char *)0); @@ -2107,7 +2107,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot { // get the typecode for the discriminator CORBA::TypeCode_ptr disc_tc = - this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); // compute the name for all the members and return the // required one ACE_CHECK_RETURN (0); @@ -2118,7 +2118,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot CORBA::TypeCode::traverse_status status = TAO_Marshal_Object::perform_skip (disc_tc, &stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -2153,7 +2153,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot // Return member labels for CORBA::tk_union typecodes. CORBA::Any_ptr CORBA_TypeCode::private_member_label (CORBA::ULong n - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { // this function is only applicable to the CORBA::tk_union TC if (this->kind_ != CORBA::tk_union) @@ -2204,7 +2204,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n // get the discriminant TC CORBA::TypeCode_ptr disc_tc = - this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); for (CORBA::ULong i = 0; i < member_count; i++) @@ -2222,7 +2222,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n int retval = TAO_Marshal_Object::perform_skip (disc_tc, &temp - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -2260,7 +2260,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n retval = TAO_Marshal_Object::perform_skip (disc_tc, &stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -2276,7 +2276,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n TAO_Marshal_Object::perform_append (label_tc, &stream, &out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -2319,19 +2319,19 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n CORBA::TypeCode_ptr CORBA_TypeCode::private_discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) const { // Double checked locking... ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); - return this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr CORBA_TypeCode::private_discriminator_type_i ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) const { if (this->private_state_->tc_discriminator_type_known_) @@ -2349,7 +2349,7 @@ CORBA_TypeCode::private_discriminator_type_i ( CORBA_TypeCode::_tao_decode (this, stream, this->private_state_->tc_discriminator_type_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->private_state_->tc_discriminator_type_known_ = 1; @@ -2358,19 +2358,19 @@ CORBA_TypeCode::private_discriminator_type_i ( CORBA::Long CORBA_TypeCode::private_default_index ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) const { // Double checked locking... ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); - return this->private_default_index_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->private_default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Long CORBA_TypeCode::private_default_index_i ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) const { if (this->private_state_->tc_default_index_used_known_) @@ -2392,7 +2392,7 @@ CORBA_TypeCode::private_default_index_i ( } CORBA::Long -CORBA_TypeCode::private_length (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::private_length (ACE_ENV_SINGLE_ARG_DECL) const { TAO_InputCDR stream (this->buffer_+4, this->length_-4, this->byte_order_); @@ -2445,7 +2445,7 @@ CORBA_TypeCode::private_length (TAO_ENV_SINGLE_ARG_DECL) const } CORBA::TypeCode_ptr -CORBA_TypeCode::private_content_type (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::private_content_type (ACE_ENV_SINGLE_ARG_DECL) const { TAO_InputCDR stream (this->buffer_+4, this->length_-4, this->byte_order_); @@ -2464,7 +2464,7 @@ CORBA_TypeCode::private_content_type (TAO_ENV_SINGLE_ARG_DECL) const CORBA_TypeCode::_tao_decode (this, stream, this->private_state_->tc_content_type_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->private_state_->tc_content_type_known_ = 1; @@ -2487,7 +2487,7 @@ CORBA_TypeCode::private_content_type (TAO_ENV_SINGLE_ARG_DECL) const CORBA_TypeCode::_tao_decode (this, stream, this->private_state_->tc_content_type_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->private_state_->tc_content_type_known_ = 1; @@ -2502,7 +2502,7 @@ CORBA_TypeCode::private_content_type (TAO_ENV_SINGLE_ARG_DECL) const } CORBA::TypeCode_ptr -CORBA_TypeCode::private_concrete_base_type (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::private_concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const { if (kind_ != CORBA::tk_value) ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); @@ -2528,9 +2528,9 @@ CORBA_TypeCode::private_concrete_base_type (TAO_ENV_SINGLE_ARG_DECL) const CORBA_TypeCode::_tao_decode (this, stream, this->private_state_->tc_concrete_base_type_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + this->private_state_->tc_concrete_base_type_known_ = 1; return this->private_state_->tc_concrete_base_type_; } @@ -2541,7 +2541,7 @@ void CORBA_TypeCode::_tao_decode (const CORBA_TypeCode *parent, TAO_InputCDR &cdr, CORBA_TypeCode *&x - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { x = 0; CORBA::ULong kind; @@ -2793,7 +2793,7 @@ CORBA_TypeCode::_tao_decode (const CORBA_TypeCode *parent, // provides. CORBA::ULong -CORBA_TypeCode::param_count (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::param_count (ACE_ENV_SINGLE_ARG_DECL) const { switch (this->kind_) { @@ -2867,7 +2867,7 @@ CORBA_TypeCode::param_count (TAO_ENV_SINGLE_ARG_DECL) const CORBA::Any_ptr CORBA_TypeCode::parameter (const CORBA::Long /* slot */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), @@ -2881,7 +2881,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x) { if (x == 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 0); @@ -2913,7 +2913,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x) ACE_TRY_NEW_ENV { CORBA::ULong length = - x->length (TAO_ENV_SINGLE_ARG_PARAMETER); + x->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!cdr.write_ulong (length)) @@ -2956,7 +2956,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x) { ACE_TRY_NEW_ENV { - CORBA_TypeCode::_tao_decode (0, cdr, x TAO_ENV_ARG_PARAMETER); + CORBA_TypeCode::_tao_decode (0, cdr, x ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index 747bc19547a..63338455486 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -71,9 +71,9 @@ public: virtual void _raise (void); virtual void _tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED) const; + ACE_ENV_ARG_DECL_NOT_USED) const; virtual void _tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); static Bounds* _downcast (CORBA_Exception *ex); virtual int _is_a (const char* interface_id) const; @@ -87,9 +87,9 @@ public: virtual void _raise (void); virtual void _tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED) const; + ACE_ENV_ARG_DECL_NOT_USED) const; virtual void _tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); static BadKind* _downcast (CORBA_Exception *ex); virtual int _is_a (const char* interface_id) const; @@ -106,59 +106,59 @@ public: /// Compares two typecodes. Must be identical in every respect. CORBA::Boolean equal (CORBA::TypeCode_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// Conforms to CORBA 2.3.1 (99-10-07). CORBA::Boolean equivalent (CORBA::TypeCode_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// For all TypeCode kinds, returns the "kind" of the typecode. - CORBA::TCKind kind (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::TCKind kind (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// For tk_{objref,struct,union,enum,alias,except}. Returns the /// repository ID, raises BadKind. - const char *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + const char *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// Returns name (), raises (BadKind). - const char *name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + const char *name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// Returns member_count (), raises (BadKind). Useful for tk_struct, /// tk_union, tk_enum, tk_alias, and tk_except. - CORBA::ULong member_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::ULong member_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// Returns member_name (...), raises (BadKind, Bounds); Useful for /// tk_struct, tk_union, tk_enum, tk_alias, and tk_except. const char *member_name (CORBA::ULong slot - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// Returns member_type (...), raises (BadKind, Bounds); Useful for /// tk_struct, tk_union, and tk_except. CORBA::TypeCode_ptr member_type (CORBA::ULong slot - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// For tk_union. Returns the label. Raises BadKind, Bounds. CORBA::Any_ptr member_label (CORBA::ULong n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// Returns the discriminator type for tk_union. raises (BadKind). - CORBA::TypeCode_ptr discriminator_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::TypeCode_ptr discriminator_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// Returns the default slot for the tk_union. Raises (BadKind). - CORBA::Long default_index (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::Long default_index (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// Returns length, raises (BadKind). Used for tk_string, /// tk_sequence, and tk_array. - CORBA::ULong length (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::ULong length (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// Returns the content type (element type). Raises (BadKind); Useful /// for tk_sequence, tk_array, and tk_alias. - CORBA::TypeCode_ptr content_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::TypeCode_ptr content_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// Returns the concrete base type. Raises (BadKind); Useful /// for tk_value only. CORBA::TypeCode_ptr concrete_base_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) const; // = Creation/refcounting @@ -217,18 +217,18 @@ public: /// Deprecated in the CORBA 2.2 spec and /// missing altogether from 2.3a (98-12-04), CORBA::Any_ptr parameter (const CORBA::Long slot - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Deprecated, CORBA 1.2, not fully usable. Returns the number of /// parameters that the typecode takes. - CORBA::ULong param_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::ULong param_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// CDR decoding: the >> operator is not enough because we must also /// respect the parent/child relationship among TypeCodes. static void _tao_decode (const CORBA_TypeCode *parent, TAO_InputCDR &cdr, CORBA_TypeCode *&child - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // private: // @@ -292,71 +292,71 @@ private: */ CORBA::Boolean equ_common (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// Compares the typecodes. CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// For tk_{objref,struct,union,enum,alias,except}. Returns the /// repository ID, raises BadKind. - const char *private_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + const char *private_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// returns name (), raises (BadKind) - const char *private_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + const char *private_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// returns member_count (), raises (BadKind). Useful for tk_struct, /// tk_union, tk_enum, tk_alias, and tk_except. - CORBA::ULong private_member_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::ULong private_member_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// returns member_type (...), raises (BadKind, Bounds); Useful for /// tk_struct, tk_union, and tk_except CORBA::TypeCode_ptr private_member_type ( CORBA::ULong slot - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) const; /// returns member_name (...), raises (BadKind, Bounds); Useful for /// tk_union, tk_struct, tk_except, and tk_enum const char *private_member_name (CORBA::ULong slot - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// For tk_union. Returns the label. Raises BadKind, Bounds. CORBA::Any_ptr private_member_label (CORBA::ULong n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// returns the discriminator type for tk_union, and acquires the lock /// for the wrapped function below. raises (BadKind) CORBA::TypeCode_ptr private_discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) const; /// Acquires no lock so it can be called internally from blocks /// which have a lock. CORBA::TypeCode_ptr private_discriminator_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) const; /// returns the default slot for the tk_union. Raises (BadKind); - CORBA::Long private_default_index (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::Long private_default_index (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// Acquires no lock so it can be called internally from blocks /// which have a lock. - CORBA::Long private_default_index_i (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::Long private_default_index_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// returns length, raises (BadKind). Used for tk_string, /// tk_sequence, and tk_array - CORBA::Long private_length (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + CORBA::Long private_length (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// returns the content type (element type). Raises (BadKind); Useful /// for tk_sequence, tk_array, and tk_alias CORBA::TypeCode_ptr private_content_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) const; CORBA::TypeCode_ptr private_concrete_base_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) const; // = All the private helpers testing for equality of typecodes @@ -364,57 +364,57 @@ private: /// test equality for typecodes of objrefs CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of structs CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of unions CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of enums CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of strings CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of wide strings CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of sequences CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of array CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of typedefs CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of exceptions CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) const; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; /// test equality for typecodes of exceptions CORBA::Boolean private_equal_valuetype (CORBA::TypeCode_ptr tc, CORBA::Boolean equiv_only - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) const; diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i index d6df0851834..4066b436c19 100644 --- a/TAO/tao/Typecode.i +++ b/TAO/tao/Typecode.i @@ -36,7 +36,7 @@ CORBA::TypeCode::_nil (void) } ACE_INLINE CORBA::TCKind -CORBA_TypeCode::kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) const +CORBA_TypeCode::kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const { return (CORBA::TCKind) this->kind_; } @@ -44,43 +44,43 @@ CORBA_TypeCode::kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) const // Returns true if the two typecodes are equivalent. ACE_INLINE CORBA::Boolean CORBA_TypeCode::equivalent (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { return this->equ_common (tc, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // Returns true if the two typecodes are identical. ACE_INLINE CORBA::Boolean CORBA_TypeCode::equal (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { return this->equ_common (tc, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // returns the Repository ID ACE_INLINE const char * -CORBA_TypeCode::id (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::id (ACE_ENV_SINGLE_ARG_DECL) const { // if already precomputed if (this->private_state_->tc_id_known_) return this->private_state_->tc_id_; else - return this->private_id (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->private_id (ACE_ENV_SINGLE_ARG_PARAMETER); } // returns the string name ACE_INLINE const char * -CORBA_TypeCode::name (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::name (ACE_ENV_SINGLE_ARG_DECL) const { // if already precomputed if (this->private_state_->tc_name_known_) return this->private_state_->tc_name_; else - return this->private_name (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->private_name (ACE_ENV_SINGLE_ARG_PARAMETER); } // Return the number of members defined by this typecode @@ -89,13 +89,13 @@ CORBA_TypeCode::name (TAO_ENV_SINGLE_ARG_DECL) const // For the rest of the cases, raises the BadKind exception. ACE_INLINE CORBA::ULong -CORBA_TypeCode::member_count (TAO_ENV_SINGLE_ARG_DECL) const +CORBA_TypeCode::member_count (ACE_ENV_SINGLE_ARG_DECL) const { // if already precomputed if (this->private_state_->tc_member_count_known_) return this->private_state_->tc_member_count_; else - return this->private_member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->private_member_count (ACE_ENV_SINGLE_ARG_PARAMETER); } // ************************************************************ diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index e549a201aa8..7104b6dcef8 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -57,7 +57,7 @@ void CORBA_WrongTransaction::_raise (void) } void CORBA_WrongTransaction::_tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (cdr << *this) return; @@ -65,7 +65,7 @@ void CORBA_WrongTransaction::_tao_encode (TAO_OutputCDR &cdr } void CORBA_WrongTransaction::_tao_decode (TAO_InputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (cdr >> *this) return; diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index 44ee6c588da..9dff05c5b16 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -66,8 +66,8 @@ public: virtual void _raise (void); virtual void _tao_encode (TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL_NOT_USED) const; - virtual void _tao_decode (TAO_InputCDR &cdr TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED) const; + virtual void _tao_decode (TAO_InputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED); static CORBA_WrongTransaction *_downcast (CORBA::Exception *); diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index e6ea5de14ac..8979afd5cc1 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -38,7 +38,7 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; CORBA::TypeCode::traverse_status retval = @@ -101,7 +101,7 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Any::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Typecode of the element that makes the Any. CORBA::TypeCode_var elem_tc; @@ -121,7 +121,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (elem_tc.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -142,7 +142,7 @@ CORBA::TypeCode::traverse_status TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; CORBA::TypeCode::traverse_status retval = @@ -179,7 +179,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (CORBA::_tc_long, src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -192,7 +192,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (CORBA::_tc_long, src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -214,7 +214,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (TC_opaque, src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } } // end of switch @@ -250,20 +250,20 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Principal::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // write the octet sequence representing the Principal return TAO_Marshal_Object::perform_append (TC_opaque, src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode::traverse_status TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; @@ -336,14 +336,14 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; // Number of fields in the struct. - int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); for (int i = 0; @@ -351,14 +351,14 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, i++) { // get member type - param = tc->member_type (i TAO_ENV_ARG_PARAMETER); + param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } @@ -378,14 +378,14 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var discrim_tc = - tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); CORBA::ULong kind = - discrim_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // Save the discriminator value in a temporary variable... @@ -469,7 +469,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } CORBA::ULong member_count = - tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U); @@ -482,14 +482,14 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, ++i) { CORBA::Any_var any = tc->member_label (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); CORBA::Octet o; if ((any >>= CORBA::Any::to_octet (o)) && o == 0) { CORBA::ULong default_index = - tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (i != default_index) @@ -586,12 +586,12 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, { // Good, use the default to append... CORBA::TypeCode_var member_tc = - tc->member_type (default_member TAO_ENV_ARG_PARAMETER); + tc->member_type (default_member ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); return TAO_Marshal_Object::perform_append (member_tc.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return CORBA::TypeCode::TRAVERSE_STOP; @@ -599,19 +599,19 @@ 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 TAO_ENV_ARG_PARAMETER); + tc->member_type (current_member ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); return TAO_Marshal_Object::perform_append (member_tc.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode::traverse_status TAO_Marshal_String::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; @@ -640,7 +640,7 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Size of element. CORBA::ULong bounds; @@ -673,13 +673,13 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, { // Get element typecode. CORBA::TypeCode_var tc2 = - tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); switch (kind) @@ -834,7 +834,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -858,18 +858,18 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // retrieve the bounds of the array - CORBA::ULong bounds = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // get element typecode - CORBA::TypeCode_var tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // For CORBA basic types, the copy can be optimized - CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // Return status. @@ -1027,7 +1027,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -1049,7 +1049,7 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Typecode of the aliased type. CORBA::TypeCode_var tc2; @@ -1059,13 +1059,13 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE @@ -1091,7 +1091,7 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -1102,20 +1102,20 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, continue_append = dest->append_string (*src); // Number of fields in the struct. - int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); for (int i = 0; i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE && continue_append == 1; i++) { - param = tc->member_type (i TAO_ENV_ARG_PARAMETER); + param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE @@ -1134,7 +1134,7 @@ CORBA::TypeCode::traverse_status TAO_Marshal_WString::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; @@ -1163,15 +1163,15 @@ CORBA::TypeCode::traverse_status TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; // Use the same method to append our base valuetype. - // To achive this we'll need to distinguish between - // first-time/nested appends so that we won't attempt to + // To achive this we'll need to distinguish between + // first-time/nested appends so that we won't attempt to // append rep_id several times. // if (nested_processing_ == 0) @@ -1204,14 +1204,14 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, } // Handle our base valuetype if any. - param = tc->concrete_base_type (TAO_ENV_SINGLE_ARG_PARAMETER); + param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (param->kind () != CORBA::tk_null) { - retval = this->append (param.in (), + retval = this->append (param.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -1221,7 +1221,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, } // Number of fields in the struct. - int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); for (int i = 0; @@ -1229,14 +1229,14 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, i++) { // get member type - param = tc->member_type (i TAO_ENV_ARG_PARAMETER); + param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 239c8dd36f7..f4c4ce69180 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -610,7 +610,7 @@ typedef void (*TAO_Skeleton)( TAO_ServerRequest &, void *, void * -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) +#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) , CORBA_Environment & #endif ); diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index ae45be48568..9f60e45b056 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -223,111 +223,24 @@ const size_t TAO_DEFAULT_ORB_TABLE_SIZE = 16; # error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them" #endif /* TAO_HAS_EXCEPTIONS */ -//@{ -/** - * @name Native C++ exceptions portability macros. - * - * The following macros are used to write code portable between - * platforms with and without native C++ exception support. Their - * main goal is to hide the presence of the CORBA::Environment - * argument, but they collaborate with the ACE_TRY_* macros to emulate - * the try/catch blocks. - */ - -/// Define a macro to emit code only when CORBA::Environment is used -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) -# define TAO_ENV_EMIT_CODE(X) X -#else -# define TAO_ENV_EMIT_CODE(X) -#endif /* TAO_HAS_EXCEPTIONS && !TAO_ENV_BKWD_COMPAT */ - -/// Another macro to emit code only when CORBA::Environment is used -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) -# define TAO_ENV_EMIT_CODE2(X,Y) X,Y -#else -# define TAO_ENV_EMIT_CODE2(X,Y) -#endif /* TAO_HAS_EXCEPTIONS && !TAO_ENV_BKWD_COMPAT */ - -/// Helper macro -#define TAO_ENV_EMIT_DUMMY - -/// Declare a CORBA::Environment argument as the last argument of a -/// function -/** - * Normally this macro is used as follows: - * - * <CODE>void my_funct (int x, int y TAO_ENV_ARG_DECL);</CODE> - * - * Its purpose is to provide TAO developers (and users) with a - * mechanism to write code that is portable to platforms with and - * without native C++ exceptions. - */ -#define TAO_ENV_ARG_DECL \ - TAO_ENV_EMIT_CODE2(TAO_ENV_EMIT_DUMMY, \ - CORBA::Environment &ACE_TRY_ENV) - -/// Declare a CORBA::Environment argument with the default value -/// obtained from the TAO orb. Similar to TAO_ENV_ARG_DECL -#define TAO_ENV_ARG_DECL_WITH_DEFAULTS \ - TAO_ENV_EMIT_CODE2(TAO_ENV_EMIT_DUMMY, \ - CORBA::Environment &ACE_TRY_ENV = \ - TAO_default_environment ()) - -/// Declare a CORBA::Environment argument that is not used by the -/// function definition. -/** - * Similar to TAO_ENV_ARG_DECL, but the formal parameter name is - * dropped to avoid warnings about unused parameters - */ -#define TAO_ENV_ARG_DECL_NOT_USED \ - TAO_ENV_EMIT_CODE2(TAO_ENV_EMIT_DUMMY, \ - CORBA::Environment &) - -/// Declare a CORBA::Environment argument for methods that do not take -/// any other parameters -#define TAO_ENV_SINGLE_ARG_DECL \ - TAO_ENV_EMIT_CODE(CORBA::Environment &ACE_TRY_ENV) - -/// Declare a CORBA::Environment argument with a default value for -/// methods that do not take any other parameters -#define TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \ - TAO_ENV_EMIT_CODE(CORBA::Environment &ACE_TRY_ENV = \ - TAO_default_environment ()) - -/// Declare a CORBA::Environment argument for for ethods -#define TAO_ENV_SINGLE_ARG_DECL_NOT_USED \ - TAO_ENV_EMIT_CODE(CORBA::Environment &) - -/// Use the CORBA::Environment argument is a nested call -#define TAO_ENV_ARG_PARAMETER \ - TAO_ENV_EMIT_CODE2(TAO_ENV_EMIT_DUMMY, \ - ACE_TRY_ENV) - -/// Use the CORBA::Environment argument is a nested call, assuming the -/// called function take only the ACE_TRY_ENV argument. -#define TAO_ENV_SINGLE_ARG_PARAMETER \ - TAO_ENV_EMIT_CODE(ACE_TRY_ENV) - -/// Eliminate unused argument warnings about ACE_TRY_ENV -#define TAO_ENV_ARG_NOT_USED \ - TAO_ENV_EMIT_CODE(ACE_UNUSED_ARG(ACE_TRY_ENV)) - -/// Declare a CORBA::Environment variable. -/** - * Used in methods that do not take such an argument, or do not take - * it when compiled with native C++ exceptions, but use the argument - * in all platforms - */ -#define TAO_ENV_DECLARE_NEW_ENV \ - TAO_ENV_EMIT_CODE(ACE_DECLARE_NEW_CORBA_ENV) -//@} - -#if !defined (TAO_HAS_EXCEPTIONS) -// This thing can be moved into the above when we drop TAO_ENV_BKWD_COMPAT. -# define TAO_ENV_RAISE(ex) ACE_TRY_ENV.exception (ex) -#else -# define TAO_ENV_RAISE(ex) (ex)->_raise () -#endif /* TAO_HAS_EXCEPTIONS */ +//-------- begin deprecated ----------------------------------------------- +// The TAO_ENV_ macros have been renamed to ACE_ENV_ +// and have been moved to $ACE_ROOT/ace/CORBA_macros.h. +// Please only use the latter. +// The macros below are deprecated and may be removed soon. +#define TAO_ENV_EMIT_CODE(X) ACE_ENV_EMIT_CODE(X) +#define TAO_ENV_EMIT_CODE2(X,Y) ACE_ENV_EMIT_CODE2(X,Y) +#define TAO_ENV_ARG_DECL ACE_ENV_ARG_DECL +#define TAO_ENV_ARG_DECL_WITH_DEFAULTS ACE_ENV_ARG_DECL_WITH_DEFAULTS +#define TAO_ENV_ARG_DECL_NOT_USED ACE_ENV_ARG_DECL_NOT_USED +#define TAO_ENV_SINGLE_ARG_DECL ACE_ENV_SINGLE_ARG_DECL +#define TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS +#define TAO_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_DECL_NOT_USED +#define TAO_ENV_ARG_PARAMETER ACE_ENV_ARG_PARAMETER +#define TAO_ENV_SINGLE_ARG_PARAMETER ACE_ENV_SINGLE_ARG_PARAMETER +#define TAO_ENV_ARG_NOT_USED ACE_ENV_ARG_NOT_USED +#define TAO_ENV_RAISE(ex) ACE_ENV_RAISE(ex) +//-------- end deprecated ------------------------------------------------- // BC++ seems to have a different convention for detecting Win32 than // VC++. diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 65ffe868d3f..e05a686a8f7 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -31,7 +31,7 @@ ACE_RCSID(tao, skip, "$Id$") CORBA::TypeCode::traverse_status TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_skipping = 1; @@ -95,7 +95,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Typecode of the element that makes the Any. CORBA::TypeCode_var elem_tc; @@ -106,13 +106,13 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, return TAO_Marshal_Object::perform_skip (elem_tc.in (), stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode::traverse_status TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_skipping = 1; @@ -206,7 +206,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_skipping = 1; @@ -237,7 +237,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_skipping = 1; @@ -300,26 +300,26 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; // Number of fields in the struct. - int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); for (int i = 0; i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE; i++) { - param = tc->member_type (i TAO_ENV_ARG_PARAMETER); + param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } @@ -337,14 +337,14 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *src - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var discrim_tc = - tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); CORBA::ULong kind = - discrim_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // Save the discriminator value in a temporary variable... @@ -420,7 +420,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, } CORBA::ULong member_count = - tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U); @@ -432,14 +432,14 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, i != member_count && current_member == null_member; ++i) { - CORBA::Any_var any = tc->member_label (i TAO_ENV_ARG_PARAMETER); + CORBA::Any_var any = tc->member_label (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); CORBA::Octet o; if ((any >>= CORBA::Any::to_octet (o)) && o == 0) { CORBA::ULong default_index = - tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (i != default_index) @@ -536,11 +536,11 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, { // Good, use the default to append... CORBA::TypeCode_var member_tc = - tc->member_type (default_member TAO_ENV_ARG_PARAMETER); + tc->member_type (default_member ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); return TAO_Marshal_Object::perform_skip (member_tc.in (), src - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // If we're here, we have an implicit default case, and we @@ -551,17 +551,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 TAO_ENV_ARG_PARAMETER); + tc->member_type (current_member ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); return TAO_Marshal_Object::perform_skip (member_tc.in (), src - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode::traverse_status TAO_Marshal_String::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_skipping = 1; @@ -590,7 +590,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Size of element. CORBA::ULong bounds; @@ -616,11 +616,11 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, // Get element typecode. CORBA::TypeCode_var tc2 = - tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // For CORBA basic types, the skip can be optimized - CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); char *dummy; @@ -676,7 +676,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, continue_skipping = TAO_Marshal_Object::perform_skip (tc2.in (), stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -696,22 +696,22 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean continue_skipping = 1; // retrieve the bounds of the array - CORBA::ULong bounds = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // get element typecode // Typecode of the element. - CORBA::TypeCode_var tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // For CORBA basic types, the skip can be optimized - CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); char *dummy; @@ -767,7 +767,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, int stop = TAO_Marshal_Object::perform_skip (tc2.in (), stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (stop == CORBA::TypeCode::TRAVERSE_STOP) continue_skipping = 0; @@ -789,7 +789,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Typecode of the aliased type. CORBA::TypeCode_var tc2; @@ -799,12 +799,12 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_skip (tc2.in (), stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // tc2->_decr_refcnt (); @@ -830,7 +830,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -841,19 +841,19 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_STOP; // Number of fields in the exception - int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); for (int i = 0; i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE; i++) { - param = tc->member_type (i TAO_ENV_ARG_PARAMETER); + param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } @@ -872,7 +872,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_CDR::Boolean continue_skipping = 1; @@ -902,15 +902,15 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; // Use the same method to skip over our base valuetype. - // To achive this we'll need to distinguish between - // first-time/nested skips so that we won't attempt to + // To achive this we'll need to distinguish between + // first-time/nested skips so that we won't attempt to // skip rep_id several times. // if (nested_processing_ == 0) @@ -932,7 +932,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, else if (value_tag & TAO_OBV_GIOP_Flags::Type_info_single) { // Skip a single repository id which is of type string. - stream->skip_string (); + stream->skip_string (); } else { @@ -942,11 +942,11 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, } // Handle our base valuetype if any. - param = tc->concrete_base_type (TAO_ENV_SINGLE_ARG_PARAMETER); + param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (param->kind () != CORBA::tk_null) { - retval = this->skip (param.in (), stream TAO_ENV_ARG_PARAMETER); + retval = this->skip (param.in (), stream ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -956,19 +956,19 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, } // Number of fields in the valuetype. - int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); for (int i = 0; i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE; i++) { - param = tc->member_type (i TAO_ENV_ARG_PARAMETER); + param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } |