diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-11-02 16:14:28 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-11-02 16:14:28 +0100 |
| commit | 7c0fd0abff1e337a4cff46096f384b83251a75a5 (patch) | |
| tree | 5fa5d1d250074942d414354797540b78be361439 | |
| parent | 212e6bd8898a38c6e37fddeec27b7151033da7f3 (diff) | |
| download | ATCD-7c0fd0abff1e337a4cff46096f384b83251a75a5.tar.gz | |
Fixed problem when enabling versioned namespaces, the TAO arg traits have to be within the TAO core versioned namespace and a layout change to the generated code
* TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
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 97a9eccae6d..100231a49d6 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -47,7 +47,9 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - *os << be_nl_2 + *os << be_global->core_versioning_begin (); + + *os << be_nl << "// Traits specializations for " << node->name () << "."; *os << be_nl_2 @@ -107,7 +109,9 @@ be_visitor_interface_cs::visit_interface (be_interface *node) } *os << be_uidt_nl - << "}"; + << "}" << be_nl; + + *os << be_global->core_versioning_end () << be_nl; } // If we are generating CORBA Policy we need to add some more methods @@ -414,9 +418,9 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, *os << "return " << node->local_name () << "::_duplicate (" << be_idt << be_idt_nl << "dynamic_cast<" << node->local_name () - << "_ptr> (_tao_objref)" - << be_uidt_nl - << ");" << be_uidt << be_uidt_nl + << "_ptr> (_tao_objref));" + << be_uidt + << be_uidt << be_uidt_nl << "}" << be_nl_2; return true; |