1 files changed, 14 insertions, 12 deletions

diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index a70b595df7a..befd5b779ae 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -36,7 +36,7 @@ namespace TAO
    * size IDL types.
    */
   template<typename S>
-  class In_Fixed_Size_SArgument_T : public Const_Argument_T<S const &>
+  class In_Fixed_Size_SArgument_T : public Argument
   {
   public:
 
@@ -57,7 +57,7 @@ namespace TAO
     //@}
 
     /// Retrieve underlying argument.
-    virtual S const & arg (void) const;
+    S const & arg (void) const;
 
   private:
 
@@ -75,7 +75,7 @@ namespace TAO
    *
    */
   template<typename S>
-  class Inout_Fixed_Size_SArgument_T : public Mutable_Argument_T<S &>
+  class Inout_Fixed_Size_SArgument_T : public Argument
   {
   public:
 
@@ -98,7 +98,7 @@ namespace TAO
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
-    virtual S & arg (void);
+    S & arg (void);
 
   private:
 
@@ -114,7 +114,7 @@ namespace TAO
    *
    */
   template<typename S>
-  class Out_Fixed_Size_SArgument_T : public Mutable_Argument_T<S &>
+  class Out_Fixed_Size_SArgument_T : public Argument
   {
   public:
 
@@ -136,7 +136,7 @@ namespace TAO
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
-    virtual S & arg (void);
+    S & arg (void);
 
   private:
 
@@ -153,7 +153,7 @@ namespace TAO
    *
    */
   template<typename S>
-  class Ret_Fixed_Size_SArgument_T : public Mutable_Argument_T<S &>
+  class Ret_Fixed_Size_SArgument_T : public Argument
   {
   public:
 
@@ -175,7 +175,7 @@ namespace TAO
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
-    virtual S & arg (void);
+    S & arg (void);
 
   private:
 
@@ -204,10 +204,12 @@ namespace TAO
     typedef Out_Fixed_Size_SArgument_T<T>     out_arg_val;
     typedef Ret_Fixed_Size_SArgument_T<T>     ret_val;
 
-    typedef Const_Argument_T<in_type>         in_arg_base;
-    typedef Mutable_Argument_T<inout_type>    inout_arg_base;
-    typedef Mutable_Argument_T<out_type>      out_arg_base;
-    typedef Mutable_Argument_T<ret_type>      ret_base;
+    // Typedefs corresponding to return value of arg() method in both
+    // the client and server side argument class templates.
+    typedef in_type                           in_arg_type;
+    typedef inout_type                        inout_arg_type;
+    typedef out_type                          out_arg_type;
+    typedef ret_type                          ret_arg_type;
 
   };