diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/NVList.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/NVList.cpp | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 90c42779410..5067c9fe907 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -9,13 +9,14 @@ #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Impl.h" -#include "tao/SystemException.h" #include "tao/CORBA_String.h" #include "tao/CDR.h" #include "tao/debug.h" +#include "tao/SystemException.h" #include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" +#include "ace/CORBA_macros.h" #if !defined (__ACE_INLINE__) # include "tao/AnyTypeCode/NVList.inl" @@ -95,23 +96,18 @@ CORBA::NVList::~NVList (void) // add an element and just initialize its flags CORBA::NamedValue_ptr -CORBA::NVList::add (CORBA::Flags flags - ) +CORBA::NVList::add (CORBA::Flags flags) { // call the helper to allocate a NamedValue element (if necessary) - return this->add_element (flags - ); + return this->add_element (flags); } // add an element and just initialize its flags and name CORBA::NamedValue_ptr -CORBA::NVList::add_item (const char *name, - CORBA::Flags flags - ) +CORBA::NVList::add_item (const char *name, CORBA::Flags flags) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags - ); + CORBA::NamedValue_ptr nv = this->add_element (flags); if (nv) { @@ -129,12 +125,10 @@ 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::Flags flags) { // Call the helper to allocate a NamedValue element. - CORBA::NamedValue_ptr nv = this->add_element (flags - ); + CORBA::NamedValue_ptr nv = this->add_element (flags); if (nv) { @@ -157,9 +151,7 @@ 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::NVList::add_item_consume (char *name, CORBA::Flags flags) { // call the helper to allocate a NamedValue element @@ -228,8 +220,7 @@ CORBA::NVList::add_element (CORBA::Flags flags if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT)) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (), - CORBA::NamedValue::_nil ()); + throw ::CORBA::BAD_PARAM (); } CORBA::NamedValue_ptr nv; @@ -261,8 +252,7 @@ CORBA::NVList::item (CORBA::ULong n if (n >= this->max_) { - ACE_THROW_RETURN (CORBA::Bounds (), - CORBA::NamedValue::_nil ()); + throw ::CORBA::Bounds (); } CORBA::NamedValue_ptr *nv = 0; |