diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-09 01:00:15 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-09 01:00:15 +0000 |
| commit | 04a89170595b10ef1c8b90bde69e204088d9af08 (patch) | |
| tree | ffe887f87fd2829153cd08c0ea459f3dafc28776 /TAO | |
| parent | 688305f1d3495450ed3336ee55107145b7ebca38 (diff) | |
| download | ATCD-04a89170595b10ef1c8b90bde69e204088d9af08.tar.gz | |
ChangeLogTag: Mon Dec 8 18:50:58 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 19 | ||||
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_decl.cpp | 1 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation.cpp | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 56344c19fe0..7d1a40764b3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,22 @@ +Mon Dec 8 18:50:58 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/ast/ast_decl.cpp: + + Cosmetic changes to source code. + + * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: + + In generating the operation string name passed to the + TAO::Invocation_Adapter constructor in stub code, changed + the call to get the operation node's local name from + local_name() to original_local_name(). This call returns a + string without the '_cxx_' prepended (if any) that would + occur if the operation name clashes with a C++ keyword. The + name string must be passed to the transport without the + prefix so it can be language independent, and for this + reason it will also be stored in the operation table on the + skeleton side in the same way (without the prefix). + Mon Dec 8 12:49:52 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * orbsvcs/examples/PSS/PSS.mpc: diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index d1459b4dda9..0d01c74024b 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -1285,7 +1285,6 @@ AST_Decl::compute_local_name (const char *prefix, // prefix to the all the reserved keywords. But when we invoke the // operation remotely, we should be sending only the name with out // "_cxx_" prefix. - void AST_Decl::original_local_name (Identifier *local_name) { diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 0e24fa07601..1e9a7ce39a5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -515,7 +515,8 @@ be_visitor_operation::gen_stub_operation_body ( } } - *os << node->local_name () << "\"," << be_nl + // original_local_name() strips off the leading '_cxx_' if any. + *os << node->original_local_name () << "\"," << be_nl << tmp_len << "," << be_nl << "this->the" << intf->base_proxy_broker_name () << "_"; |