diff options
Diffstat (limited to 'TAO/tao/NVList.cpp')
| -rw-r--r-- | TAO/tao/NVList.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 3a5855ac536..b2589d0ac54 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -95,21 +95,21 @@ CORBA_NVList::~CORBA_NVList (void) // add an element and just initialize its flags CORBA::NamedValue_ptr -CORBA_NVList::add (CORBA::Flags flags, - CORBA::Environment &ACE_TRY_ENV) +CORBA_NVList::add (CORBA::Flags flags + TAO_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element (if necessary) - return this->add_element (flags, ACE_TRY_ENV); + return this->add_element (flags TAO_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, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Flags flags + TAO_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV); + CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (nv) @@ -126,11 +126,11 @@ CORBA_NVList::add_item (const char *name, CORBA::NamedValue_ptr CORBA_NVList::add_value (const char *name, const CORBA::Any &value, - CORBA::Flags flags, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Flags flags + TAO_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV); + CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (nv) { @@ -162,12 +162,12 @@ CORBA_NVList::add_value (const char *name, // add an element and just initialize its flags and name CORBA::NamedValue_ptr CORBA_NVList::add_item_consume (char *name, - CORBA::Flags flags, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Flags flags + TAO_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV); + CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (nv) @@ -186,11 +186,11 @@ CORBA_NVList::add_item_consume (char *name, CORBA::NamedValue_ptr CORBA_NVList::add_value_consume (char * name, CORBA::Any * value, - CORBA::Flags flags, - CORBA::Environment & ACE_TRY_ENV) + CORBA::Flags flags + TAO_ENV_ARG_DECL) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV); + CORBA::NamedValue_ptr nv = this->add_element (flags TAO_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*/, CORBA::Environment &/*env*/) +CORBA_NVList::remove (CORBA::ULong /*n*/ TAO_ENV_ARG_DECL_NOT_USED/*env*/) { // not implemented // @@ (ASG) - TODO @@ -219,10 +219,10 @@ CORBA_NVList::remove (CORBA::ULong /*n*/, CORBA::Environment &/*env*/) // Helper method CORBA::NamedValue_ptr -CORBA_NVList::add_element (CORBA::Flags flags, - CORBA::Environment &ACE_TRY_ENV) +CORBA_NVList::add_element (CORBA::Flags flags + TAO_ENV_ARG_DECL) { - this->evaluate (ACE_TRY_ENV); + this->evaluate (TAO_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, CORBA::Environment &ACE_TRY_ENV) +CORBA_NVList::item (CORBA::ULong n TAO_ENV_ARG_DECL) { - this->evaluate (ACE_TRY_ENV); + this->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); if (n >= this->max_) // 0 based indexing @@ -265,8 +265,8 @@ CORBA_NVList::item (CORBA::ULong n, CORBA::Environment &ACE_TRY_ENV) void CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, int flag, - int &lazy_evaluation, - CORBA::Environment &ACE_TRY_ENV) + int &lazy_evaluation + TAO_ENV_ARG_DECL) { // If the list is empty then using lazy evaluation is the only // choice. @@ -279,8 +279,8 @@ CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, if (lazy_evaluation == 0) { this->_tao_decode (cdr, - flag, - ACE_TRY_ENV); + flag + TAO_ENV_ARG_PARAMETER); return; } ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_); @@ -297,8 +297,8 @@ CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, void CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, TAO_ORB_Core *orb_core, - int flag, - CORBA::Environment &ACE_TRY_ENV) + int flag + TAO_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_); if (this->incoming_ != 0) @@ -340,8 +340,8 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, CORBA::TypeCode_var tc = nv->value ()->type (); (void) TAO_Marshal_Object::perform_append (tc.in (), this->incoming_, - &cdr, - ACE_TRY_ENV); + &cdr + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -367,16 +367,16 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, continue; nv->value ()->_tao_encode (cdr, - orb_core, - ACE_TRY_ENV); + orb_core + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void CORBA_NVList::_tao_decode (TAO_InputCDR &incoming, - int flag, - CORBA::Environment &ACE_TRY_ENV) + int flag + TAO_ENV_ARG_DECL) { if (TAO_debug_level > 3) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n"))); @@ -404,8 +404,8 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming, nv->name ()?nv->name ():"(no name given)" )); CORBA::Any_ptr any = nv->value (); - any->_tao_decode (incoming, - ACE_TRY_ENV); + any->_tao_decode (incoming + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -423,7 +423,7 @@ CORBA_NVList::_tao_target_alignment (void) } void -CORBA_NVList::evaluate (CORBA::Environment &ACE_TRY_ENV) +CORBA_NVList::evaluate (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_); if (this->incoming_ == 0) @@ -433,8 +433,8 @@ CORBA_NVList::evaluate (CORBA::Environment &ACE_TRY_ENV) this->incoming_ = 0; this->_tao_decode (*(incoming.get ()), - this->incoming_flag_, - ACE_TRY_ENV); + this->incoming_flag_ + TAO_ENV_ARG_PARAMETER); } CORBA::Boolean |