diff options
70 files changed, 640 insertions, 574 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2c9faaed5a0..6aa9033d341 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,7 +1,83 @@ +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 + Thu Apr 22 13:00:01 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * bin/tao_orb_tests.lst: - + Added Bug_3845_Regression test to the list. Thu Apr 22 12:13:52 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index f22ed7b5e6f..e075fa9027b 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -159,8 +159,8 @@ be_visitor_arg_traits::visit_interface (be_interface *node) << "TAO::Objref_Traits<" << node->name () << ">"; } - *os << "," << be_nl << this->insert_policy() << " <" - << node->name () << "_ptr>" << be_uidt_nl + *os << "," << be_nl << this->insert_policy() + << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -249,8 +249,8 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node) << "TAO::Value_Traits<" << node->name () << ">"; } - os << "," << be_nl << this->insert_policy() << " <" - << node->name () << "*>" << be_uidt_nl + os << "," << be_nl << this->insert_policy() + << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -303,8 +303,8 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node) << "TAO::Value_Traits<" << node->name () << ">"; } - os << "," << be_nl << this->insert_policy() << " <" - << node->name () << "*>" << be_uidt_nl + os << "," << be_nl << this->insert_policy() + << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -419,10 +419,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() << " <" << be_idt_nl - << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl - << ">" - << be_uidt_nl + << this->insert_policy() << ">" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -503,10 +500,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() << " <" << be_idt_nl - << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl - << ">" - << be_uidt_nl + << this->insert_policy() << ">" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -587,9 +581,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() << " <" << be_idt_nl - << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl - << ">" + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt_nl @@ -629,7 +621,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node) << ": public" << be_idt << be_idt_nl << "Var_Size_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl << alias->name () << "," << be_nl - << this->insert_policy() << " <" << alias->name () << ">" << be_uidt_nl + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -750,9 +742,7 @@ be_visitor_arg_traits::visit_string (be_string *node) << be_idt << be_idt_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() << " <" << be_idt << be_idt_nl - << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl - << ">" + << this->insert_policy() << be_uidt << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl @@ -796,7 +786,7 @@ be_visitor_arg_traits::visit_array (be_array *node) *os << node->name () << "_forany"; - *os << "," << be_nl << this->insert_policy() << " <" << node->name () << "_forany" << ">"; + *os << "," << be_nl << this->insert_policy(); *os << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl @@ -838,7 +828,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node) *os << "Basic_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl << node->name () << "," << be_nl - << this->insert_policy() << " <" << node->name () << ">" << be_uidt_nl + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -881,7 +871,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node) *os << (node->size_type () == AST_Type::FIXED ? "Fixed" : "Var") << "_Size_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl; - *os << node->name () << "," << be_nl << this->insert_policy() << " <" << node->name () << ">" << be_uidt_nl + *os << node->name () << "," << be_nl << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -988,8 +978,7 @@ be_visitor_arg_traits::visit_union (be_union *node) *os << (node->size_type () == AST_Type::FIXED ? "Fixed" : "Var") << "_Size_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl << this->insert_policy() << " <" - << node->name () << ">"; + << node->name () << "," << be_nl << this->insert_policy(); *os << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index 8271306bb9a..178e620be64 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -68,8 +68,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) *os << be_nl << be_nl << node->name () << "::" << node->local_name () << " (" << be_idt << be_idt_nl - << "::CORBA::ULong max" << be_uidt_nl - << ")" << be_nl + << "::CORBA::ULong max)" << be_uidt_nl << ": " << be_idt; // Pass it to the base constructor. @@ -114,8 +113,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) } *os << " * buffer," << be_nl - << "::CORBA::Boolean release" << be_uidt_nl - << ")" << be_uidt_nl + << "::CORBA::Boolean release)" << be_uidt << be_uidt_nl << " : " << be_idt << be_idt; // Pass it to the base constructor. @@ -143,8 +141,8 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) << node->name () << "::" << node->local_name () << " (" << be_idt << be_idt_nl << "const " << node->local_name () - << " &seq" << be_uidt_nl - << ")" << be_uidt_nl + << " &seq)" << be_uidt + << be_uidt_nl << " : " << be_idt << be_idt; // Pass it to the base constructor. @@ -172,8 +170,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) *os << be_nl << be_nl << "void " << node->name () << "::_tao_any_destructor (" << be_idt << be_idt_nl - << "void * _tao_void_pointer" << be_uidt_nl - << ")" << be_uidt_nl + << "void * _tao_void_pointer)" << be_uidt << be_uidt_nl << "{" << be_idt_nl << node->local_name () << " * _tao_tmp_pointer =" << be_idt_nl << "static_cast<" << node->local_name () diff --git a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h index 56bdc4ace51..7110836d9af 100644 --- a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h +++ b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h @@ -39,7 +39,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::Any, - TAO::Any_Insert_Policy_Stream <CORBA::Any> + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index 9815dac32c7..d3a980c286c 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -551,7 +551,7 @@ namespace TAO CORBA::TypeCode_var, CORBA::TypeCode_out, TAO::Objref_Traits<CORBA::TypeCode>, - TAO::Any_Insert_Policy_Stream <CORBA::TypeCode_ptr> > + TAO::Any_Insert_Policy_Stream> { }; diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp index 33d14562b69..318df96b4fc 100644 --- a/TAO/tao/BD_String_Argument_T.cpp +++ b/TAO/tao/BD_String_Argument_T.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -30,13 +30,13 @@ TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::marshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { typedef typename S_var::s_traits::from_type from_type; - Insert_Policy::any_insert ( + Insert_Policy<from_type>::any_insert ( any, from_type (this->x_, BOUND) ); @@ -46,7 +46,7 @@ TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::~In_BD_String_Clonable_Argument_T (void) { if (this->is_clone_) @@ -59,7 +59,7 @@ TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::~In_BD_String_ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::Argument* TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::clone (void) { @@ -76,7 +76,7 @@ TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::clone (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -91,7 +91,7 @@ TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::marshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -112,13 +112,13 @@ TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::demarshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { typedef typename S_var::s_traits::from_type from_type; - Insert_Policy::any_insert ( + Insert_Policy<from_type>::any_insert ( any, from_type (this->x_, BOUND) ); @@ -130,7 +130,7 @@ TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -148,13 +148,13 @@ TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::demarshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { typedef typename S_var::s_traits::from_type from_type; - Insert_Policy::any_insert ( + Insert_Policy<from_type>::any_insert ( any, from_type (this->x_, BOUND) ); @@ -166,7 +166,7 @@ TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -184,13 +184,13 @@ TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::demarshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { typedef typename S_var::s_traits::from_type from_type; - Insert_Policy::any_insert ( + Insert_Policy<from_type>::any_insert ( any, from_type (this->x_.in (), BOUND) ); diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h index 88a178c849b..3625eec37fe 100644 --- a/TAO/tao/BD_String_Argument_T.h +++ b/TAO/tao/BD_String_Argument_T.h @@ -37,7 +37,7 @@ namespace TAO */ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> class In_BD_String_Argument_T : public InArgument { public: @@ -63,7 +63,7 @@ namespace TAO */ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> class In_BD_String_Clonable_Argument_T : public In_BD_String_Argument_T<S_var, BOUND, Insert_Policy> { @@ -84,7 +84,7 @@ namespace TAO */ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_BD_String_Argument_T : public InoutArgument { public: @@ -109,7 +109,7 @@ namespace TAO */ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_BD_String_Argument_T : public OutArgument { public: @@ -133,7 +133,7 @@ namespace TAO */ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_BD_String_Argument_T : public RetArgument { public: @@ -160,7 +160,7 @@ namespace TAO */ template<typename T_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> struct BD_String_Arg_Traits_T { typedef typename T_var::s_traits::char_type * ret_type; diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl index 1ff185978e7..23c9d525798 100644 --- a/TAO/tao/BD_String_Argument_T.inl +++ b/TAO/tao/BD_String_Argument_T.inl @@ -6,17 +6,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::In_BD_String_Argument_T ( - const typename S_var::s_traits::char_type * x - ) + const typename S_var::s_traits::char_type * x) : x_ (x) -{} +{ +} template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE const typename S_var::s_traits::char_type * TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) const @@ -26,7 +26,7 @@ TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) const template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::In_BD_String_Clonable_Argument_T ( const typename S_var::s_traits::char_type * x @@ -39,7 +39,7 @@ TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::In_BD_String_C template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>:: Inout_BD_String_Argument_T (typename S_var::s_traits::char_type *& x) @@ -48,7 +48,7 @@ Inout_BD_String_Argument_T (typename S_var::s_traits::char_type *& x) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) @@ -60,7 +60,7 @@ TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>:: Out_BD_String_Argument_T (typename S_var::s_traits::string_out x) @@ -69,7 +69,7 @@ Out_BD_String_Argument_T (typename S_var::s_traits::string_out x) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) @@ -81,7 +81,7 @@ TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>:: Ret_BD_String_Argument_T (void) @@ -90,7 +90,7 @@ Ret_BD_String_Argument_T (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::excp (void) @@ -100,7 +100,7 @@ TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::excp (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::retn (void) @@ -110,7 +110,7 @@ TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::retn (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp index 6f90509d238..627d970c4a3 100644 --- a/TAO/tao/Basic_Argument_T.cpp +++ b/TAO/tao/Basic_Argument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Basic_Argument_T<S, Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -22,17 +22,17 @@ TAO::In_Basic_Argument_T<S, Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::In_Basic_Clonable_Argument_T<S,Insert_Policy>::~In_Basic_Clonable_Argument_T () { if (this->is_clone_) @@ -43,7 +43,7 @@ TAO::In_Basic_Clonable_Argument_T<S,Insert_Policy>::~In_Basic_Clonable_Argument_ } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::Argument* TAO::In_Basic_Clonable_Argument_T<S,Insert_Policy>::clone () { @@ -57,7 +57,7 @@ TAO::In_Basic_Clonable_Argument_T<S,Insert_Policy>::clone () // =========================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Basic_Argument_T<S, Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -65,7 +65,7 @@ TAO::Inout_Basic_Argument_T<S, Insert_Policy>::marshal (TAO_OutputCDR &cdr) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -75,11 +75,11 @@ TAO::Inout_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -87,7 +87,7 @@ TAO::Inout_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *an // ============================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -97,11 +97,11 @@ TAO::Out_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -109,7 +109,7 @@ TAO::Out_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) // ============================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -119,11 +119,11 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 988549c5710..19b49db7713 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -32,7 +32,7 @@ namespace TAO * @brief Template class for IN stub argument of basic IDL types. */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Basic_Argument_T : public InArgument { public: @@ -55,7 +55,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Basic_Clonable_Argument_T : public In_Basic_Argument_T<S, Insert_Policy> { @@ -76,7 +76,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Basic_Argument_T : public InoutArgument { public: @@ -100,7 +100,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Basic_Argument_T : public OutArgument { public: @@ -123,7 +123,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Basic_Argument_T : public RetArgument { public: @@ -149,7 +149,7 @@ namespace TAO * @brief Template class for stub argument traits of basic IDL types. * */ - template<typename T, class Insert_Policy> + template<typename T, template <typename> class Insert_Policy> struct Basic_Arg_Traits_T { typedef T ret_type; diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl index c3cbcf00698..6d163fe0703 100644 --- a/TAO/tao/Basic_Argument_T.inl +++ b/TAO/tao/Basic_Argument_T.inl @@ -5,14 +5,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Basic_Argument_T<S, Insert_Policy>::In_Basic_Argument_T (S const & x) : x_ (x) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S TAO::In_Basic_Argument_T<S, Insert_Policy>::arg (void) const @@ -21,7 +21,7 @@ TAO::In_Basic_Argument_T<S, Insert_Policy>::arg (void) const } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Basic_Clonable_Argument_T<S,Insert_Policy>::In_Basic_Clonable_Argument_T (S const & x) : In_Basic_Argument_T<S,Insert_Policy> (x), @@ -31,14 +31,14 @@ TAO::In_Basic_Clonable_Argument_T<S,Insert_Policy>::In_Basic_Clonable_Argument_T // ================================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Basic_Argument_T<S, Insert_Policy>::Inout_Basic_Argument_T (S & x) : x_ (x) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg (void) @@ -49,14 +49,14 @@ TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg (void) // ================================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Basic_Argument_T<S, Insert_Policy>::Out_Basic_Argument_T (S & x) : x_ (x) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void) @@ -67,14 +67,14 @@ TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void) // ================================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Basic_Argument_T<S, Insert_Policy>::Ret_Basic_Argument_T (void) { } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg (void) @@ -83,7 +83,7 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg (void) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp (void) @@ -92,7 +92,7 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp (void) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn (void) diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h index ccbda13ca28..28465bfda85 100644 --- a/TAO/tao/Basic_Arguments.h +++ b/TAO/tao/Basic_Arguments.h @@ -55,63 +55,63 @@ namespace TAO template<> class TAO_Export Arg_Traits<CORBA::Short> : public Basic_Arg_Traits_T<CORBA::Short, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Short> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; template<> class TAO_Export Arg_Traits<CORBA::Long> : public Basic_Arg_Traits_T<CORBA::Long, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Long> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; template<> class TAO_Export Arg_Traits<CORBA::UShort> : public Basic_Arg_Traits_T<CORBA::UShort, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::UShort> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; template<> class TAO_Export Arg_Traits<CORBA::ULong> : public Basic_Arg_Traits_T<CORBA::ULong, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::ULong> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; template<> class TAO_Export Arg_Traits<CORBA::Float> : public Basic_Arg_Traits_T<CORBA::Float, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Float> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; template<> class TAO_Export Arg_Traits<CORBA::Double> : public Basic_Arg_Traits_T<CORBA::Double, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Double> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; template<> class TAO_Export Arg_Traits<CORBA::LongLong> : public Basic_Arg_Traits_T<CORBA::LongLong, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::LongLong> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; template<> class TAO_Export Arg_Traits<CORBA::ULongLong> : public Basic_Arg_Traits_T<CORBA::ULongLong, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::ULongLong> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; template<> class TAO_Export Arg_Traits<CORBA::LongDouble> : public Basic_Arg_Traits_T<CORBA::LongDouble, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::LongDouble> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; } diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp index 0b1886e3d45..31b500ff20d 100644 --- a/TAO/tao/Fixed_Array_Argument_T.cpp +++ b/TAO/tao/Fixed_Array_Argument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -24,18 +24,18 @@ TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::marshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_forany>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Fixed_Array_Clonable_Argument_T (void) { if (this->is_clone_) @@ -48,7 +48,7 @@ TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Fixed_Array } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::Argument* TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone (void) { @@ -68,7 +68,7 @@ TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone (void) // =========================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::marshal ( TAO_OutputCDR & cdr) @@ -77,7 +77,7 @@ TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::marshal ( } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::demarshal ( TAO_InputCDR & cdr) @@ -88,12 +88,12 @@ TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_forany>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -101,7 +101,7 @@ TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>:: // ============================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::demarshal ( TAO_InputCDR & cdr) @@ -112,12 +112,12 @@ TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_forany>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -126,7 +126,7 @@ TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>:: template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>:: demarshal (TAO_InputCDR & cdr) @@ -145,12 +145,12 @@ TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>:: template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_.ptr ())); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index b27503b2087..70269fbb4db 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -32,7 +32,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Fixed_Array_Argument_T : public InArgument { public: @@ -55,7 +55,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Fixed_Array_Clonable_Argument_T : public In_Fixed_Array_Argument_T<S_forany, Insert_Policy> { @@ -76,7 +76,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Fixed_Array_Argument_T : public InoutArgument { public: @@ -100,7 +100,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Fixed_Array_Argument_T : public OutArgument { public: @@ -124,7 +124,7 @@ namespace TAO */ template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Fixed_Array_Argument_T : public RetArgument { public: @@ -151,7 +151,7 @@ namespace TAO */ template<typename T_var, typename T_forany, - class Insert_Policy> + template <typename> class Insert_Policy> struct Fixed_Array_Arg_Traits_T { typedef typename T_forany::_slice_type * ret_type; diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index ed0d389bb7a..8ff682fe174 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_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_Fixed_Array_Argument_T<S_forany,Insert_Policy>:: In_Fixed_Array_Argument_T (const typename S_forany::_slice_type * x) @@ -26,7 +26,7 @@ In_Fixed_Array_Argument_T (const typename S_forany::_slice_type * x) } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE const typename S_forany::_slice_type * TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) const @@ -35,7 +35,7 @@ TAO::In_Fixed_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_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>:: In_Fixed_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x) @@ -48,7 +48,7 @@ In_Fixed_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_Fixed_Array_Argument_T<S_forany,Insert_Policy>:: Inout_Fixed_Array_Argument_T (typename S_forany::_slice_type *& x) @@ -56,7 +56,7 @@ Inout_Fixed_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_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) @@ -67,7 +67,7 @@ TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) // =========================================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Fixed_Array_Argument_T< S_forany, @@ -77,7 +77,7 @@ TAO::Out_Fixed_Array_Argument_T< {} template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) @@ -89,7 +89,7 @@ TAO::Out_Fixed_Array_Argument_T<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_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>:: Ret_Fixed_Array_Argument_T (void) @@ -97,7 +97,7 @@ Ret_Fixed_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_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg (void) @@ -107,7 +107,7 @@ TAO::Ret_Fixed_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_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp (void) @@ -117,7 +117,7 @@ TAO::Ret_Fixed_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_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn (void) diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp index 425759e69e2..04923dc6fa0 100644 --- a/TAO/tao/Fixed_Size_Argument_T.cpp +++ b/TAO/tao/Fixed_Size_Argument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -22,17 +22,17 @@ TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, *this->x_); + Insert_Policy<S>::any_insert (any, *this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Fixed_Size_Clonable_Argument_T (void) { if (this->is_clone_) @@ -43,7 +43,7 @@ TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Fixed_Size_Clonable } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::Argument* TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::clone (void) { @@ -57,7 +57,7 @@ TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::clone (void) // =========================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -65,7 +65,7 @@ TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -75,11 +75,11 @@ TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, *this->x_); + Insert_Policy<S>::any_insert (any, *this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -87,7 +87,7 @@ TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any // ============================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -97,11 +97,11 @@ TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -109,7 +109,7 @@ TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any * // ============================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -119,12 +119,12 @@ TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index 21e51db5f46..7ac0ddb249c 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -32,7 +32,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Fixed_Size_Argument_T : public InArgument { public: @@ -55,7 +55,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Fixed_Size_Clonable_Argument_T : public In_Fixed_Size_Argument_T<S, Insert_Policy> { @@ -76,7 +76,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Fixed_Size_Argument_T : public InoutArgument { public: @@ -100,7 +100,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Fixed_Size_Argument_T : public OutArgument { public: @@ -124,7 +124,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Fixed_Size_Argument_T : public RetArgument { public: @@ -149,7 +149,7 @@ namespace TAO * */ template<typename T, - class Insert_Policy> + template <typename> class Insert_Policy> struct Fixed_Size_Arg_Traits_T { typedef T ret_type; diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl index 2e6fa012968..d83d05f5c69 100644 --- a/TAO/tao/Fixed_Size_Argument_T.inl +++ b/TAO/tao/Fixed_Size_Argument_T.inl @@ -5,15 +5,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>:: In_Fixed_Size_Argument_T (S const & x) : x_ (&x) -{} +{ +} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE const S & TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) const @@ -22,17 +23,18 @@ TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) const } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::In_Fixed_Size_Clonable_Argument_T (S const & x) : In_Fixed_Size_Argument_T<S,Insert_Policy> (x), is_clone_ (false) -{} +{ +} // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>:: Inout_Fixed_Size_Argument_T (S & x) @@ -40,7 +42,7 @@ Inout_Fixed_Size_Argument_T (S & x) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) @@ -51,7 +53,7 @@ TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>:: Out_Fixed_Size_Argument_T (S & x) @@ -60,7 +62,7 @@ Out_Fixed_Size_Argument_T (S & x) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) @@ -71,7 +73,7 @@ TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>:: Ret_Fixed_Size_Argument_T (void) @@ -79,7 +81,7 @@ Ret_Fixed_Size_Argument_T (void) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) @@ -88,7 +90,7 @@ TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp (void) @@ -97,7 +99,7 @@ TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp (void) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn (void) diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index 04e9b6768cb..94b2276cbc0 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -27,7 +27,7 @@ namespace TAO CORBA::InterfaceDef_var, CORBA::InterfaceDef_out, TAO::Objref_Traits<CORBA::InterfaceDef>, - TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr> + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 65f9eb1719f..5da5ac8aa1b 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -409,7 +409,7 @@ namespace TAO CORBA::Object_var, CORBA::Object_out, TAO::Objref_Traits<CORBA::Object>, - TAO::Any_Insert_Policy_CORBA_Object <CORBA::Object_ptr> > + TAO::Any_Insert_Policy_CORBA_Object> { }; diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp index e6f8292f4b1..1557ba3ebdc 100644 --- a/TAO/tao/Object_Argument_T.cpp +++ b/TAO/tao/Object_Argument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_ptr, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -22,11 +22,11 @@ TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S_ptr, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_ptr>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -52,7 +52,7 @@ TAO::In_Object_Argument_Cloner_T<S_ptr>::release (S_ptr objref) } template<typename S_ptr, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::~In_Object_Clonable_Argument_T (void) { if (this->is_clone_) @@ -62,7 +62,7 @@ TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::~In_Object_Clonable_Arg } template<typename S_ptr, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::Argument* TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::clone (void) { @@ -78,7 +78,7 @@ TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::clone (void) template<typename S_ptr, typename S_traits, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -87,7 +87,7 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::marshal (TAO_OutputC template<typename S_ptr, typename S_traits, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -99,12 +99,12 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::demarshal (TAO_Input template<typename S_ptr, typename S_traits, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_ptr>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -113,7 +113,7 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::interceptor_value ( template<typename S_ptr, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -124,12 +124,12 @@ TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::demarshal (TAO_InputCDR & template<typename S_ptr, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_ptr>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -138,7 +138,7 @@ TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::interceptor_value ( template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -149,12 +149,12 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR & template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_.in ()); + Insert_Policy<S_ptr>::any_insert (any, this->x_.in ()); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index 1479ff7217d..5aa3449e7d8 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -33,7 +33,7 @@ namespace TAO * */ template<typename S_ptr, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Object_Argument_T : public InArgument { public: @@ -63,7 +63,7 @@ namespace TAO * */ template<typename S_ptr, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Object_Clonable_Argument_T : public In_Object_Argument_T<S_ptr, Insert_Policy> { @@ -85,7 +85,7 @@ namespace TAO */ template<typename S_ptr, typename S_traits, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Object_Argument_T : public InoutArgument { public: @@ -110,7 +110,7 @@ namespace TAO */ template<typename S_ptr, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Object_Argument_T : public OutArgument { public: @@ -134,7 +134,7 @@ namespace TAO */ template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Object_Argument_T : public RetArgument { public: @@ -163,7 +163,7 @@ namespace TAO typename T_var, typename T_out, typename T_traits, - class Insert_Policy> + template <typename> class Insert_Policy> struct Object_Arg_Traits_T { typedef T_ptr ret_type; diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl index e069b7f02fb..2f4f3c50475 100644 --- a/TAO/tao/Object_Argument_T.inl +++ b/TAO/tao/Object_Argument_T.inl @@ -5,14 +5,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_ptr, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::In_Object_Argument_T (S_ptr x) : x_ (x) {} template<typename S_ptr, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_ptr TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::arg (void) const @@ -21,7 +21,7 @@ TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::arg (void) const } template<typename S_ptr, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::In_Object_Clonable_Argument_T (S_ptr x) : In_Object_Argument_T<S_ptr,Insert_Policy> (x), @@ -32,7 +32,7 @@ TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::In_Object_Clonable_Argu template<typename S_ptr, typename S_traits, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::Inout_Object_Argument_T ( S_ptr & x @@ -42,7 +42,7 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::Inout_Object_Argumen template<typename S_ptr, typename S_traits, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_ptr & TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg (void) @@ -54,7 +54,7 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg (void) template<typename S_ptr, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::Out_Object_Argument_T (S_out & x) : x_ (x.ptr ()) @@ -62,7 +62,7 @@ TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::Out_Object_Argument_T (S_ template<typename S_ptr, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_out TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg (void) @@ -74,14 +74,14 @@ TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg (void) template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::Ret_Object_Argument_T (void) {} template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_ptr & TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg (void) @@ -91,7 +91,7 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg (void) template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_ptr TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp (void) @@ -101,7 +101,7 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp (void) template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_ptr TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn (void) diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 040d3a55be5..eff733a61b6 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -82,7 +82,7 @@ namespace TAO CORBA::Policy_var, CORBA::Policy_out, TAO::Objref_Traits<CORBA::Policy>, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Policy_ptr> + TAO::Any_Insert_Policy_AnyTypeCode_Adapter > { }; diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h index b03b3fbf5cc..1f966e2a3b6 100644 --- a/TAO/tao/PortableServer/Any_SArg_Traits.h +++ b/TAO/tao/PortableServer/Any_SArg_Traits.h @@ -39,7 +39,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::Any, - TAO::Any_Insert_Policy_Stream <CORBA::Any> + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp index eefee0c9f64..0c7d4a37b8c 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -31,13 +31,13 @@ TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::demarshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { typedef typename S_var::s_traits::from_type from_type; - Insert_Policy::any_insert ( + Insert_Policy<from_type>::any_insert ( any, from_type (this->x_.in (), BOUND) ); @@ -49,7 +49,7 @@ TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -64,7 +64,7 @@ TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::marshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -82,13 +82,13 @@ TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::demarshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { typedef typename S_var::s_traits::from_type from_type; - Insert_Policy::any_insert ( + Insert_Policy<from_type>::any_insert ( any, from_type (this->x_.in (), BOUND) ); @@ -100,7 +100,7 @@ interceptor_value (CORBA::Any *any) const template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::marshal ( TAO_OutputCDR &cdr @@ -117,13 +117,13 @@ TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::marshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { typedef typename S_var::s_traits::from_type from_type; - Insert_Policy::any_insert ( + Insert_Policy<from_type>::any_insert ( any, from_type (this->x_.in (), BOUND) ); @@ -135,7 +135,7 @@ interceptor_value (CORBA::Any *any) const template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -152,13 +152,13 @@ TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::marshal ( template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { typedef typename S_var::s_traits::from_type from_type; - Insert_Policy::any_insert ( + Insert_Policy<from_type>::any_insert ( any, from_type (this->x_.in (), BOUND) ); diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h index 4ef604e4453..93c329b28f1 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.h +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h @@ -37,7 +37,7 @@ namespace TAO */ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> class In_BD_String_SArgument_T : public InArgument { public: @@ -61,7 +61,7 @@ namespace TAO */ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_BD_String_SArgument_T : public InoutArgument { public: @@ -86,7 +86,7 @@ namespace TAO */ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_BD_String_SArgument_T : public OutArgument { public: @@ -110,7 +110,7 @@ namespace TAO */ template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_BD_String_SArgument_T : public RetArgument { public: @@ -134,7 +134,7 @@ namespace TAO */ template<typename T_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> struct BD_String_SArg_Traits_T { typedef typename T_var::s_traits::char_type * ret_type; diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl index 1359afa5a9c..cadae1c80e8 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: In_BD_String_SArgument_T (void) @@ -14,7 +14,7 @@ In_BD_String_SArgument_T (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE const typename S_var::s_traits::char_type * TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: @@ -27,7 +27,7 @@ arg (void) const template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: Inout_BD_String_SArgument_T (void) @@ -35,7 +35,7 @@ Inout_BD_String_SArgument_T (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: @@ -48,7 +48,7 @@ arg (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: Out_BD_String_SArgument_T (void) @@ -56,7 +56,7 @@ Out_BD_String_SArgument_T (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: @@ -69,7 +69,7 @@ arg (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: Ret_BD_String_SArgument_T (void) @@ -77,7 +77,7 @@ Ret_BD_String_SArgument_T (void) template<typename S_var, size_t BOUND, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp index 2065c8ed885..8dfab051a81 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Basic_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR &cdr) { @@ -22,11 +22,11 @@ TAO::In_Basic_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -34,7 +34,7 @@ TAO::In_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) // =========================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -42,7 +42,7 @@ TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -52,11 +52,11 @@ TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -64,7 +64,7 @@ TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *an // ============================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -74,11 +74,11 @@ TAO::Out_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -86,7 +86,7 @@ TAO::Out_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) // ============================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -96,11 +96,11 @@ TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h index 611c3d5b327..ed235cf0bcd 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Basic_SArgument_T.h @@ -32,7 +32,7 @@ namespace TAO * @brief Template class for IN skeleton argument of basic IDL types. * */ - template<typename S, class Insert_Policy> + template<typename S, template <typename> class Insert_Policy> class In_Basic_SArgument_T : public InArgument { public: @@ -54,7 +54,7 @@ namespace TAO * @brief Template class for INOUT skeleton argument of basic IDL types. * */ - template<typename S, class Insert_Policy> + template<typename S, template <typename> class Insert_Policy> class Inout_Basic_SArgument_T : public InoutArgument { public: @@ -77,7 +77,7 @@ namespace TAO * @brief Template class for OUT skeleton argument of basic IDL types. * */ - template<typename S, class Insert_Policy> + template<typename S, template <typename> class Insert_Policy> class Out_Basic_SArgument_T : public OutArgument { public: @@ -99,7 +99,7 @@ namespace TAO * @brief Template class for return skeleton value of basic IDL types. * */ - template<typename S, class Insert_Policy> + template<typename S, template <typename> class Insert_Policy> class Ret_Basic_SArgument_T : public RetArgument { public: @@ -121,7 +121,7 @@ namespace TAO * @brief Template class for skeleton argument traits of basic IDL types. * */ - template<typename T, class Insert_Policy> + template<typename T, template <typename> class Insert_Policy> struct Basic_SArg_Traits_T { typedef T ret_type; diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl index 815328650ed..14fe54a4e6b 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl @@ -5,13 +5,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T (void) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg (void) const @@ -22,13 +22,13 @@ TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg (void) const // ================================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::Inout_Basic_SArgument_T (void) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void) @@ -39,13 +39,13 @@ TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void) // ================================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Basic_SArgument_T<S,Insert_Policy>::Out_Basic_SArgument_T (void) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void) @@ -56,13 +56,13 @@ TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void) // ================================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::Ret_Basic_SArgument_T (void) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg (void) diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h index 433002d391f..522c80370d6 100644 --- a/TAO/tao/PortableServer/Basic_SArguments.h +++ b/TAO/tao/PortableServer/Basic_SArguments.h @@ -53,55 +53,55 @@ namespace TAO template<> class TAO_PortableServer_Export SArg_Traits<CORBA::Short> - : public Basic_SArg_Traits_T<CORBA::Short, TAO::Any_Insert_Policy_Stream <CORBA::Short> > + : public Basic_SArg_Traits_T<CORBA::Short, TAO::Any_Insert_Policy_Stream> { }; template<> class TAO_PortableServer_Export SArg_Traits<CORBA::Long> - : public Basic_SArg_Traits_T<CORBA::Long, TAO::Any_Insert_Policy_Stream <CORBA::Long> > + : public Basic_SArg_Traits_T<CORBA::Long, TAO::Any_Insert_Policy_Stream> { }; template<> class TAO_PortableServer_Export SArg_Traits<CORBA::UShort> - : public Basic_SArg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_Stream <CORBA::UShort> > + : public Basic_SArg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_Stream> { }; template<> class TAO_PortableServer_Export SArg_Traits<CORBA::ULong> - : public Basic_SArg_Traits_T<CORBA::ULong, TAO::Any_Insert_Policy_Stream <CORBA::ULong> > + : public Basic_SArg_Traits_T<CORBA::ULong, TAO::Any_Insert_Policy_Stream> { }; template<> class TAO_PortableServer_Export SArg_Traits<CORBA::Float> - : public Basic_SArg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_Stream <CORBA::Float> > + : public Basic_SArg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_Stream> { }; template<> class TAO_PortableServer_Export SArg_Traits<CORBA::Double> - : public Basic_SArg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_Stream <CORBA::Double> > + : public Basic_SArg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_Stream> { }; template<> class TAO_PortableServer_Export SArg_Traits<CORBA::LongLong> - : public Basic_SArg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_Stream <CORBA::LongLong> > + : public Basic_SArg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_Stream> { }; template<> class TAO_PortableServer_Export SArg_Traits<CORBA::ULongLong> - : public Basic_SArg_Traits_T<CORBA::ULongLong, TAO::Any_Insert_Policy_Stream <CORBA::ULongLong> > + : public Basic_SArg_Traits_T<CORBA::ULongLong, TAO::Any_Insert_Policy_Stream> { }; template<> class TAO_PortableServer_Export SArg_Traits<CORBA::LongDouble> - : public Basic_SArg_Traits_T<CORBA::LongDouble, TAO::Any_Insert_Policy_Stream <CORBA::LongDouble> > + : public Basic_SArg_Traits_T<CORBA::LongDouble, TAO::Any_Insert_Policy_Stream> { }; diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp index fd989f3ebf9..5fa5e197343 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Fixed_Array_SArgument_T<S_forany, Insert_Policy>::demarshal (TAO_InputCDR &cdr) @@ -24,13 +24,13 @@ TAO::In_Fixed_Array_SArgument_T<S_forany, #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Fixed_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, S_forany (this->x_)); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -38,7 +38,7 @@ TAO::In_Fixed_Array_SArgument_T<S_forany, // =========================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Fixed_Array_SArgument_T<S_forany, Insert_Policy>::marshal (TAO_OutputCDR &cdr) @@ -47,7 +47,7 @@ TAO::Inout_Fixed_Array_SArgument_T<S_forany, } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Fixed_Array_SArgument_T<S_forany, Insert_Policy>:: @@ -60,13 +60,13 @@ demarshal (TAO_InputCDR & cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Fixed_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, S_forany (this->x_)); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -74,7 +74,7 @@ TAO::Inout_Fixed_Array_SArgument_T<S_forany, // ============================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Fixed_Array_SArgument_T<S_forany, Insert_Policy>::marshal (TAO_OutputCDR &cdr) @@ -85,13 +85,13 @@ TAO::Out_Fixed_Array_SArgument_T<S_forany, #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Fixed_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, S_forany (this->x_)); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -100,7 +100,7 @@ TAO::Out_Fixed_Array_SArgument_T<S_forany, template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Fixed_Array_SArgument_T<S_var, S_forany, @@ -115,14 +115,14 @@ TAO::Ret_Fixed_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Fixed_Array_SArgument_T<S_var, S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_.ptr ())); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h index eb280d5b838..42001c73c41 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h @@ -34,7 +34,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Fixed_Array_SArgument_T : public InArgument { public: @@ -56,7 +56,7 @@ namespace TAO * @brief INOUT skeleton argument of fixed size element array. */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Fixed_Array_SArgument_T : public InoutArgument { public: @@ -79,7 +79,7 @@ namespace TAO * @brief OUT skeleton argument of fixed size element array. */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Fixed_Array_SArgument_T : public OutArgument { public: @@ -103,7 +103,7 @@ namespace TAO */ template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Fixed_Array_SArgument_T : public RetArgument { public: @@ -127,7 +127,7 @@ namespace TAO */ template<typename T_var, typename T_forany, - class Insert_Policy> + template <typename> class Insert_Policy> struct Fixed_Array_SArg_Traits_T { typedef typename T_forany::_slice_type * ret_type; diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl index f910e871d2d..837709dd619 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_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_Fixed_Array_SArgument_T<S_forany, Insert_Policy>::In_Fixed_Array_SArgument_T (void) @@ -13,7 +13,7 @@ TAO::In_Fixed_Array_SArgument_T<S_forany, } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type const * TAO::In_Fixed_Array_SArgument_T<S_forany, @@ -26,7 +26,7 @@ TAO::In_Fixed_Array_SArgument_T<S_forany, // =========================================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Fixed_Array_SArgument_T<S_forany, Insert_Policy>:: @@ -35,7 +35,7 @@ Inout_Fixed_Array_SArgument_T (void) } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * TAO::Inout_Fixed_Array_SArgument_T<S_forany, @@ -48,7 +48,7 @@ TAO::Inout_Fixed_Array_SArgument_T<S_forany, // =========================================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Fixed_Array_SArgument_T<S_forany, Insert_Policy>:: @@ -57,7 +57,7 @@ Out_Fixed_Array_SArgument_T (void) } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * TAO::Out_Fixed_Array_SArgument_T<S_forany, @@ -71,7 +71,7 @@ TAO::Out_Fixed_Array_SArgument_T<S_forany, template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Fixed_Array_SArgument_T<S_var, S_forany, @@ -82,7 +82,7 @@ Ret_Fixed_Array_SArgument_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_Fixed_Array_SArgument_T<S_var, diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp index 33990ec3594..66e53e98988 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -22,12 +22,12 @@ TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -35,7 +35,7 @@ TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( // =========================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -43,7 +43,7 @@ TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr) @@ -54,12 +54,12 @@ TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -67,7 +67,7 @@ TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( // ============================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -77,12 +77,12 @@ TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -90,7 +90,7 @@ TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( // ============================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -100,12 +100,12 @@ TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h index 0912f64c017..9d17656495e 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 * Skeleton class template for operation "IN" arguments of fixed * size IDL types. */ - template<typename S, class Insert_Policy> + template<typename S, template <typename> class Insert_Policy> class In_Fixed_Size_SArgument_T : public InArgument { public: @@ -75,7 +75,7 @@ namespace TAO * @brief Template class for INOUT skeleton arg of fixed size IDL types. * */ - template<typename S, class Insert_Policy> + template<typename S, template <typename> class Insert_Policy> class Inout_Fixed_Size_SArgument_T : public InoutArgument { public: @@ -114,7 +114,7 @@ namespace TAO * @brief Template class for OUT skeleton argument of fixed size IDL types. * */ - template<typename S, class Insert_Policy> + template<typename S, template <typename> class Insert_Policy> class Out_Fixed_Size_SArgument_T : public OutArgument { public: @@ -153,7 +153,7 @@ namespace TAO * @brief Template class for return skeleton value of fixed size IDL types. * */ - template<typename S, class Insert_Policy> + template<typename S, template <typename> class Insert_Policy> class Ret_Fixed_Size_SArgument_T : public RetArgument { public: @@ -193,7 +193,7 @@ namespace TAO * */ template<typename T, - class Insert_Policy> + template <typename> class Insert_Policy> struct Fixed_Size_SArg_Traits_T { typedef T ret_type; diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl index 367a060b576..4c6288a4954 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S const & TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) const @@ -16,7 +16,7 @@ TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) const // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>:: Inout_Fixed_Size_SArgument_T (void) @@ -24,7 +24,7 @@ Inout_Fixed_Size_SArgument_T (void) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) @@ -35,7 +35,7 @@ TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Fixed_Size_SArgument_T<S, Insert_Policy>:: @@ -43,7 +43,7 @@ Out_Fixed_Size_SArgument_T (void) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) @@ -54,13 +54,13 @@ TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::Ret_Fixed_Size_SArgument_T (void) {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h index 0145ec7909e..6f9189fbb1f 100644 --- a/TAO/tao/PortableServer/Object_SArg_Traits.h +++ b/TAO/tao/PortableServer/Object_SArg_Traits.h @@ -48,8 +48,7 @@ namespace TAO : public Object_SArg_Traits_T<CORBA::Object_ptr, CORBA::Object_var, CORBA::Object_out, - TAO::Any_Insert_Policy_Stream <CORBA::Object_ptr> - > + TAO::Any_Insert_Policy_Stream> { }; } diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp index 9bdc6b3bcae..00e5b8948e4 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR &cdr) { @@ -24,12 +24,12 @@ TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR & template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_.in ()); + Insert_Policy<S_ptr>::any_insert (any, this->x_.in ()); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -38,7 +38,7 @@ TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -47,7 +47,7 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::marshal (TAO_OutputCDR template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -58,12 +58,12 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCD template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_.in ()); + Insert_Policy<S_ptr>::any_insert (any, this->x_.in ()); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -73,7 +73,7 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( template<typename S_ptr, typename S_var, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -85,12 +85,12 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::marshal (TAO_Outpu template<typename S_ptr, typename S_var, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_.in ()); + Insert_Policy<S_ptr>::any_insert (any, this->x_.in ()); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -99,7 +99,7 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::interceptor_value template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -110,12 +110,12 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::marshal (TAO_OutputCDR & template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_.in ()); + Insert_Policy<S_ptr>::any_insert (any, this->x_.in ()); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h index 2274a22c781..a359304715d 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.h +++ b/TAO/tao/PortableServer/Object_SArgument_T.h @@ -39,7 +39,7 @@ namespace TAO */ template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Object_SArgument_T : public InArgument { public: @@ -62,7 +62,7 @@ namespace TAO */ template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Object_SArgument_T : public InoutArgument { public: @@ -88,7 +88,7 @@ namespace TAO template<typename S_ptr, typename S_var, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Object_SArgument_T : public OutArgument { public: @@ -112,7 +112,7 @@ namespace TAO */ template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Object_SArgument_T : public RetArgument { public: @@ -137,7 +137,7 @@ namespace TAO template<typename T_ptr, typename T_var, typename T_out, - class Insert_Policy> + template <typename> class Insert_Policy> struct Object_SArg_Traits_T { typedef T_ptr ret_type; diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl index d6392bc972f..9ab6d5308ca 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.inl +++ b/TAO/tao/PortableServer/Object_SArgument_T.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_ptr TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) const @@ -19,7 +19,7 @@ TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) const template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>:: Inout_Object_SArgument_T (void) @@ -28,7 +28,7 @@ Inout_Object_SArgument_T (void) template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_ptr& TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) @@ -41,7 +41,7 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) template<typename S_ptr, typename S_var, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>:: Out_Object_SArgument_T (void) @@ -51,7 +51,7 @@ Out_Object_SArgument_T (void) template<typename S_ptr, typename S_var, typename S_out, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_out TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg (void) @@ -63,7 +63,7 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg (void) template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>:: Ret_Object_SArgument_T (void) @@ -72,7 +72,7 @@ Ret_Object_SArgument_T (void) template<typename S_ptr, typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S_ptr & TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 44cab468d4b..1161d814c19 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -82,7 +82,7 @@ namespace TAO CORBA::Policy_ptr, CORBA::Policy_var, CORBA::Policy_out, - TAO::Any_Insert_Policy_Stream <CORBA::Policy_ptr> + TAO::Any_Insert_Policy_Stream > { }; @@ -109,7 +109,7 @@ namespace TAO CORBA::Policy_var, CORBA::Policy_out, TAO::Objref_Traits<CORBA::Policy>, - TAO::Any_Insert_Policy_Stream <CORBA::Policy_ptr> + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp index 52e00cb5110..2cdb15d8b5b 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -31,12 +31,12 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal ( template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -46,7 +46,7 @@ interceptor_value (CORBA::Any *any) const template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -58,7 +58,7 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -72,12 +72,12 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal ( template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -87,7 +87,7 @@ interceptor_value (CORBA::Any *any) const template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -101,12 +101,12 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -116,7 +116,7 @@ interceptor_value (CORBA::Any *any) const template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -130,12 +130,12 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index 505fcd74c27..1ebcb1798cb 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -36,7 +36,7 @@ namespace TAO template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Special_Basic_SArgument_T : public InArgument { public: @@ -61,7 +61,7 @@ namespace TAO template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Special_Basic_SArgument_T : public InoutArgument { public: @@ -87,7 +87,7 @@ namespace TAO template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Special_Basic_SArgument_T : public OutArgument { public: @@ -112,7 +112,7 @@ namespace TAO template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Special_Basic_SArgument_T : public RetArgument { public: @@ -135,7 +135,7 @@ namespace TAO * of (w)char/boolean/octet. * */ - template<typename T, typename to_T, typename from_T, class Insert_Policy> + template<typename T, typename to_T, typename from_T, template <typename> class Insert_Policy> struct Special_Basic_SArg_Traits_T { typedef T ret_type; diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl index a6f4dd1a499..90b5f23677e 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: In_Special_Basic_SArgument_T (void) @@ -17,7 +17,7 @@ In_Special_Basic_SArgument_T (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S const & TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) const @@ -30,7 +30,7 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) const template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: Inout_Special_Basic_SArgument_T (void) @@ -40,7 +40,7 @@ Inout_Special_Basic_SArgument_T (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) @@ -53,7 +53,7 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: Out_Special_Basic_SArgument_T (void) @@ -63,7 +63,7 @@ Out_Special_Basic_SArgument_T (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> S & TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) { @@ -75,7 +75,7 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: Ret_Special_Basic_SArgument_T (void) @@ -85,7 +85,7 @@ Ret_Special_Basic_SArgument_T (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h index f306336fe83..eae031847fb 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArguments.h +++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h @@ -43,7 +43,7 @@ namespace TAO : public Special_Basic_SArg_Traits_T<CORBA::Char, ACE_InputCDR::to_char, ACE_OutputCDR::from_char, - TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_char> > + TAO::Any_Insert_Policy_Stream> { }; @@ -52,7 +52,7 @@ namespace TAO : public Special_Basic_SArg_Traits_T<CORBA::WChar, ACE_InputCDR::to_wchar, ACE_OutputCDR::from_wchar, - TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_wchar> > + TAO::Any_Insert_Policy_Stream> { }; @@ -61,7 +61,7 @@ namespace TAO : public Special_Basic_SArg_Traits_T<CORBA::Octet, ACE_InputCDR::to_octet, ACE_OutputCDR::from_octet, - TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_octet> > + TAO::Any_Insert_Policy_Stream> { }; @@ -70,7 +70,7 @@ namespace TAO : public Special_Basic_SArg_Traits_T<CORBA::Boolean, ACE_InputCDR::to_boolean, ACE_OutputCDR::from_boolean, - TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_boolean> > + TAO::Any_Insert_Policy_Stream> { }; diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h index 5bfc9b5a7dd..77eff8e57ad 100644 --- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h +++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h @@ -48,7 +48,7 @@ namespace TAO : public Object_SArg_Traits_T<CORBA::TypeCode_ptr, CORBA::TypeCode_var, CORBA::TypeCode_out, - TAO::Any_Insert_Policy_Stream <CORBA::TypeCode_ptr> + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index 489af67b782..0ba7f075cac 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::demarshal (TAO_InputCDR & cdr) @@ -24,13 +24,13 @@ TAO::In_Var_Array_SArgument_T<S_forany, #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, S_forany (this->x_)); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -38,7 +38,7 @@ TAO::In_Var_Array_SArgument_T<S_forany, // =========================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::marshal (TAO_OutputCDR &cdr) @@ -47,7 +47,7 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::demarshal (TAO_InputCDR & cdr) @@ -59,14 +59,14 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { typedef typename S_forany::_slice_type slice_type; - Insert_Policy::any_insert ( + Insert_Policy<S_forany>::any_insert ( any, S_forany (const_cast <slice_type *>(this->x_)) ); @@ -78,7 +78,7 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Var_Array_SArgument_T<S_var, S_forany, @@ -94,14 +94,14 @@ TAO::Out_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_.ptr ())); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -110,7 +110,7 @@ TAO::Out_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, @@ -125,14 +125,14 @@ TAO::Ret_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_.ptr ())); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index 22a1ee23caa..6057e45988f 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -32,7 +32,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Var_Array_SArgument_T : public InArgument { public: @@ -56,7 +56,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Var_Array_SArgument_T : public InoutArgument { public: @@ -81,7 +81,7 @@ namespace TAO */ template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Var_Array_SArgument_T : public OutArgument { public: @@ -105,7 +105,7 @@ namespace TAO */ template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Var_Array_SArgument_T : public RetArgument { public: @@ -129,7 +129,7 @@ namespace TAO */ template<typename T_out, typename T_forany, - class Insert_Policy> + template <typename> class Insert_Policy> struct Var_Array_SArg_Traits_T { typedef typename T_forany::_slice_type * ret_type; diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl index 0d0e74abafd..c67376fc892 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl @@ -5,14 +5,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::In_Var_Array_SArgument_T (void) {} template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type const * TAO::In_Var_Array_SArgument_T<S_forany, @@ -25,7 +25,7 @@ TAO::In_Var_Array_SArgument_T<S_forany, // ========================================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>:: @@ -34,7 +34,7 @@ Inout_Var_Array_SArgument_T (void) } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> typename S_forany::_slice_type * TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::arg (void) @@ -47,7 +47,7 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Var_Array_SArgument_T<S_var, S_forany, @@ -58,7 +58,7 @@ Out_Var_Array_SArgument_T (void) template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> typename S_forany::_slice_type *& TAO::Out_Var_Array_SArgument_T<S_var, S_forany, @@ -71,7 +71,7 @@ TAO::Out_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, @@ -82,7 +82,7 @@ Ret_Var_Array_SArgument_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_SArgument_T<S_var, diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp index 530610892ec..79ae2d0fbc9 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR &cdr) { @@ -23,13 +23,13 @@ TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any ) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -37,7 +37,7 @@ TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( // =========================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -45,7 +45,7 @@ TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -55,13 +55,13 @@ TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any ) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -69,7 +69,7 @@ TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( // ============================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -82,12 +82,12 @@ TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_.in ()); + Insert_Policy<S>::any_insert (any, this->x_.in ()); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -95,7 +95,7 @@ TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( // ============================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -105,12 +105,12 @@ TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_.in ()); + Insert_Policy<S>::any_insert (any, this->x_.in ()); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h index 1632a639a54..d2fe23c5d2c 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h @@ -31,7 +31,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Var_Size_SArgument_T : public InArgument { public: @@ -53,7 +53,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Var_Size_SArgument_T : public InoutArgument { public: @@ -77,7 +77,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Var_Size_SArgument_T : public OutArgument { public: @@ -100,7 +100,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Var_Size_SArgument_T : public RetArgument { public: @@ -124,7 +124,7 @@ namespace TAO * */ template<typename T, - class Insert_Policy> + template <typename> class Insert_Policy> struct Var_Size_SArg_Traits_T { typedef T * ret_type; diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl index 80d2c3fd9bf..29cc6f4a943 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> S const & TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) const { @@ -15,14 +15,14 @@ TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) const // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::Inout_Var_Size_SArgument_T (void) { } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> S & TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) { @@ -32,14 +32,14 @@ TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::Out_Var_Size_SArgument_T (void) { } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> S *& TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) { @@ -49,14 +49,14 @@ TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::Ret_Var_Size_SArgument_T (void) { } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S *& TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp index 38ee422d71e..68527466fdd 100644 --- a/TAO/tao/Special_Basic_Argument_T.cpp +++ b/TAO/tao/Special_Basic_Argument_T.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -27,12 +27,12 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::marshal (TAO_Outp template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -40,7 +40,7 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::~In_Special_Basic_Clonable_Argument_T (void) { if (this->is_clone_) @@ -53,7 +53,7 @@ TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::~In_Spec template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::Argument* TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::clone (void) { @@ -69,7 +69,7 @@ TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::clone (v template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::marshal ( TAO_OutputCDR & cdr) @@ -80,7 +80,7 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::marshal ( template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -94,12 +94,12 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal ( template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -109,7 +109,7 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_va template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -123,12 +123,12 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal ( template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -138,7 +138,7 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_valu template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -152,12 +152,12 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal ( template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index 1d7a086b05b..ec6a63c3cb1 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -36,7 +36,7 @@ namespace TAO template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Special_Basic_Argument_T : public InArgument { public: @@ -61,7 +61,7 @@ namespace TAO template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Special_Basic_Clonable_Argument_T : public In_Special_Basic_Argument_T<S, to_S, from_S, Insert_Policy> { @@ -84,7 +84,7 @@ namespace TAO template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Special_Basic_Argument_T : public InoutArgument { public: @@ -110,7 +110,7 @@ namespace TAO template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Special_Basic_Argument_T : public OutArgument { public: @@ -135,7 +135,7 @@ namespace TAO template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Special_Basic_Argument_T : public RetArgument { public: @@ -171,7 +171,7 @@ namespace TAO template<typename T, typename to_T, typename from_T, - class Insert_Policy> + template <typename> class Insert_Policy> struct Special_Basic_Arg_Traits_T { typedef T ret_type; diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl index 7583d30feac..251f23ad1ba 100644 --- a/TAO/tao/Special_Basic_Argument_T.inl +++ b/TAO/tao/Special_Basic_Argument_T.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::In_Special_Basic_Argument_T ( S const & x @@ -18,7 +18,7 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::In_Special_Basic_ template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S const & TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) const @@ -29,7 +29,7 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) const template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::In_Special_Basic_Clonable_Argument_T ( S const & x @@ -43,7 +43,7 @@ TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::In_Speci template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>:: Inout_Special_Basic_Argument_T (S & x) @@ -53,7 +53,7 @@ Inout_Special_Basic_Argument_T (S & x) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) @@ -66,7 +66,7 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>:: Out_Special_Basic_Argument_T (S & x) @@ -76,7 +76,7 @@ Out_Special_Basic_Argument_T (S & x) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) @@ -89,7 +89,7 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>:: Ret_Special_Basic_Argument_T (void) @@ -99,7 +99,7 @@ Ret_Special_Basic_Argument_T (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) @@ -110,7 +110,7 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp (void) @@ -121,7 +121,7 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp (void) template<typename S, typename to_S, typename from_S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn (void) diff --git a/TAO/tao/Special_Basic_Arguments.h b/TAO/tao/Special_Basic_Arguments.h index ff938db4b58..a2f40dd3f2d 100644 --- a/TAO/tao/Special_Basic_Arguments.h +++ b/TAO/tao/Special_Basic_Arguments.h @@ -41,7 +41,7 @@ namespace TAO : public Special_Basic_Arg_Traits_T<CORBA::Char, ACE_InputCDR::to_char, ACE_OutputCDR::from_char, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_char> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; @@ -50,7 +50,7 @@ namespace TAO : public Special_Basic_Arg_Traits_T<CORBA::WChar, ACE_InputCDR::to_wchar, ACE_OutputCDR::from_wchar, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_wchar> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; @@ -59,7 +59,7 @@ namespace TAO : public Special_Basic_Arg_Traits_T<CORBA::Octet, ACE_InputCDR::to_octet, ACE_OutputCDR::from_octet, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_octet> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; @@ -68,7 +68,7 @@ namespace TAO : public Special_Basic_Arg_Traits_T<CORBA::Boolean, ACE_InputCDR::to_boolean, ACE_OutputCDR::from_boolean, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_boolean> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; } diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp index 6aa47d1820d..9482eb44dbc 100644 --- a/TAO/tao/UB_String_Argument_T.cpp +++ b/TAO/tao/UB_String_Argument_T.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -24,18 +24,18 @@ TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_var>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::~In_UB_String_Clonable_Argument_T (void) { if (this->is_clone_) @@ -47,7 +47,7 @@ TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::~In_UB_String_Clonab } template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::Argument* TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::clone () { @@ -65,7 +65,7 @@ TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::clone () // =========================================================== template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::marshal ( TAO_OutputCDR &cdr) @@ -74,7 +74,7 @@ TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::marshal ( } template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::demarshal ( TAO_InputCDR & cdr) @@ -86,12 +86,12 @@ TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_var>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -99,7 +99,7 @@ TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value ( // ============================================================== template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -109,12 +109,12 @@ TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::demarshal (TAO_InputCDR & cd #if TAO_HAS_INTERCEPTORS == 1 template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_var>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -122,7 +122,7 @@ TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value ( // ============================================================ template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr) { @@ -132,12 +132,12 @@ TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::demarshal (TAO_InputCDR & cd #if TAO_HAS_INTERCEPTORS == 1 template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_.in ()); + Insert_Policy<typename S_var::s_traits::char_type const *>::any_insert (any, this->x_.in ()); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index 23a41badf69..054dd55c96e 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -33,7 +33,7 @@ namespace TAO * */ template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> class In_UB_String_Argument_T : public InArgument { public: @@ -56,7 +56,7 @@ namespace TAO * */ template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> class In_UB_String_Clonable_Argument_T : public In_UB_String_Argument_T<S_var, Insert_Policy> { @@ -77,7 +77,7 @@ namespace TAO * */ template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_UB_String_Argument_T : public InoutArgument { public: @@ -101,7 +101,7 @@ namespace TAO * */ template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_UB_String_Argument_T : public OutArgument { public: @@ -124,7 +124,7 @@ namespace TAO * */ template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_UB_String_Argument_T : public RetArgument { public: @@ -149,7 +149,7 @@ namespace TAO * */ template<typename T_var, - class Insert_Policy> + template <typename> class Insert_Policy> struct UB_String_Arg_Traits_T { typedef typename T_var::s_traits::char_type * ret_type; diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl index f9f6d6e35d7..6c549aaca4a 100644 --- a/TAO/tao/UB_String_Argument_T.inl +++ b/TAO/tao/UB_String_Argument_T.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::In_UB_String_Argument_T ( const typename S_var::s_traits::char_type * x) @@ -14,7 +14,7 @@ TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::In_UB_String_Argument_T ( } template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE const typename S_var::s_traits::char_type * TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) const @@ -23,7 +23,7 @@ TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) const } template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::In_UB_String_Clonable_Argument_T ( const typename S_var::s_traits::char_type * x) @@ -35,7 +35,7 @@ TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::In_UB_String_Clonabl // ========================================================================== template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::Inout_UB_String_Argument_T ( typename S_var::s_traits::char_type *& x) @@ -43,7 +43,7 @@ TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::Inout_UB_String_Argument_T {} template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) @@ -54,7 +54,7 @@ TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) // ========================================================================== template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::Out_UB_String_Argument_T ( typename S_var::s_traits::string_out & x) @@ -62,7 +62,7 @@ TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::Out_UB_String_Argument_T ( {} template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) @@ -73,14 +73,14 @@ TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) // ========================================================================== template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::Ret_UB_String_Argument_T (void) { } template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) @@ -89,7 +89,7 @@ TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) } template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::excp (void) @@ -98,7 +98,7 @@ TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::excp (void) } template<typename S_var, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::retn (void) diff --git a/TAO/tao/UB_String_Arguments.h b/TAO/tao/UB_String_Arguments.h index 35537abb630..8e240aeba91 100644 --- a/TAO/tao/UB_String_Arguments.h +++ b/TAO/tao/UB_String_Arguments.h @@ -37,14 +37,14 @@ namespace TAO template<> class TAO_Export Arg_Traits<CORBA::Char *> : public UB_String_Arg_Traits_T<CORBA::String_var, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Char const *> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; template<> class TAO_Export Arg_Traits<CORBA::WChar *> : public UB_String_Arg_Traits_T<CORBA::WString_var, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::WChar const *> > + TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; } diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index c55b155ccf4..c6b5bc18ac9 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -182,7 +182,7 @@ namespace TAO CORBA::AbstractBase_var, CORBA::AbstractBase_out, TAO::Objref_Traits<CORBA::AbstractBase>, - TAO::Any_Insert_Policy_Stream <CORBA::AbstractBase_ptr> + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 881a548e3a7..65647ffda94 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -396,7 +396,7 @@ namespace TAO CORBA::ValueBase_var, CORBA::ValueBase_out, TAO::Value_Traits<CORBA::ValueBase>, - TAO::Any_Insert_Policy_Stream <CORBA::ValueBase *> > + TAO::Any_Insert_Policy_Stream> { }; diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp index 89dbefa6187..1fa33d172fc 100644 --- a/TAO/tao/Var_Array_Argument_T.cpp +++ b/TAO/tao/Var_Array_Argument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -24,18 +24,18 @@ TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::marshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_forany>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Var_Array_Clonable_Argument_T (void) { if (this->is_clone_) @@ -48,7 +48,7 @@ TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Var_Array_Clo } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::Argument* TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone (void) { @@ -68,7 +68,7 @@ TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone (void) // =========================================================== template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -78,7 +78,7 @@ TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::marshal ( } template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -90,12 +90,12 @@ TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - Insert_Policy::any_insert (any, this->x_); + Insert_Policy<S_forany>::any_insert (any, this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -104,7 +104,7 @@ TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::interceptor_value ( template<typename S_out, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -122,13 +122,13 @@ TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::demarshal ( template<typename S_out, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { S_forany tmp (this->x_); - Insert_Policy::any_insert (any, tmp); + Insert_Policy<S_forany>::any_insert (any, tmp); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -137,7 +137,7 @@ interceptor_value (CORBA::Any *any) const template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -157,12 +157,12 @@ TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::demarshal ( template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_.ptr ())); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index 622c7bbf27d..1e89c8753d2 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -32,7 +32,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Var_Array_Argument_T : public InArgument { public: @@ -55,7 +55,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Var_Array_Clonable_Argument_T : public In_Var_Array_Argument_T<S_forany, Insert_Policy> { @@ -76,7 +76,7 @@ namespace TAO * */ template<typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Var_Array_Argument_T : public InoutArgument { public: @@ -101,7 +101,7 @@ namespace TAO */ template<typename S_out, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Var_Array_Argument_T : public OutArgument { public: @@ -125,7 +125,7 @@ namespace TAO */ template<typename S_var, typename S_forany, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Var_Array_Argument_T : public RetArgument { public: @@ -152,7 +152,7 @@ namespace TAO */ template<typename T_out, typename T_forany, - class Insert_Policy> + template <typename> class Insert_Policy> struct Var_Array_Arg_Traits_T { typedef typename T_forany::_slice_type * ret_type; 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) diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp index edc765d2ee8..fed37deb700 100644 --- a/TAO/tao/Var_Size_Argument_T.cpp +++ b/TAO/tao/Var_Size_Argument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Var_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) { @@ -22,19 +22,19 @@ TAO::In_Var_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr) #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any ) const { - Insert_Policy::any_insert (any, *this->x_); + Insert_Policy<S>::any_insert (any, *this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Var_Size_Clonable_Argument_T (void) { if (this->is_clone_) @@ -45,7 +45,7 @@ TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Var_Size_Clonable_Arg } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> TAO::Argument* TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::clone (void) { @@ -59,7 +59,7 @@ TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::clone (void) // =========================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::marshal ( TAO_OutputCDR &cdr @@ -69,7 +69,7 @@ TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::marshal ( } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -81,13 +81,13 @@ TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any ) const { - Insert_Policy::any_insert (any, *this->x_); + Insert_Policy<S>::any_insert (any, *this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -95,7 +95,7 @@ TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value ( // ============================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -112,13 +112,13 @@ TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any ) const { - Insert_Policy::any_insert (any, *this->x_); + Insert_Policy<S>::any_insert (any, *this->x_); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -126,7 +126,7 @@ TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value ( // ============================================================ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -143,13 +143,13 @@ TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value ( CORBA::Any *any ) const { - Insert_Policy::any_insert (any, this->x_.in ()); + Insert_Policy<S>::any_insert (any, this->x_.in ()); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h index 03b86dedfc0..19c9da9a3f8 100644 --- a/TAO/tao/Var_Size_Argument_T.h +++ b/TAO/tao/Var_Size_Argument_T.h @@ -32,7 +32,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Var_Size_Argument_T : public InArgument { public: @@ -46,6 +46,9 @@ namespace TAO protected: const S * x_; +#if TAO_HAS_INTERCEPTORS == 1 + Insert_Policy <S> insert_policy_; +#endif /* TAO_HAS_INTERCEPTORS == 1 */ }; /** @@ -55,7 +58,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class In_Var_Size_Clonable_Argument_T : public In_Var_Size_Argument_T<S, Insert_Policy> { @@ -76,7 +79,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Inout_Var_Size_Argument_T : public InoutArgument { public: @@ -100,7 +103,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Out_Var_Size_Argument_T : public OutArgument { public: @@ -123,7 +126,7 @@ namespace TAO * */ template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> class Ret_Var_Size_Argument_T : public RetArgument { public: @@ -150,7 +153,7 @@ namespace TAO * */ template<typename T, - class Insert_Policy> + template <typename> class Insert_Policy> struct Var_Size_Arg_Traits_T { typedef T * ret_type; diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl index bf388928b4e..e87929d6c42 100644 --- a/TAO/tao/Var_Size_Argument_T.inl +++ b/TAO/tao/Var_Size_Argument_T.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Var_Size_Argument_T<S,Insert_Policy>::In_Var_Size_Argument_T (S const & x) : x_ (&x) @@ -13,7 +13,7 @@ TAO::In_Var_Size_Argument_T<S,Insert_Policy>::In_Var_Size_Argument_T (S const & } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE const S & TAO::In_Var_Size_Argument_T<S,Insert_Policy>::arg (void) const @@ -22,7 +22,7 @@ TAO::In_Var_Size_Argument_T<S,Insert_Policy>::arg (void) const } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::In_Var_Size_Clonable_Argument_T (S const & x) : In_Var_Size_Argument_T<S,Insert_Policy> (x), @@ -32,7 +32,7 @@ TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::In_Var_Size_Clonable_Argu // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::Inout_Var_Size_Argument_T (S & x) : x_ (&x) @@ -40,7 +40,7 @@ TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::Inout_Var_Size_Argument_T (S & } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg (void) @@ -51,7 +51,7 @@ TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg (void) // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::Out_Var_Size_Argument_T ( typename S::_out_type x @@ -60,7 +60,7 @@ TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::Out_Var_Size_Argument_T ( {} template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S *& TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg (void) @@ -71,14 +71,14 @@ TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg (void) // ========================================================================== template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::Ret_Var_Size_Argument_T (void) { } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S *& TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::arg (void) @@ -87,7 +87,7 @@ TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::arg (void) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S * TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::excp (void) @@ -96,7 +96,7 @@ TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::excp (void) } template<typename S, - class Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S * TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::retn (void) |