summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@users.noreply.github.com>2016-10-17 15:12:22 +0200
committerGitHub <noreply@github.com>2016-10-17 15:12:22 +0200
commit4af4be616b737f5b6c2d9624f7f9c82b0247d73e (patch)
treed630d48bfda3a8742fc96de118f9fc42cf08ac5b
parent32735f0c099629e99b84c22d9a20be2202a0cad5 (diff)
parent956f2f051339a94b536c2495068cba0d71b15727 (diff)
downloadATCD-4af4be616b737f5b6c2d9624f7f9c82b0247d73e.tar.gz
Merge pull request #315 from jwillemsen/master
Changed indentation of generated array code to reduce its size
-rw-r--r--TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp18
1 files changed, 10 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..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,13 +177,15 @@ 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
<< "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 +195,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 +206,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 +216,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 ();
@@ -350,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;
}