diff options
Diffstat (limited to 'TAO/tao/DynUnion_i.cpp')
| -rw-r--r-- | TAO/tao/DynUnion_i.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp index 36e8d7ad937..d1882cd0f86 100644 --- a/TAO/tao/DynUnion_i.cpp +++ b/TAO/tao/DynUnion_i.cpp @@ -256,9 +256,8 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV) CORBA_Any* retval; ACE_NEW_THROW_EX (retval, CORBA_Any (this->type (ACE_TRY_ENV), - 0, in_cdr.start ()), - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; } @@ -1270,37 +1269,37 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, case CORBA::tk_short: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Short>, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_long: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Long>, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_ushort: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::UShort>, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_ulong: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::ULong>, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_boolean: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Boolean>, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_char: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Char>, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; @@ -1309,7 +1308,7 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, case CORBA::tk_longlong: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::LongLong>, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; @@ -1318,19 +1317,19 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, case CORBA::tk_ulonglong: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::ULongLong>, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_wchar: ACE_NEW_THROW_EX (retval, WChar_extractor, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_enum: ACE_NEW_THROW_EX (retval, Enum_extractor, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; default: @@ -1352,7 +1351,6 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any, CORBA_TypeCode_ptr disc_tc = any.type ()->discriminator_type (env); CORBA_Any disc_any (disc_tc, - 0, cdr.start ()); if (!CORBA::is_nil (this->discriminator_.in())) @@ -1409,7 +1407,6 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any, CORBA_Any member_any (any.type ()->member_type (this->index_, env), - 0, cdr.start ()); if (!CORBA::is_nil (this->member_.in ())) |