From de50dfe0f4574e0d85f29a49d8cb4a68390f8e75 Mon Sep 17 00:00:00 2001 From: kirthika Date: Sat, 19 Aug 2000 18:47:15 +0000 Subject: NAme clashing resolved in stubs by changing member names --- TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp | 8 ++++---- 1 file 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); -- cgit v1.2.1