diff options
Diffstat (limited to 'TAO/tao/NVList.cpp')
| -rw-r--r-- | TAO/tao/NVList.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 90baedd7f5b..adbdc22bed2 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -9,6 +9,7 @@ #include "tao/Exception.h" #include "tao/Environment.h" #include "tao/ORB.h" +#include "tao/BoundsC.h" #include "tao/debug.h" #include "ace/Auto_Ptr.h" @@ -148,21 +149,9 @@ CORBA_NVList::add_value (const char *name, // The normal behaviour for parameters is that the ORB "borrows" // their memory for the duration of calls. // - if (value.value_) - { - nv->any_.replace (value.type_, - value.value_, - 0, - ACE_TRY_ENV); - } - else - { - nv->any_._tao_replace (value.type_, - value.byte_order_, - value.cdr_, - ACE_TRY_ENV); - } - ACE_CHECK_RETURN (0); + nv->any_._tao_replace (value.type_, + value.byte_order_, + value.cdr_); } return nv; } @@ -265,7 +254,7 @@ CORBA_NVList::item (CORBA::ULong n, CORBA::Environment &ACE_TRY_ENV) ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); if (n >= this->max_) // 0 based indexing - ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0); + ACE_THROW_RETURN (CORBA::Bounds (), 0); CORBA::NamedValue_ptr *nv; |