diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-11 22:48:15 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-11 22:48:15 +0000 |
| commit | f3a183d47aa0c949c1f869bd4255847f7d2f0b2d (patch) | |
| tree | e476580e9e2cb1ec67d12fe1c292eca10752a271 | |
| parent | 6636d002856716dca68328613cfa8371a04976a3 (diff) | |
| download | ATCD-f3a183d47aa0c949c1f869bd4255847f7d2f0b2d.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-99c | 7 | ||||
| -rw-r--r-- | TAO/tao/append.cpp | 12 |
2 files changed, 14 insertions, 5 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 09984e5fc8e..f0b503e7a83 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,10 @@ +Tue May 11 17:47:30 1999 Jeff Parsons <parsons@cs.wustl.edu> + + * tao/append.cpp: + Fixed a case (wchar) of TAO_Marshal_Union::append + that Andy had marked as TODO and eliminated another + shaky call to Any::value(). + Tue May 11 17:19:30 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * orbsvcs/tests/Event/Event.dsw: diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index a7eb1775059..36d2277a63d 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -398,7 +398,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, member_label = tc->member_label (i, env); if (env.exception () == 0) { - CORBA::TypeCode_var type = member_label->type (); + CORBA::TypeCode_var type = member_label->type (); // do the matching switch (type->kind (env)) { @@ -452,10 +452,12 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } break; case CORBA::tk_wchar: - // @@ ASG TO-DO - if (*(CORBA::WChar *) member_label->value () - == *(CORBA::WChar *) &discrim_val) - discrim_matched = 1; + { + CORBA::WChar wc; + *member_label >>= CORBA::Any::to_wchar (wc); + if (wc == *(CORBA::WChar *) &discrim_val) + discrim_matched = 1; + } break; case CORBA::tk_boolean: { |