diff options
| author | sergio <sergio@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-20 01:53:58 +0000 |
|---|---|---|
| committer | sergio <sergio@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-20 01:53:58 +0000 |
| commit | 6587cfe978fd9863825843a6f743abbb6b0ae650 (patch) | |
| tree | cebe1c249e1e1b1685e52b6cf85bfc1daa3c4150 | |
| parent | 420adc0437a69a8933a1cdc6480ec169f8a4c3b2 (diff) | |
| download | ATCD-6587cfe978fd9863825843a6f743abbb6b0ae650.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 3 | ||||
| -rw-r--r-- | TAO/tao/decode.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 618a7034583..a194a8931ad 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,5 +1,8 @@ Wed Nov 19 19:04:53 1997 Sergio Flores <sergio@tango.cs.wustl.edu> + * tao/decode.cpp (decode): Added a cast so that compiler would + know which operator to call. + * orbsvcs/bin/Naming_Service/svr.cpp (handle_input): Change port number received to host byte order. Minor changes. diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index 5bb70d96c8e..e01a804f817 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -598,7 +598,7 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, dmsg2 ("detected new v%d.%d IIOP profile", profile->iiop_version.major, profile->iiop_version.minor); - objdata->type_id = 0; + objdata->type_id = (const char *) 0; objdata->Release (); objdata = 0; continue; |