diff options
| author | gokhale <asgokhale@users.noreply.github.com> | 1998-04-20 11:38:26 +0000 |
|---|---|---|
| committer | gokhale <asgokhale@users.noreply.github.com> | 1998-04-20 11:38:26 +0000 |
| commit | 4deacfe93b7353ed03e902e6103deaf4863ba96c (patch) | |
| tree | a980a39e4ec4602777416456686419f254048a6c /TAO | |
| parent | c92c0c424e946204ce6d91abfb2e2aa5ef4607e5 (diff) | |
| download | ATCD-4deacfe93b7353ed03e902e6103deaf4863ba96c.tar.gz | |
*** empty log message ***
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-98c | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/encode.cpp | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index f2abe96d347..4c5d93291a6 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,9 @@ +Mon Apr 20 06:36:44 1998 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> + + * TAO_IDL/be/be_interface.cpp: The generated typecode was incorect + in its encapsulation length. We were generating the entire + TypeCode length as the encapsulation length. + Sat Apr 18 20:21:24 1998 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> * TAO_IDL/be/{be_visitor_exception, be_visitor_sequence, diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 4fccc686756..478aa6010ab 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -1508,7 +1508,7 @@ be_interface::gen_typecode (void) cs->indent (); // start from whatever indentation level we were at *cs << "CORBA::tk_objref, // typecode kind" << nl; - *cs << this->tc_size () << ", // encapsulation length\n"; + *cs << this->tc_encap_len () << ", // encapsulation length\n"; // now emit the encapsulation return this->gen_encapsulation (); } diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index 813a2d7bfad..56a656c8345 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -443,17 +443,17 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc, continue_encoding = stream->write_wchar (*(CORBA::WChar *) data); break; case CORBA::tk_any: - case CORBA::tk_TypeCode: case CORBA::tk_Principal: - case CORBA::tk_objref: case CORBA::tk_struct: case CORBA::tk_union: - case CORBA::tk_string: case CORBA::tk_sequence: case CORBA::tk_array: case CORBA::tk_alias: case CORBA::tk_except: + case CORBA::tk_string: case CORBA::tk_wstring: + case CORBA::tk_TypeCode: + case CORBA::tk_objref: retval = stream->encode (param, data, 0, env); break; default: |