diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-10-26 17:15:21 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-10-26 17:15:21 +0000 |
| commit | 5619737386d703ef76cc2e16e1e968e2e185a1e2 (patch) | |
| tree | 6cce46d249c3138497d2d058c3c088041b060347 | |
| parent | ba678f77f76897ed7aa099ee19a5a638fe6c9cfd (diff) | |
| download | ATCD-5619737386d703ef76cc2e16e1e968e2e185a1e2.tar.gz | |
ChangeLogTag:Sun Oct 26 11:13:44 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog_ref | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp | 23 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h | 2 |
3 files changed, 28 insertions, 6 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index f3d6d629288..272534172da 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,12 @@ +Sun Oct 26 11:13:44 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp: Explicit + template instantiation for AbstractInterfaces. + + * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h: Added + missing declaration for this checkin "Sun Oct 26 10:29:12 2003 + Jeff Parsons <j.parsons@vanderbilt.edu>". + Sun Oct 26 11:04:45 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp b/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp index c26db6b0c9e..78bd127bab0 100644 --- a/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp @@ -98,9 +98,20 @@ be_visitor_tmplinst_cs::visit_interface (be_interface *node) if (!node->is_local ()) { *os << be_nl << be_nl - << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl - << "TAO::Narrow_Utils<" << this->linebreak_ << be_idt << be_idt_nl - << node->name () << this->linebreak_ << be_uidt_nl + << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl; + + if (!node->is_abstract ()) + { + *os << "TAO::Narrow_Utils<" << this->linebreak_ + << be_idt << be_idt_nl; + } + else + { + *os << "TAO::AbstractBase_Narrow_Utils<" << this->linebreak_ + << be_idt << be_idt_nl; + } + + *os << node->name () << this->linebreak_ << be_uidt_nl << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt; } @@ -170,7 +181,7 @@ be_visitor_tmplinst_cs::visit_valuetype (be_valuetype *node) << node->name () << " *," << this->linebreak_ << be_nl << node->name () << "_var," << this->linebreak_ << be_nl << node->name () << "_out," << this->linebreak_ << be_nl - << "TAO::Objref_Traits<" << node->name () << "> " + << "TAO::Objref_Traits<" << node->name () << "> " << this->linebreak_ << be_uidt_nl << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt; @@ -1129,8 +1140,8 @@ be_visitor_tmplinst_cs::gen_base_class_tmplinst (be_sequence *node) static char ifdef_suffix [NAMEBUFSIZE]; - ACE_OS::memset (ifdef_suffix, - '\0', + ACE_OS::memset (ifdef_suffix, + '\0', NAMEBUFSIZE); if (node->unbounded ()) diff --git a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h b/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h index 295e6bb032c..a706bebd49d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h @@ -48,6 +48,8 @@ public: virtual int visit_union (be_union *node); + virtual int visit_exception(be_exception*); + protected: virtual idl_bool this_mode_generated (be_decl *node) const; virtual void this_mode_generated (be_decl *node, |