diff options
Diffstat (limited to 'TAO/tao/NVList.h')
-rw-r--r-- | TAO/tao/NVList.h | 58 |
1 files changed, 24 insertions, 34 deletions
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index 567da38fc61..0c56ac91a6f 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -181,52 +181,44 @@ public: ~CORBA_NVList (void); /// return the current number of elements in the list - CORBA::ULong count (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()) const; + CORBA::ULong count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// add an element and just initialize the flags - CORBA_NamedValue_ptr add (CORBA::Flags, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_NamedValue_ptr add (CORBA::Flags + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// add an element and initialize its name and flags CORBA_NamedValue_ptr add_item (const char *, - CORBA::Flags, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA::Flags + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// initializes a value, name, and flags CORBA_NamedValue_ptr add_value (const char *, const CORBA::Any &, - CORBA::Flags, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA::Flags + TAO_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, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA::Flags + TAO_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, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA::Flags + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// retrieve the item at the nth location. Raises Bounds - CORBA_NamedValue_ptr item (CORBA::ULong n, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_NamedValue_ptr item (CORBA::ULong n + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // CORBA::Status /// remove element at index n. Raises Bounds - void remove (CORBA::ULong n, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + void remove (CORBA::ULong n + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // The pseudo object static methods.. static CORBA_NVList* _duplicate (CORBA_NVList*); @@ -246,21 +238,20 @@ public: */ void _tao_incoming_cdr (TAO_InputCDR &cdr, int flag, - int &lazy_evaluation, - CORBA::Environment &ACE_TRY_ENV); + int &lazy_evaluation + TAO_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, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + int flag + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Decode the NVList arguments from the <cdr> stream. void _tao_decode (TAO_InputCDR &cdr, - int flag, - CORBA::Environment &ACE_TRY_ENV); + int flag + TAO_ENV_ARG_DECL); /** * Return the required alignment to marshal the NVList without any @@ -289,13 +280,12 @@ 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, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_NamedValue_ptr add_element (CORBA::Flags + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Lazy evaluation routine to fill up the Anys in the NVList from /// the CDR stream. - void evaluate (CORBA::Environment &ACE_TRY_ENV); + void evaluate (TAO_ENV_SINGLE_ARG_DECL); private: /// internal list of parameters stored as NamedValues |