ChangeLogTag: Mon Jun 19 14:49:25 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

1 files changed, 22 insertions, 39 deletions

diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
index e03fb2c19f4..45559ead999 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -33,9 +33,7 @@ namespace TAO
    * @brief IN skeleton argument of fixed size element array.
    *
    */
-  template<typename S,
-           typename S_slice,
-           typename S_forany,
+  template<typename S_forany,
            typename Insert_Policy>
   class In_Fixed_Array_SArgument_T : public InArgument, private Insert_Policy
   {
@@ -46,10 +44,10 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice const * arg (void) const;
+    typename S_forany::_slice_type const * arg (void) const;
 
   private:
-    mutable S x_;
+    mutable typename S_forany::_array_type x_;
   };
 
   /**
@@ -59,9 +57,7 @@ namespace TAO
    *
    * @todo The mutable for x_ can be removed when vc6 has been dropped
    */
-  template<typename S,
-           typename S_slice,
-           typename S_forany,
+  template<typename S_forany,
            typename Insert_Policy>
   class Inout_Fixed_Array_SArgument_T :
     public InoutArgument,
@@ -75,10 +71,10 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice * arg (void);
+    typename S_forany::_slice_type * arg (void);
 
   private:
-    mutable S x_;
+    mutable typename S_forany::_array_type x_;
   };
 
   /**
@@ -88,9 +84,7 @@ namespace TAO
    *
    * @todo The mutable for x_ can be removed when vc6 has been dropped
    */
-  template<typename S,
-           typename S_slice,
-           typename S_forany,
+  template<typename S_forany,
            typename Insert_Policy>
   class Out_Fixed_Array_SArgument_T : public OutArgument, private Insert_Policy
   {
@@ -101,10 +95,10 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice * arg (void);
+    typename S_forany::_slice_type * arg (void);
 
   private:
-    mutable S x_;
+    mutable typename S_forany::_array_type x_;
   };
 
   /**
@@ -113,8 +107,7 @@ namespace TAO
    * @brief Skeleton value of fixed size element array.
    *
    */
-  template<typename S_slice,
-           typename S_var,
+  template<typename S_var,
            typename S_forany,
            typename Insert_Policy>
   class Ret_Fixed_Array_SArgument_T : public RetArgument, private Insert_Policy
@@ -126,7 +119,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice *& arg (void);
+    typename S_forany::_slice_type *& arg (void);
 
   private:
     S_var x_;
@@ -138,42 +131,32 @@ namespace TAO
    * @brief Argument traits of fixed size element array.
    *
    */
-  template<typename T,
-           typename T_slice,
-           typename T_var,
+  template<typename T_var,
            typename T_forany,
            typename Insert_Policy>
   struct Fixed_Array_SArg_Traits_T
   {
-    typedef T_slice *                                    ret_type;
-    typedef const T                                      in_type;
-    typedef T                                            inout_type;
-    typedef T                                            out_type;
-
-    typedef In_Fixed_Array_SArgument_T<T,
-                                       T_slice,
-                                       T_forany,
+    typedef typename T_forany::_slice_type *             ret_type;
+    typedef const typename T_forany::_array_type         in_type;
+    typedef typename T_forany::_array_type               inout_type;
+    typedef typename T_forany::_array_type               out_type;
+
+    typedef In_Fixed_Array_SArgument_T<T_forany,
                                        Insert_Policy>    in_arg_val;
-    typedef Inout_Fixed_Array_SArgument_T<T,
-                                          T_slice,
-                                          T_forany,
+    typedef Inout_Fixed_Array_SArgument_T<T_forany,
                                           Insert_Policy> inout_arg_val;
-    typedef Out_Fixed_Array_SArgument_T<T,
-                                        T_slice,
-                                        T_forany,
+    typedef Out_Fixed_Array_SArgument_T<T_forany,
                                         Insert_Policy>   out_arg_val;
-    typedef Ret_Fixed_Array_SArgument_T<T_slice,
-                                        T_var,
+    typedef Ret_Fixed_Array_SArgument_T<T_var,
                                         T_forany,
                                         Insert_Policy>   ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
-    typedef T_slice const *                              in_arg_type;
+    typedef typename T_forany::_slice_type const *       in_arg_type;
     typedef ret_type                                     inout_arg_type;
     typedef ret_type                                     out_arg_type;
     typedef ret_type &                                   ret_arg_type;
-
   };
 }