diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index 0c488de495a..bd489f01c77 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -482,10 +482,8 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, && cdr >> discriminant_type.out ())) // No need to use tc_demarshal() return false; - ACE_DECLARE_NEW_CORBA_ENV; CORBA::TCKind const discriminant_kind = - discriminant_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + discriminant_type->kind (); // Check for valid discriminant type. if (!(discriminant_kind == CORBA::tk_enum @@ -1392,9 +1390,8 @@ namespace TAO::TypeCodeFactory::TC_Info & info = infos[old_size]; - ACE_DECLARE_NEW_CORBA_ENV; - info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); // Should never throw! + info.id = tc->id (); + // Should never throw! info.type = tc; } |