summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgokhale <asgokhale@users.noreply.github.com>1998-03-25 03:17:26 +0000
committergokhale <asgokhale@users.noreply.github.com>1998-03-25 03:17:26 +0000
commit5d67e7b6e7439837cfc2ad25da43dc8a970124bc (patch)
tree30f23bd0bb1a5dc3e2aaaafb5d9c45e71764672a
parent22b3802e64e254e9a97ba566bf4712659ce346da (diff)
downloadATCD-5d67e7b6e7439837cfc2ad25da43dc8a970124bc.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-98c7
-rw-r--r--TAO/TAO_IDL/be/be_predefined_type.cpp17
2 files changed, 15 insertions, 9 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index d5d18bc479d..c2696e68c0c 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -5,13 +5,16 @@ Tue Mar 24 19:13:35 1998 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu>
mixing system exceptions with user defined exceptions. This has
been fixed and is under testing.
- * TAO_IDL/{be_visitor_exception, be_exception}.cpp: The generated
+ * TAO_IDL/be/{be_visitor_exception, be_exception}.cpp: The generated
typecode for Exceptions erroneously had a "tk_struct" TypeCode
kind. This has been fixed to be "tk_except".
- * TAO_IDL/be_visitor_operation.cpp: Handling of oneway operations
+ * TAO_IDL/be/be_visitor_operation.cpp: Handling of oneway operations
in the server skeletons was buggy. It is now fixed.
+ * TAO_IDL/be/be_predefined_type.cpp: TypeCodes for pseudo objects
+ were not getting properly generated. This is now fixed.
+
Tue Mar 24 14:51:33 1998 Nanbor Wang <nanbor@cs.wustl.edu>
* TAO_IDL/be/be_interface.cpp (gen_server_skeletons): Changed
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
index 81697b3693d..0e906b11810 100644
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ b/TAO/TAO_IDL/be/be_predefined_type.cpp
@@ -395,13 +395,16 @@ be_predefined_type::gen_typecode (void)
break;
case AST_PredefinedType::PT_pseudo:
{
- *cs << this->tc_name () << ", \n";
- if (!ACE_OS::strcmp (this->local_name ()->get_string (), "Object"))
- {
- *cs << this->tc_encap_len () << ", // encapsulation length\n";
- // now emit the encapsulation
- this->gen_encapsulation ();
- }
+ if (!ACE_OS::strcmp (this->local_name ()->get_string (), "TypeCode"))
+ *cs << "CORBA::tk_typecode,\n\n";
+ else
+ if (!ACE_OS::strcmp (this->local_name ()->get_string (), "Object"))
+ {
+ *cs << "CORBA::tk_objref,\n";
+ *cs << this->tc_encap_len () << ", // encapsulation length\n";
+ // now emit the encapsulation
+ this->gen_encapsulation ();
+ }
}
break;
}