summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp6
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp2
3 files changed, 12 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 47d07e8b0f4..2d2ea84e243 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Feb 24 23:29:14 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
+
+ * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+ * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+
+ Fixed unused "servant_upcall" argument warning in the case where
+ interceptor support is disabled.
+
Thu Feb 24 23:13:36 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
* tao/SystemException.h (SystemException):
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 2dc74e7175c..1831a484c08 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -173,7 +173,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
*os << "void " << full_skel_name
<< "::_is_a_skel (" << be_idt << be_idt_nl
<< "TAO_ServerRequest & server_request, " << be_nl
- << "void * servant_upcall," << be_nl
+ << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
<< "void * servant" << be_nl
<< "ACE_ENV_ARG_DECL" << be_uidt_nl
<< ")" << be_uidt_nl;
@@ -286,7 +286,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
*os << "void " << full_skel_name
<< "::_non_existent_skel (" << be_idt << be_idt_nl
<< "TAO_ServerRequest & server_request, " << be_nl
- << "void * servant_upcall," << be_nl
+ << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
<< "void * servant" << be_nl
<< "ACE_ENV_ARG_DECL" << be_uidt_nl
<< ")" << be_uidt_nl;
@@ -467,7 +467,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
*os << "void " << full_skel_name
<< "::_component_skel (" << be_idt << be_idt_nl
<< "TAO_ServerRequest & server_request, " << be_nl
- << "void * servant_upcall," << be_nl
+ << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
<< "void * servant" << be_nl
<< "ACE_ENV_ARG_DECL" << be_uidt_nl
<< ")" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index 5c9a2bbc8df..401bf92a2b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -183,7 +183,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
*os << node->local_name ()
<< "_skel (" << be_idt << be_idt_nl
<< "TAO_ServerRequest & server_request," << be_nl
- << "void * servant_upcall," << be_nl
+ << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
<< "void * servant" << be_nl
<< "ACE_ENV_ARG_DECL" << be_uidt_nl
<< ")" << be_uidt_nl;