Fri Apr 23 08:22:36 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
          Layout changes

        * TAO_IDL/be/be_visitor_arg_traits.cpp:
        * tao/AnyTypeCode/Any_Arg_Traits.h:
        * tao/AnyTypeCode/TypeCode.h:
        * tao/BD_String_Argument_T.h:
        * tao/BD_String_Argument_T.inl:
        * tao/BD_String_Argument_T.cpp:
        * tao/Basic_Argument_T.h:
        * tao/Basic_Argument_T.inl:
        * tao/Basic_Argument_T.cpp:
        * tao/Basic_Arguments.h:
        * tao/Fixed_Array_Argument_T.h:
        * tao/Fixed_Array_Argument_T.inl:
        * tao/Fixed_Array_Argument_T.cpp:
        * tao/Fixed_Size_Argument_T.h:
        * tao/Fixed_Size_Argument_T.inl:
        * tao/Fixed_Size_Argument_T.cpp:
        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
        * tao/Object.h:
        * tao/Object_Argument_T.h:
        * tao/Object_Argument_T.inl:
        * tao/Object_Argument_T.cpp:
        * tao/PolicyC.cpp:
        * tao/PortableServer/Any_SArg_Traits.h:
        * tao/PortableServer/BD_String_SArgument_T.h:
        * tao/PortableServer/BD_String_SArgument_T.inl:
        * tao/PortableServer/BD_String_SArgument_T.cpp:
        * tao/PortableServer/Basic_SArgument_T.h:
        * tao/PortableServer/Basic_SArgument_T.inl:
        * tao/PortableServer/Basic_SArgument_T.cpp:
        * tao/PortableServer/Basic_SArguments.h:
        * tao/PortableServer/Fixed_Array_SArgument_T.h:
        * tao/PortableServer/Fixed_Array_SArgument_T.inl:
        * tao/PortableServer/Fixed_Array_SArgument_T.cpp:
        * tao/PortableServer/Fixed_Size_SArgument_T.h:
        * tao/PortableServer/Fixed_Size_SArgument_T.inl:
        * tao/PortableServer/Fixed_Size_SArgument_T.cpp:
        * tao/PortableServer/Object_SArg_Traits.h:
        * tao/PortableServer/Object_SArgument_T.h:
        * tao/PortableServer/Object_SArgument_T.inl:
        * tao/PortableServer/Object_SArgument_T.cpp:
        * tao/PortableServer/PolicyS.cpp:
        * tao/PortableServer/Special_Basic_SArgument_T.h:
        * tao/PortableServer/Special_Basic_SArgument_T.inl:
        * tao/PortableServer/Special_Basic_SArgument_T.cpp:
        * tao/PortableServer/Special_Basic_SArguments.h:
        * tao/PortableServer/TypeCode_SArg_Traits.h:
        * tao/PortableServer/Var_Array_SArgument_T.h:
        * tao/PortableServer/Var_Array_SArgument_T.inl:
        * tao/PortableServer/Var_Array_SArgument_T.cpp:
        * tao/PortableServer/Var_Size_SArgument_T.h:
        * tao/PortableServer/Var_Size_SArgument_T.inl:
        * tao/PortableServer/Var_Size_SArgument_T.cpp:
        * tao/Special_Basic_Argument_T.h:
        * tao/Special_Basic_Argument_T.inl:
        * tao/Special_Basic_Argument_T.cpp:
        * tao/Special_Basic_Arguments.h:
        * tao/UB_String_Argument_T.h:
        * tao/UB_String_Argument_T.inl:
        * tao/UB_String_Argument_T.cpp:
        * tao/UB_String_Arguments.h:
        * tao/Valuetype/AbstractBase.h:
        * tao/Valuetype/ValueBase.h:
        * tao/Var_Array_Argument_T.h:
        * tao/Var_Array_Argument_T.inl:
        * tao/Var_Array_Argument_T.cpp:
        * tao/Var_Size_Argument_T.h:
        * tao/Var_Size_Argument_T.inl:
        * tao/Var_Size_Argument_T.cpp:
          Introduce template template arguments, this simplifies the
          code generation and resolves bugzilla 2567

1 files changed, 11 insertions, 11 deletions

diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
index 95cf90c6864..67be4cb6650 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::
 In_Var_Array_Argument_T (const typename S_forany::_slice_type * x)
@@ -14,7 +14,7 @@ In_Var_Array_Argument_T (const typename S_forany::_slice_type * x)
 }
 
 template<typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type const *
 TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::arg (void) const
@@ -23,7 +23,7 @@ TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::arg (void) const
 }
 
 template<typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::
 In_Var_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x)
@@ -34,7 +34,7 @@ In_Var_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x)
 // ==========================================================================
 
 template<typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::
 Inout_Var_Array_Argument_T (typename S_forany::_slice_type  *&x)
@@ -43,7 +43,7 @@ Inout_Var_Array_Argument_T (typename S_forany::_slice_type  *&x)
 }
 
 template<typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *
 TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::arg (void)
@@ -55,7 +55,7 @@ TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::arg (void)
 
 template<typename S_out,
          typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::
 Out_Var_Array_Argument_T (S_out x)
@@ -65,7 +65,7 @@ Out_Var_Array_Argument_T (S_out x)
 
 template<typename S_out,
          typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *&
 TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::arg (void)
@@ -77,7 +77,7 @@ TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::arg (void)
 
 template<typename S_var,
          typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::
 Ret_Var_Array_Argument_T (void)
@@ -85,7 +85,7 @@ Ret_Var_Array_Argument_T (void)
 
 template<typename S_var,
          typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *&
 TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg (void)
@@ -95,7 +95,7 @@ TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg (void)
 
 template<typename S_var,
          typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *
 TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp (void)
@@ -105,7 +105,7 @@ TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp (void)
 
 template<typename S_var,
          typename S_forany,
-         class Insert_Policy>
+         template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *
 TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn (void)