diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-01 14:38:46 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-01 14:38:46 +0000 |
| commit | bd45b1bb4b46ac6adaf827ee654582be593bbe40 (patch) | |
| tree | 437b7c1acea408636cc53a2a687d3c8ddf3a765c | |
| parent | 752e50a3f4da101e3b6f2391153b249fd3349110 (diff) | |
| download | ATCD-bd45b1bb4b46ac6adaf827ee654582be593bbe40.tar.gz | |
ChangeLogTag: Mon Sep 1 09:34:44 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog_ref | 11 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 16 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp | 7 |
3 files changed, 20 insertions, 14 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index c7fa3d0d8e4..634adcdc2e1 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,14 @@ +Mon Sep 1 09:34:44 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_codegen.cpp: + + Moved generation of the Object_T.h include to the source + file from the header file. + + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + + Added _NOT_USED to the environment variable signature of _is_a. + Mon Sep 1 08:44:06 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp: diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 4c93c55bd74..b491325fb1a 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1338,14 +1338,6 @@ TAO_CodeGen::gen_stub_hdr_includes (void) } if (ACE_BIT_ENABLED (idl_global->decls_seen_info_, - idl_global->decls_seen_masks.interface_seen_)) - { - // Include the AbstractBase file from the Valuetype library. - this->gen_standard_include (this->client_header_, - "tao/Object_T.h"); - } - - if (ACE_BIT_ENABLED (idl_global->decls_seen_info_, idl_global->decls_seen_masks.abstract_iface_seen_)) { // Include the AbstractBase file from the Valuetype library. @@ -1411,6 +1403,14 @@ TAO_CodeGen::gen_stub_src_includes (void) } } + if (ACE_BIT_ENABLED (idl_global->decls_seen_info_, + idl_global->decls_seen_masks.interface_seen_)) + { + // Include the AbstractBase file from the Valuetype library. + this->gen_standard_include (this->client_stubs_, + "tao/Object_T.h"); + } + if (be_global->gen_amh_classes () == I_TRUE) { // Necessary for the AIX compiler. diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index 522e3e85579..41e91844a12 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -371,12 +371,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << "CORBA::Boolean" << be_nl << node->full_name () << "::_is_a (" << be_idt << be_idt_nl << "const char *value" << be_nl - << "ACE_ENV_ARG_DECL"; - - if (node->is_abstract ()) - { - *os << "_NOT_USED"; - } + << "ACE_ENV_ARG_DECL_NOT_USED"; *os << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl |