Cast IN args of type foo_array (if the array is multidimensional) to

const foo_array_slice * for the benefit of some compilers that can't
handle implicit cast to const for multidimensional arrays.

1 files changed, 9 insertions, 0 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
index 1e270712ea9..8b5550bd068 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
@@ -79,6 +79,15 @@ int be_visitor_args_upcall_ss::visit_array (be_array *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
+      // This is to placate some compilers which have
+      // trouble with IN args that are multidimensional arrays.
+      if (node->n_dims () > 1)
+        {
+          *os << "(const ::" << node->name () << "_slice *) ";
+        }
+
+      *os << arg->local_name ();
+      break;
     case AST_Argument::dir_INOUT:
       *os << arg->local_name ();
       break;