From 31209ce285e55cf481663f561df899ae4fd87092 Mon Sep 17 00:00:00 2001 From: parsons Date: Mon, 19 Apr 1999 21:29:17 +0000 Subject: *** empty log message *** --- TAO/tao/skip.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'TAO/tao/skip.cpp') diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 4a4c60d09c4..772c914dea4 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -488,10 +488,10 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, break; case CORBA::tk_enum: { - CORBA::Long l; + CORBA::ULong ul; TAO_InputCDR stream (member_label->_tao_get_cdr ()); - (void)stream.decode (discrim_tc, &l, 0, env); - if (l == *(CORBA::Long *) &discrim_val) + (void)stream.decode (discrim_tc, &ul, 0, env); + if (ul == *(CORBA::ULong *) &discrim_val) discrim_matched = 1; } break; @@ -504,9 +504,9 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, } break; case CORBA::tk_wchar: - // @@ ASG TO-DO - if (*(CORBA::WChar *) member_label->value () - == *(CORBA::WChar *) &discrim_val) + CORBA::WChar wc; + *member_label >>= CORBA::Any::to_wchar (wc); + if (wc == *(CORBA::WChar *) &discrim_val) discrim_matched = 1; break; case CORBA::tk_boolean: -- cgit v1.2.1