diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-10 18:10:09 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-10 18:10:09 +0000 |
| commit | 5f75f44342bbf9029f527a8a175ac18c72549187 (patch) | |
| tree | 63e10fd82875df9c524ac7f5e17749d2b3f5ed2b | |
| parent | 727ec23be40d4735cb0c5daac708c687da6178a4 (diff) | |
| download | ATCD-5f75f44342bbf9029f527a8a175ac18c72549187.tar.gz | |
Sun Nov 10 18:02:51 UTC 2002 Don Hinton <dhinton@ieee.org>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp | 24 |
2 files changed, 25 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 03fb5b40c1a..04a15e1b54e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Sun Nov 10 18:02:51 UTC 2002 Don Hinton <dhinton@ieee.org> + + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: Fixed a problem + with previous patch, Wed Oct 16 17:16:38 2002 Jeff Parsons + <parsons@isis-server.isis.vanderbilt.edu>, where the logic was + reversed. Thanks to Jon Franklin for noticing the problem and + providing the patch. + Sun Nov 10 08:19:21 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tao/IIOP_Connector.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 04f0a170746..2dca378e520 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -157,16 +157,16 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "}" << be_nl; // The _tao_obv_narrow method - *os << "\n#if defined (_MSC_VER)" << be_nl + + *os << be_nl << "void *" << be_nl + << "#if defined (_MSC_VER)" << be_nl << node->name () << "::" << node->flat_name () << "_tao_obv_narrow (ptr_arith_t type_id)" << be_nl - << "{" << be_idt_nl - << "return this->_tao_obv_narrow (type_id);" << be_uidt_nl - << "}" - << "\n#endif /* _MSC_VER */" << be_uidt_nl << be_nl - << "void *" << be_nl << node->name () - << "::_tao_obv_narrow (ptr_arith_t type_id)" << be_nl + << "#else" << be_nl + << node->name () << "::" + << "_tao_obv_narrow (ptr_arith_t type_id)" << be_nl + << "#endif /* _MSC_VER */" << be_nl << "{" << be_idt_nl << "if (type_id == (ptr_arith_t) &_downcast)" << be_idt_nl << "{" << be_idt_nl @@ -228,6 +228,16 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << be_nl << "return rval;" << be_uidt_nl << "}" << be_nl << be_nl; + *os << "#if defined (_MSC_VER)" << be_nl + + << "void *" << be_nl << node->name () + << "::_tao_obv_narrow (ptr_arith_t type_id)" << be_nl + << "{" << be_idt_nl + << "return this->" << node->flat_name () + << "_tao_obv_narrow (type_id);" << be_uidt_nl + << "}" << be_nl + << "#endif /* _MSC_VER */" << be_uidt_nl << be_nl; + if (be_global->any_support ()) { *os << "void" << be_nl |