diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-22 15:33:07 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-22 15:33:07 +0000 |
| commit | 751a7945ffb299daf4c49ed0160dd14dda8ffb43 (patch) | |
| tree | 7d48d8c39fd19ce4655c4a3753b9d790b9e2097e | |
| parent | 192be0ddf36c8b1e29dcaacdfb2df3ecc7d43574 (diff) | |
| download | ATCD-751a7945ffb299daf4c49ed0160dd14dda8ffb43.tar.gz | |
ChangeLogTag: Mon Nov 22 09:29:54 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp | 4 |
3 files changed, 21 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 35abf741eb3..c5b2cba2886 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Mon Nov 22 09:29:54 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_interface.cpp (copy_ctor_helper): + + When generating the call to the Messaging::ReplyHandler + base class constructor for AMI reply handler classes, + added the ACE_NESTED_CLASS macro wrapper to work around + a VC6 compiler bug. Thanks to Johnny Willemsen + <jwillemsen@rememdy.nl> for reporting the problem. + + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: + + Fixed indentation in code generation. + Mon Nov 22 09:05:41 2004 Dale Wilson <wilson_d@ociweb.com> * orbsvcs/orbsvcs/Notify/Event.cpp: diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index fc108bc1d7c..ceddfdb322f 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -2424,7 +2424,11 @@ be_interface::copy_ctor_helper (be_interface *derived, idl_bool is_rh_base = (ACE_OS::strcmp (base->flat_name (), "Messaging_ReplyHandler") == 0); - if (base->is_nested () && !is_rh_base) + if (is_rh_base) + { + *os << "ACE_NESTED_CLASS (POA_Messsaging, ReplyHandler) (rhs)"; + } + else if (base->is_nested ()) { be_decl *scope; scope = be_scope::narrow_from_scope (base->defined_in ())->decl (); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 0205df86918..070e579765b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -573,8 +573,8 @@ be_visitor_operation_ss::gen_pre_skel_info (be_operation *node) this->has_param_type (node, AST_Argument::dir_INOUT)) { // Instantiate a TAO_InputCDR variable. - os->indent (); - *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();\n"; + *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();" + << be_nl; } return 0; |