diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-20 21:56:42 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-20 21:56:42 +0000 |
| commit | 3093f63dd3203f54ab9327ab9861063fc6dab87f (patch) | |
| tree | d0c7f6735138702a68605426255f9069e6c3ebdc | |
| parent | d394d0302b53bc0a9f3abc7aaa64c35810abec30 (diff) | |
| download | ATCD-3093f63dd3203f54ab9327ab9861063fc6dab87f.tar.gz | |
ChangeLogTag: Wed Nov 20 15:54:10 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fd56ad8ec11..b935a283803 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Nov 20 15:54:10 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + + * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: + + Changed an internal variable name in generated code for the + _downcast() method that was short and ran a high risk of name + clash with the exception typename. + Wed Nov 20 15:23:13 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tao/Connection_Handler.cpp (close_connection_eh): Do not do diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index 2f68fc0afd4..7a03815c3ba 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -149,13 +149,13 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) } *os << node->name () << " *" << be_nl; - *os << node->name () << "::_downcast (CORBA::Exception *exc)" << be_nl; + *os << node->name () << "::_downcast (CORBA::Exception *_tao_excp)" << be_nl; *os << "{" << be_idt_nl; *os << "if (!ACE_OS::strcmp (\"" << node->repoID () - << "\", exc->_rep_id ()))" << be_idt_nl; + << "\", _tao_excp->_rep_id ()))" << be_idt_nl; *os << "{" << be_idt_nl; *os << "return ACE_dynamic_cast (" << node->local_name () - << " *, exc);" << be_uidt_nl; + << " *, _tao_excp);" << be_uidt_nl; *os << "}" << be_uidt_nl; *os << "else" << be_idt_nl; *os << "{" << be_idt_nl; |