*** empty log message ***

4 files changed, 31 insertions, 16 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
index 3624b80903f..204c057dc5b 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_interface, 
-           interface_si, 
+ACE_RCSID (be_visitor_interface,
+           interface_si,
            "$Id$")
 
 
@@ -39,8 +39,8 @@ be_visitor_interface_si::~be_visitor_interface_si (void)
 int
 be_visitor_interface_si::visit_interface (be_interface *node)
 {
-  if (node->srv_inline_gen () 
-      || node->imported () 
+  if (node->srv_inline_gen ()
+      || node->imported ()
       || node->is_local ()
       || node->is_abstract ())
     {
@@ -50,7 +50,7 @@ be_visitor_interface_si::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Determine if we are in some form of a multiple inheritance.
-  int status = 
+  int status =
     node->traverse_inheritance_graph (be_interface::in_mult_inheritance_helper,
                                       0);
 
@@ -65,14 +65,14 @@ be_visitor_interface_si::visit_interface (be_interface *node)
   // Generate skeletons for operations of our base classes. These skeletons
   // just cast the pointer to the appropriate type before invoking the
   // call. Hence we generate these in the inline file.
-  status = node->traverse_inheritance_graph (be_interface::gen_skel_helper, 
+  status = node->traverse_inheritance_graph (be_interface::gen_skel_helper,
                                              os);
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_si::"
                          "visit_interface - "
-                         "codegen for base class skeletons failed\n"), 
+                         "codegen for base class skeletons failed\n"),
                         -1);
     }
 
@@ -81,11 +81,11 @@ be_visitor_interface_si::visit_interface (be_interface *node)
       return -1;
     }
 
-  if (// be_global->gen_thru_poa_collocation () 
+  if (// be_global->gen_thru_poa_collocation ()
       // ||
       be_global->gen_direct_collocation ())
     {
-      status = 
+      status =
         node->traverse_inheritance_graph (
             be_interface::gen_colloc_op_defn_helper,
             os
@@ -134,4 +134,3 @@ be_visitor_interface_si::generate_amh_classes (be_interface *node)
 
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
index cbfdc64764a..6da8a7450dc 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
@@ -129,7 +129,7 @@ be_visitor_operation_upcall_command_ss::visit_operation (be_operation * node)
       if (be_global->gen_thru_poa_collocation ())
         {
           os << "get_ret_arg< ";
-          
+
           this->gen_arg_template_param_name (node,
                                              node->return_type (),
                                              &os);
@@ -255,7 +255,7 @@ be_visitor_operation_upcall_command_ss::gen_upcall (be_operation * node)
             }
 
           os << "_arg< ";
-          
+
           this->gen_arg_template_param_name (arg,
                                              arg->field_type (),
                                              &os);
@@ -273,12 +273,28 @@ be_visitor_operation_upcall_command_ss::gen_upcall (be_operation * node)
                                              arg->field_type (),
                                              &os);
 
-          os << ">::ret_val *> (this->args_[" << index << "])->arg ();"
+          os << ">::";
+
+          switch (arg->direction ())
+            {
+            case AST_Argument::dir_IN:
+              os << "in";
+              break;
+            case AST_Argument::dir_INOUT:
+              os << "inout";
+              break;
+            case AST_Argument::dir_OUT:
+              os << "out";
+            default:
+              break;
+            }
+
+          os << "_arg_val *> (this->args_[" << index << "])->arg ();"
              << be_nl;
         }
 
       os << be_uidt_nl;
-      
+
     }
 
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 7e3c6c57ac5..0a550e62f49 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -173,7 +173,7 @@ int be_visitor_root::visit_root (be_root *node)
                   << "skel_args[i])->arg ();" << be_uidt << be_uidt
                   << be_uidt << be_uidt_nl
                   << "}" << be_nl << be_nl;
-                
+
               // OUT argument selection function template
               *os << "template<typename T>" << be_nl
                   << "typename TAO::SArg_Traits<T>::out_arg_type" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 3feafa171ed..e580e10c285 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -106,7 +106,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << node->name () << " *" << be_nl << node->name ()
       << "::_downcast (CORBA::ValueBase *v)" << be_nl
       << "{" << be_idt_nl
-      << "return dynamic_cast< ::" << node->name () 
+      << "return dynamic_cast< ::" << node->name ()
       << " * > (v);" << be_uidt_nl
       << "}" << be_nl << be_nl;