ChangeLogTag: Mon Aug 11 11:31:48 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 47 insertions, 9 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index d854f892174..54805ba6a13 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,16 @@
+Mon Aug 11 11:31:48 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:
+
+          Fixed generated comment.
+
+        * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
+        * TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:
+        * TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h:
+
+          Added generation of throw spec to thruPOA collocation proxy
+          operations.
+
 Mon Aug 11 10:54:13 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TOA_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
index 1aaa2005115..dd6f39af38f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
@@ -30,7 +30,7 @@ be_visitor_interface_thru_poa_proxy_impl_sh::visit_interface (
   *os << be_nl
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl
-      << "//                    ThruPOA  Impl. Declaration" << be_nl
+      << "//                    ThruPOA Proxy Impl. Declaration" << be_nl
       << "//" << be_nl << be_nl;
 
   *os << "// TAO_IDL - Generated from" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
index b87b6c19ae0..576fa5741a2 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -7,7 +7,7 @@ ACE_RCSID (be_visitor_operation,
 be_visitor_operation_proxy_impl_xh::be_visitor_operation_proxy_impl_xh (
     be_visitor_context *ctx
   )
-  : be_visitor_scope (ctx)
+  : be_visitor_operation (ctx)
 {
 }
 
@@ -45,7 +45,21 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node)
       << "TAO::Argument ** args," << be_nl
       << "int num_args" << be_nl
       << "ACE_ENV_ARG_DECL" << be_uidt_nl
-      << ");" << be_uidt_nl;
+      << ")";
+
+  if (this->gen_throw_spec (node) != 0)
+    {
+      ACE_ERROR_RETURN ((
+          LM_ERROR,
+          "(%N:%l) be_visitor_operation_proxy_impl_xh::"
+          "visit_operation - "
+          "throw spec generation failed\n"
+        ),
+        -1
+      );
+    }
+
+  *os << ";";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
index e88f524a2be..7c65a5a2529 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
@@ -81,10 +81,22 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (
   *os << "," << be_nl
       << "int " << be_nl
       << "ACE_ENV_ARG_DECL" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
+      << ")";
 
-  *os << be_nl
+  if (this->gen_throw_spec (node) != 0)
+    {
+      ACE_ERROR_RETURN ((
+          LM_ERROR,
+          "(%N:%l) be_visitor_operation_thru_poa_collocated_ss::"
+          "visit_operation - "
+          "throw spec generation failed\n"
+        ),
+        -1
+      );
+    }
+
+  *os << be_uidt_nl
+      << "{" << be_idt_nl
       << "TAO_Object_Adapter::Servant_Upcall servant_upcall ("
       << be_idt << be_idt_nl
       << "obj->_stubobj ()"
@@ -181,8 +193,7 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (
     }
 
   *os << be_uidt << be_uidt_nl
-      << "ACE_CHECK;" << be_nl
-      << "ACE_UNUSED_ARG (args); " << be_uidt_nl
+      << "ACE_CHECK;" << be_uidt_nl
       << "}";
 
   return 0;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h
index 3bd938dd891..7c2716e32c3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h
@@ -20,7 +20,7 @@
 #define _BE_VISITOR_OPERATION_PROXY_IMPL_XH_H_
 
 
-class be_visitor_operation_proxy_impl_xh : public be_visitor_scope
+class be_visitor_operation_proxy_impl_xh : public be_visitor_operation
 {
   //
   // = TITLE