summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkirthika <kirthika@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-08-19 18:49:38 +0000
committerkirthika <kirthika@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-08-19 18:49:38 +0000
commita2684fc35caad25df624c4d1f2c7bdc0aab1d44a (patch)
tree200b40d492011c93bb534d742ce6e47c96e30198
parentd4300052fc62df8684162eeb2af6182c8030b87c (diff)
downloadATCD-a2684fc35caad25df624c4d1f2c7bdc0aab1d44a.tar.gz
name clashing resolved of RequestInfo constructors
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
index a3121b4fd75..fc323318374 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
@@ -121,8 +121,8 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
*os <<"_set";
}
- *os << " (const char * operation," << be_nl
- << "IOP::ServiceContextList &service_context_list";
+ *os << " (const char *_tao_operation," << be_nl
+ << "IOP::ServiceContextList &_tao_service_context_list";
// generate the argument list with the appropriate mapping. For these
// we grab a visitor that generates the parameter listing
@@ -146,7 +146,7 @@ be_visitor_operation_interceptors_ss::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_ServerRequest_Info (operation, service_context_list)";
+ *os << " : TAO_ServerRequest_Info (_tao_operation, _tao_service_context_list)";
ctx = *this->ctx_;
ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARG_INFO_SS);