summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@users.noreply.github.com>2016-11-02 19:06:11 +0100
committerGitHub <noreply@github.com>2016-11-02 19:06:11 +0100
commitc40cec4fe4a7f0519bf13d51ef601f6d470b5b67 (patch)
tree15bc2bda0ececb8314244827156a449786297eb0
parent8cb89f82b3d213f91094d5fc78ea20b997a981f3 (diff)
parent7c0fd0abff1e337a4cff46096f384b83251a75a5 (diff)
downloadATCD-c40cec4fe4a7f0519bf13d51ef601f6d470b5b67.tar.gz
Merge pull request #324 from jwillemsen/master
Fixed problem when enabling versioned namespaces, the TAO arg traits …
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp14
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;