summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkirthika <kirthika@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-08-19 18:47:15 +0000
committerkirthika <kirthika@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-08-19 18:47:15 +0000
commitde50dfe0f4574e0d85f29a49d8cb4a68390f8e75 (patch)
tree5d763d36c459edcd9bb478e0b783c1ac13d88999
parentae156b43cc8e158a6134c733778f32030dd465cf (diff)
downloadATCD-de50dfe0f4574e0d85f29a49d8cb4a68390f8e75.tar.gz
NAme clashing resolved in stubs by changing member names
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
index 13ac1a465f0..8b49a506235 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
@@ -121,9 +121,9 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
*os <<"_set";
}
- *os<< " (const char * operation," << be_nl
- << "IOP::ServiceContextList &service_context_list," << be_nl
- << "CORBA::Object * target";
+ *os<< " (const char *_tao_operation," << be_nl
+ << "IOP::ServiceContextList &_tao_service_context_list," << be_nl
+ << "CORBA::Object *_tao_target";
// generate the argument list with the appropriate mapping. For these
// we grab a visitor that generates the parameter listing
@@ -147,7 +147,7 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
// Generate the member list and set each member but before that,
// its necessary to pass on some args to the base class.
os->indent ();
- *os << " : TAO_ClientRequest_Info (operation, service_context_list, target)";
+ *os << " : TAO_ClientRequest_Info (_tao_operation, _tao_service_context_list, _tao_target)";
ctx = *this->ctx_;
ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARG_INFO_CS);