summaryrefslogtreecommitdiff
path: root/TAO/tao/append.cpp
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-28 23:36:38 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-28 23:36:38 +0000
commit9bfa32b0e372ddbc51a4dc309c36cf9428e3d3ae (patch)
tree5fe3f195a55fdbd9adda9e248ffa7ed779a6510b /TAO/tao/append.cpp
parent4091f79cfee193a77e2384a3a33dc38347ef6acb (diff)
downloadATCD-9bfa32b0e372ddbc51a4dc309c36cf9428e3d3ae.tar.gz
Changed declaration of discrim_val in TAO_Marshal_Union to be
CORBA::ULongLong instead of CORBA::Long. A CORBA::Long discriminator holder would decode incorrectly if the real disicriminator were a CORBA::ULong and perhaps crash if it were a 64-bit type.
Diffstat (limited to 'TAO/tao/append.cpp')
-rw-r--r--TAO/tao/append.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index df60268ae63..153acc14a9a 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -363,7 +363,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
CORBA::TypeCode_ptr discrim_tc;
CORBA::TypeCode_ptr member_tc;
CORBA::Any_ptr member_label;
- CORBA::Long discrim_val;
+ CORBA::ULongLong discrim_val;
CORBA::ULong member_count;
CORBA::Long default_index;
CORBA::ULong i;