diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-16 23:17:40 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-16 23:17:40 +0000 |
| commit | c85b35bbe3b1a50b47b1024cb1fdfde66ca0eb90 (patch) | |
| tree | 550ffa02f11fc3d51b4f708b6dceeb6f117a88a6 | |
| parent | e5c1195d35219a79865b96ccee9729d99fc9f36a (diff) | |
| download | ATCD-c85b35bbe3b1a50b47b1024cb1fdfde66ca0eb90.tar.gz | |
ChangeLogTag: Mon Aug 16 18:14:53 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 16 |
2 files changed, 10 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 33e06cb4675..87d71c9f5f8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Aug 16 18:14:53 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_interface.cpp (gen_stub_ctor): + + Fixed logic in generation of constructor taking stub and + servant, for abstract interfaces that inherit from other + abstract interfaces. + Mon Aug 16 16:31:19 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * TAO-INSTALL.html (href): diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 0ff72dba1b7..1fc3434c684 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -520,7 +520,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) << ")" << be_nl << ": "; - if (this->has_mixed_parentage_ && ! this->is_abstract ()) + if (this->has_mixed_parentage_) { *os << "ACE_NESTED_CLASS (CORBA, AbstractBase) (" << be_idt << be_idt << be_idt_nl @@ -553,19 +553,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) *os << be_idt; } - if (is_abstract_) - { - if (this->pd_n_inherits == 0) - { - *os << "ACE_NESTED_CLASS (CORBA, AbstractBase) (" - << be_idt << be_idt_nl - << "objref," << be_nl - << "_tao_collocated," << be_nl - << "servant" << be_uidt_nl - << ")" << be_uidt; - } - } - else + if (!is_abstract_) { *os << "ACE_NESTED_CLASS (CORBA, Object) (" << be_idt << be_idt_nl |