ChangeLogTag Fri Aug 19 07:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 30 insertions, 25 deletions

diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index c71bf4047ba..e4bc7c3aa3b 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -29,15 +29,16 @@ namespace TAO
    * @brief Template class for IN stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class In_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class In_Fixed_Size_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Fixed_Size_Argument_T (S const & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -51,16 +52,17 @@ namespace TAO
    * @brief Template class for INOUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Inout_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Inout_Fixed_Size_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Fixed_Size_Argument_T (S & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -74,15 +76,16 @@ namespace TAO
    * @brief Template class for OUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Out_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Out_Fixed_Size_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Fixed_Size_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -97,15 +100,16 @@ namespace TAO
    * @brief Template class for return stub value of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Ret_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Ret_Fixed_Size_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Fixed_Size_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -125,25 +129,26 @@ namespace TAO
   struct TAO_Export Fixed_Size_Tag {};
 
   /**
-   * @struct Basic_Arg_Traits_T
+   * @struct Fixed_Size_Arg_Traits_T
    *
    * @brief Template class for argument traits of fixed size IDL types.
    *
    */
-  template<typename T>
+  template<typename T,
+           typename Insert_Policy>
   struct Fixed_Size_Arg_Traits_T
   {
-    typedef T                                 ret_type;
-    typedef T const &                         in_type;
-    typedef T &                               inout_type;
-    typedef T &                               out_type;
+    typedef T                                            ret_type;
+    typedef T const &                                    in_type;
+    typedef T &                                          inout_type;
+    typedef T &                                          out_type;
 
-    typedef In_Fixed_Size_Argument_T<T>       in_arg_val;
-    typedef Inout_Fixed_Size_Argument_T<T>    inout_arg_val;
-    typedef Out_Fixed_Size_Argument_T<T>      out_arg_val;
-    typedef Ret_Fixed_Size_Argument_T<T>      ret_val;
+    typedef In_Fixed_Size_Argument_T<T,Insert_Policy>    in_arg_val;
+    typedef Inout_Fixed_Size_Argument_T<T,Insert_Policy> inout_arg_val;
+    typedef Out_Fixed_Size_Argument_T<T,Insert_Policy>   out_arg_val;
+    typedef Ret_Fixed_Size_Argument_T<T,Insert_Policy>   ret_val;
 
-    typedef Fixed_Size_Tag                    idl_tag;
+    typedef Fixed_Size_Tag                               idl_tag;
   };
 }