summaryrefslogtreecommitdiff
path: root/TAO/tao/skip.cpp
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-19 21:29:17 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-19 21:29:17 +0000
commit31209ce285e55cf481663f561df899ae4fd87092 (patch)
tree992ece3ba266f7b5203a627368c6acaf9b0aaac1 /TAO/tao/skip.cpp
parent673244019d969f2cb3d4dd0dbfa775d2f1e6f1f2 (diff)
downloadATCD-31209ce285e55cf481663f561df899ae4fd87092.tar.gz
*** empty log message ***
Diffstat (limited to 'TAO/tao/skip.cpp')
-rw-r--r--TAO/tao/skip.cpp12
1 files changed, 6 insertions, 6 deletions
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: