diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_traits.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_traits.cpp | 60 |
1 files changed, 53 insertions, 7 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index 2b36f4e51b5..920bc63e736 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -17,7 +17,9 @@ #include "be_root.h" #include "be_module.h" #include "be_interface.h" +#include "be_valuebox.h" #include "be_valuetype.h" +#include "be_valuebox.h" #include "be_interface_fwd.h" #include "be_valuetype_fwd.h" #include "be_eventtype.h" @@ -60,6 +62,8 @@ be_visitor_traits::visit_root (be_root *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; + *os << be_global->core_versioning_begin () << be_nl; + *os << be_nl << be_nl << "// Traits specializations." << be_nl << "namespace TAO" << be_nl @@ -76,6 +80,8 @@ be_visitor_traits::visit_root (be_root *node) *os << be_uidt_nl << "}"; + *os << be_global->core_versioning_end () << be_nl; + return 0; } @@ -125,7 +131,7 @@ be_visitor_traits::visit_interface (be_interface *node) << ");" << be_uidt_nl << "static ::" << node->name () << "_ptr nil (void);" << be_nl << "static ::CORBA::Boolean marshal (" << be_idt << be_idt_nl - << "::" << node->name () << "_ptr p," << be_nl + << "const ::" << node->name () << "_ptr p," << be_nl << "TAO_OutputCDR & cdr" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "};"; @@ -141,7 +147,7 @@ be_visitor_traits::visit_interface (be_interface *node) -1); } - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -166,7 +172,7 @@ be_visitor_traits::visit_interface_fwd (be_interface_fwd *node) -1); } - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -211,7 +217,7 @@ be_visitor_traits::visit_valuetype (be_valuetype *node) -1); } - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -238,7 +244,42 @@ be_visitor_traits::visit_valuetype_fwd (be_valuetype_fwd *node) -1); } - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); + return 0; +} + +int +be_visitor_traits::visit_valuebox (be_valuebox *node) +{ + if (node->cli_traits_gen ()) + { + return 0; + } + + TAO_OutStream *os = this->ctx_->stream (); + + // I think we need to generate this only for non-defined forward + // declarations. + if (!node->imported ()) + { + os->gen_ifdef_macro (node->flat_name (), "traits", false); + + *os << be_nl << be_nl + << "template<>" << be_nl + << "struct " << be_global->stub_export_macro () << " Value_Traits<" + << node->name () << ">" << be_nl + << "{" << be_idt_nl + << "static void add_ref (" << node->name () << " *);" << be_nl + << "static void remove_ref (" << node->name () << " *);" + << be_nl + << "static void release (" << node->name () << " *);" + << be_uidt_nl + << "};"; + + os->gen_endif (); + } + + node->cli_traits_gen (true); return 0; } @@ -411,12 +452,17 @@ be_visitor_traits::visit_array (be_array *node) << be_uidt_nl << ");" << be_uidt_nl << "static " << name << "_slice * alloc (void);" + << "static void zero (" << be_idt << be_idt_nl + << name << "_slice * _tao_slice" + << be_uidt_nl + << ");" << be_uidt_nl + << be_uidt_nl << "};"; // os->gen_endif (); - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -438,6 +484,6 @@ be_visitor_traits::visit_typedef (be_typedef *node) } this->ctx_->alias (0); - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } |