diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-02 18:26:27 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-02 18:26:27 +0000 |
| commit | 2cdbdc336fbc361672efc4e9f26f68f9a04f24dc (patch) | |
| tree | 28356ad03ed24a6a0ed3096ed026345b6fde62bb | |
| parent | 1dcefbf87953d68f278c0fcddbc52a4137c7c13a (diff) | |
| download | ATCD-2cdbdc336fbc361672efc4e9f26f68f9a04f24dc.tar.gz | |
ChangeLogTag: Tue Jul 2 13:24:33 2002 Jeff Parsons <parsons@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp | 5 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp | 7 |
3 files changed, 19 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index d883a6da123..1657aade269 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Tue Jul 2 13:24:33 2002 Jeff Parsons <parsons@cs.wustl.edu> + + * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + + Put back code to generated a default constructor for + local interfaces - it was removed by mistake. + Tue Jul 2 12:39:21 2002 Balachandran Natarajan <bala@cs.wustl.edu> * tests/Big_Oneways/Session.cpp (start): Fixed a problem in the diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 6fd96afd2a4..d00bc773b7f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -327,11 +327,14 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << "_setup_collocation (int collocated);" << be_nl << be_nl; } - if (node->is_abstract ()) + if (node->is_abstract () || node->is_local ()) { // Protected default constructor for abstract interfaces. *os << node->local_name () << " (void);" << be_nl; + } + if (node->is_abstract ()) + { // Protected copy constructor for abstract interfaces. *os << node->local_name () << " (const " << node->local_name () << " &);" << be_nl; 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 0fe5796736e..a7c10d4e2a1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -225,6 +225,13 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << "// TAO_IDL - Generated from " << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; + if (node->is_local ()) + { + *os << node->name () << "::" << node->local_name () + << " (void)" << be_nl + << "{}" << be_nl << be_nl; + } + if (! node->is_abstract () && ! node->is_local ()) { // Generate the destructor and default constructor. |