From 0a5fa825debcbdd6f96dc27d7c51188765328334 Mon Sep 17 00:00:00 2001 From: parsons Date: Fri, 27 Jun 2003 16:23:14 +0000 Subject: ChangeLogTag: Fri Jun 27 11:16:04 2003 Jeff Parsons --- TAO/ChangeLog_ref | 30 ++++++++++++ TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp | 4 -- .../be/be_visitor_interface/interface_cs.cpp | 4 -- TAO/TAO_IDL/be/be_visitor_traits.cpp | 57 ++++++++++++---------- .../be/be_visitor_valuetype/valuetype_cs.cpp | 2 - TAO/tao/Object_Argument_T.cpp | 4 +- TAO/tao/PolicyC.cpp | 12 +++-- TAO/tao/Policy_ForwardC.h | 7 ++- TAO/tao/Sequence_T.h | 2 + 9 files changed, 79 insertions(+), 43 deletions(-) diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index ff778b7a423..fb8e2d03d77 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,33 @@ +Fri Jun 27 11:16:04 2003 Jeff Parsons + + * TAO_IDL/be/be_visitor_traits.cpp: + * TAO_IDL/be/be_visitor_array/array_ci.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + + Replace 'template<>' with 'ACE_TEMPLATE_SPECIALIZATION' + in declarations of specialized template classes in + generated stub header files. Also removed 'template<>' + from the specialization implementations in the stub + source file. These changes please a larger number of + compilers. + + * tao/PolicyC.cpp: + * tao/Policy_ForwardC.h: + + Made changes corresponding to those above for the one + interface in TAO that is forward declared in one .pidl + files and fully defined in another - CORBA::Policy. + + * tao/Object_Argument_T.cpp: + + Removed #if 0/#endif pair that was inadvertently checked + in. + + * tao/Sequence_T.h: + + Added include file need by gcc/cygwin. + Thu Jun 26 17:13:39 2003 Jeff Parsons * TAO_IDL/be/be_visitor_array/array_ch.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp index a60f13dfb9e..4c3c4292dc5 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -159,7 +159,6 @@ int be_visitor_array_ci::visit_array (be_array *node) << "// " << __FILE__ << ":" << __LINE__; *os << be_nl << be_nl - << "template<>" << be_nl << "ACE_INLINE" << be_nl << "void" << be_nl << "TAO::Array_Traits<" << node->name () << ", " @@ -172,7 +171,6 @@ int be_visitor_array_ci::visit_array (be_array *node) << "}"; *os << be_nl << be_nl - << "template<>" << be_nl << "ACE_INLINE" << be_nl << fname << "_slice *" << be_nl << "TAO::Array_Traits<" << node->name () << ", " @@ -185,7 +183,6 @@ int be_visitor_array_ci::visit_array (be_array *node) << "}"; *os << be_nl << be_nl - << "template<>" << be_nl << "ACE_INLINE" << be_nl << "void" << be_nl << "TAO::Array_Traits<" << node->name () << ", " @@ -199,7 +196,6 @@ int be_visitor_array_ci::visit_array (be_array *node) << "}"; *os << be_nl << be_nl - << "template<>" << be_nl << "ACE_INLINE" << be_nl << fname << "_slice *" << be_nl << "TAO::Array_Traits<" << node->name () << ", " diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index dfcbaace023..6b4bf862f16 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -66,7 +66,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "// Traits specializations for " << node->name () << "."; *os << be_nl << be_nl - << "template<>" << be_nl << node->name () << "_ptr" << be_nl << "TAO::Objref_Traits<" << node->name () << ">::tao_duplicate (" << be_idt << be_idt_nl @@ -77,7 +76,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}"; *os << be_nl << be_nl - << "template<>" << be_nl << "void" << be_nl << "TAO::Objref_Traits<" << node->name () << ">::tao_release (" << be_idt << be_idt_nl @@ -88,7 +86,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}"; *os << be_nl << be_nl - << "template<>" << be_nl << node->name () << "_ptr" << be_nl << "TAO::Objref_Traits<" << node->name () << ">::tao_nil (void)" << be_nl @@ -97,7 +94,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}"; *os << be_nl << be_nl - << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal (" << be_idt << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index f3dc9b10f79..09b0e02f2a3 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -99,6 +99,8 @@ be_visitor_traits::visit_interface (be_interface *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; + os->gen_ifdef_macro (node->flat_name (), "arg_traits"); + // Since the three blocks below generate specialized (i.e., non-template) // classes, we don't want to generate them unless it's necessary - thus // the logic surrounding each one. @@ -108,7 +110,7 @@ be_visitor_traits::visit_interface (be_interface *node) if (!node->imported ()) { *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "struct " << be_global->stub_export_macro () << " Objref_Traits<" << node->name () << ">" << be_nl << "{" << be_idt_nl @@ -131,10 +133,8 @@ be_visitor_traits::visit_interface (be_interface *node) // multiple declarations. if (node->seen_in_operation ()) { - os->gen_ifdef_macro (node->flat_name (), "arg_traits"); - *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "class " << be_global->stub_export_macro () << " Arg_Traits<" << node->name () << ">" << be_idt_nl << ": public" << be_idt << be_idt_nl @@ -145,10 +145,10 @@ be_visitor_traits::visit_interface (be_interface *node) << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; - - os->gen_endif (); } + os->gen_endif (); + int status = this->visit_scope (node); if (status != 0) @@ -204,12 +204,14 @@ be_visitor_traits::visit_valuetype (be_valuetype *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; + os->gen_ifdef_macro (node->flat_name (), "arg_traits"); + // This is used by the _var and _out classes, so it should always be // generated in the main file. if (!node->imported ()) { *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "struct " << be_global->stub_export_macro () << " Value_Traits<" << node->name () << ">" << be_nl << "{" << be_idt_nl @@ -223,10 +225,8 @@ be_visitor_traits::visit_valuetype (be_valuetype *node) // multiple declarations. if (node->seen_in_operation ()) { - os->gen_ifdef_macro (node->flat_name (), "arg_traits"); - *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "class " << be_global->stub_export_macro () << " Arg_Traits<" << node->name () << ">" << be_idt_nl << ": public" << be_idt << be_idt_nl @@ -237,10 +237,10 @@ be_visitor_traits::visit_valuetype (be_valuetype *node) << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; - - os->gen_endif (); } + os->gen_endif (); + int status = this->visit_scope (node); if (status != 0) @@ -307,8 +307,10 @@ be_visitor_traits::visit_sequence (be_sequence *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; + os->gen_ifdef_macro (node->flat_name (), "arg_traits"); + *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "class " << be_global->stub_export_macro () << " Arg_Traits<" << node->name () << ">" << be_idt_nl << ": public" << be_idt << be_idt_nl @@ -320,6 +322,8 @@ be_visitor_traits::visit_sequence (be_sequence *node) << "{" << be_nl << "};"; + os->gen_endif (); + node->cli_traits_gen (I_TRUE); return 0; } @@ -343,15 +347,17 @@ be_visitor_traits::visit_string (be_string *node) return 0; } + idl_bool wide = (node->width () != 1); + TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - idl_bool wide = (node->width () != 1); + os->gen_ifdef_macro (node->flat_name (), "arg_traits"); *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "class " << be_global->stub_export_macro () << " Arg_Traits<" << alias->name () << ">" << be_idt_nl << ": public" << be_idt << be_idt_nl @@ -361,6 +367,8 @@ be_visitor_traits::visit_string (be_string *node) << "{" << be_nl << "};"; + os->gen_endif (); + node->cli_traits_gen (I_TRUE); return 0; } @@ -379,12 +387,14 @@ be_visitor_traits::visit_array (be_array *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; + os->gen_ifdef_macro (node->flat_name (), "arg_traits"); + // This is used by the _var and _out classes, so it should always be // generated in the main file. if (!node->imported ()) { *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "struct " << be_global->stub_export_macro () << " Array_Traits<" << be_idt << be_idt_nl << node->name () << "," << be_nl @@ -408,10 +418,8 @@ be_visitor_traits::visit_array (be_array *node) // multiple declarations. if (node->seen_in_operation ()) { - os->gen_ifdef_macro (node->flat_name (), "arg_traits"); - *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "class " << be_global->stub_export_macro () << " Arg_Traits<" << node->name () << ">" << be_idt_nl << ": public" << be_idt << be_idt_nl; @@ -431,10 +439,10 @@ be_visitor_traits::visit_array (be_array *node) << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; - - os->gen_endif (); } + os->gen_endif (); + node->cli_traits_gen (I_TRUE); return 0; } @@ -457,7 +465,7 @@ be_visitor_traits::visit_enum (be_enum *node) os->gen_ifdef_macro (node->flat_name (), "arg_traits"); *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "class " << be_global->stub_export_macro () << " Arg_Traits<" << node->name () << ">" << be_idt_nl << ": public" << be_idt << be_idt_nl; @@ -494,7 +502,7 @@ be_visitor_traits::visit_structure (be_structure *node) os->gen_ifdef_macro (node->flat_name (), "arg_traits"); *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "class " << be_global->stub_export_macro () << " Arg_Traits<" << node->name () << ">" << be_idt_nl << ": public" << be_idt << be_idt_nl; @@ -580,7 +588,7 @@ be_visitor_traits::visit_union (be_union *node) os->gen_ifdef_macro (node->flat_name (), "arg_traits"); *os << be_nl << be_nl - << "template<>" << be_nl + << "ACE_TEMPLATE_SPECIALIZATION" << be_nl << "class " << be_global->stub_export_macro () << " Arg_Traits<" << node->name () << ">" << be_idt_nl << ": public" << be_idt << be_idt_nl; @@ -642,7 +650,6 @@ be_visitor_traits::visit_union_branch (be_union_branch *node) } node->cli_traits_gen (I_TRUE); - bt->cli_traits_gen (I_TRUE); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 57bfe80f240..04f1647d8c3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -94,7 +94,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "// " << __FILE__ << ":" << __LINE__; *os << be_nl << be_nl - << "template<>" << be_nl << "void" << be_nl << "TAO::Value_Traits<" << node->name () << ">::tao_add_ref (" << be_idt << be_idt_nl @@ -105,7 +104,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "}"; *os << be_nl << be_nl - << "template<>" << be_nl << "void" << be_nl << "TAO::Value_Traits<" << node->name () << ">::tao_remove_ref (" << be_idt << be_idt_nl diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp index 9ae3972bf8d..516de4d05b1 100644 --- a/TAO/tao/Object_Argument_T.cpp +++ b/TAO/tao/Object_Argument_T.cpp @@ -8,7 +8,7 @@ ACE_RCSID (tao, Object_Argument_T, "$Id$") -#if 0 + template TAO::In_Object_Argument_T::In_Object_Argument_T (S_ptr x) : x_ (x) @@ -278,5 +278,5 @@ TAO::Ret_Object_SArgument_T::arg (void) { return this->x_.out (); } -#endif + #endif /* TAO_OBJECT_ARGUMENT_T_C */ diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index c77a6897a3d..92276fe4be8 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -488,29 +488,33 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // ======================================================= -// Hand0crafted +// Hand-crafted -template<> CORBA::Policy_ptr TAO::Objref_Traits::tao_duplicate (CORBA::Policy_ptr p) { return CORBA::Policy::_duplicate (p); } -template<> void TAO::Objref_Traits::tao_release (CORBA::Policy_ptr p) { CORBA::release (p); } -template<> CORBA::Policy_ptr TAO::Objref_Traits::tao_nil (void) { return CORBA::Policy::_nil (); } +CORBA::Boolean +TAO::Objref_Traits::tao_marshal (CORBA::Policy_ptr p, + TAO_OutputCDR & cdr) +{ + return p->marshal (cdr); +} + // ================================================================= // TAO_IDL - Generated from diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index b3b384c1331..01725f37403 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -245,14 +245,17 @@ TAO_NAMESPACE_CLOSE // module CORBA namespace TAO { - template<> + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits { static CORBA::Policy_ptr tao_duplicate (CORBA::Policy_ptr); static void tao_release (CORBA::Policy_ptr); static CORBA::Policy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal (CORBA::Policy_ptr, + TAO_OutputCDR &); }; -}; +} + // ========================================================== diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h index 0fa99132c7b..4d934fe824f 100644 --- a/TAO/tao/Sequence_T.h +++ b/TAO/tao/Sequence_T.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Objref_VarOut_T.h" + /** * @class TAO_Unbounded_Sequence * -- cgit v1.2.1