From 9fd4bf36d3527c91cc79fc4e9dcfa087c5588b3f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 17 Oct 2016 12:04:48 +0200 Subject: Changed indentation of generated array code to reduce its size * TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp: --- TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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 4f0c08aeeaa..9b4ecf44ffe 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -182,8 +182,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << "void" << be_nl << "TAO::Array_Traits<" << fname << "_forany>::free (" << be_idt << be_idt_nl - << fname << "_slice * _tao_slice" << be_uidt_nl - << ")" << be_uidt_nl + << fname << "_slice * _tao_slice)" << be_uidt << be_uidt_nl << "{" << be_idt_nl << fname << "_free (_tao_slice);" << be_uidt_nl << "}"; @@ -193,8 +192,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << fname << "_slice *" << be_nl << "TAO::Array_Traits<" << fname << "_forany>::dup (" << be_idt << be_idt_nl - << "const " << fname << "_slice * _tao_slice" << be_uidt_nl - << ")" << be_uidt_nl + << "const " << fname << "_slice * _tao_slice)" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "return " << fname << "_dup (_tao_slice);" << be_uidt_nl << "}"; @@ -205,8 +203,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << "TAO::Array_Traits<" << fname << "_forany>::copy (" << be_idt << be_idt_nl << fname << "_slice * _tao_to," << be_nl - << "const " << fname << "_slice * _tao_from" << be_uidt_nl - << ")" << be_uidt_nl + << "const " << fname << "_slice * _tao_from)" << be_uidt << be_uidt_nl << "{" << be_idt_nl << fname << "_copy (_tao_to, _tao_from);" << be_uidt_nl << "}"; @@ -216,8 +213,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << "void" << be_nl << "TAO::Array_Traits<" << fname << "_forany>::zero (" << be_idt << be_idt_nl - << fname << "_slice * _tao_slice" << be_uidt_nl - << ")" << be_uidt_nl + << fname << "_slice * _tao_slice)" << be_uidt << be_uidt_nl << "{" << be_idt_nl; ACE_CDR::ULong ndims = node->n_dims (); -- cgit v1.2.1 From 956f2f051339a94b536c2495068cba0d71b15727 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 17 Oct 2016 12:32:13 +0200 Subject: TAO Array specializations should appear between core versioning macros * TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp: --- TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp | 6 ++++++ 1 file changed, 6 insertions(+) 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 9b4ecf44ffe..11d7cccbaac 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -177,6 +177,9 @@ int be_visitor_array_ci::visit_array (be_array *node) unique += "_traits"; + *os << be_nl + << be_global->core_versioning_begin (); + *os << be_nl_2 << "ACE_INLINE" << be_nl << "void" << be_nl @@ -346,6 +349,9 @@ int be_visitor_array_ci::visit_array (be_array *node) *os << be_nl; + *os << be_nl + << be_global->core_versioning_end (); + node->cli_inline_gen (true); return 0; } -- cgit v1.2.1