diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-28 12:36:45 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-28 12:36:45 +0000 |
| commit | 545c9237390ce930065a60162d0f77b16295a708 (patch) | |
| tree | e61dfa03469cf1963e2ff1fbab3b0f60b3674cc8 | |
| parent | d9fd99e8a0817d91d8584deb3f561a59824b3057 (diff) | |
| download | ATCD-545c9237390ce930065a60162d0f77b16295a708.tar.gz | |
Wed Sep 28 12:35:58 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
* TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
Layout changes to the generated code
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp | 12 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp | 6 |
3 files changed, 15 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 526a56d1b22..899d95000ef 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Sep 28 12:35:58 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: + Layout changes to the generated code + Wed Sep 28 12:34:31 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Bug_3683_Regression/Echo_i.h: diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp index 4f3cf7e2905..f66690d09d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp @@ -176,8 +176,8 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node) this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT); *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl << "TAO_OutputCDR &strm," << be_nl - << "const " << fname << "_forany &_tao_array" << be_uidt_nl - << ")" << be_uidt_nl + << "const " << fname << "_forany &_tao_array)" << be_uidt + << be_uidt_nl << "{" << be_idt_nl; if (bt->accept (this) == -1) @@ -194,8 +194,8 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node) this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT); *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl << "TAO_InputCDR &strm," << be_nl - << fname << "_forany &_tao_array" << be_uidt_nl - << ")" << be_uidt_nl + << fname << "_forany &_tao_array)" << be_uidt + << be_uidt_nl << "{" << be_idt_nl; if (bt->accept (this) == -1) @@ -503,8 +503,8 @@ be_visitor_array_cdr_op_cs::visit_predefined_type ( } } - *os << be_uidt_nl - << ");" << be_uidt << be_uidt << be_uidt_nl; + *os << ");" << be_uidt + << be_uidt << be_uidt << be_uidt_nl; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp index 73b02626b19..5c81c3159a5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp @@ -131,14 +131,14 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) { *os << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () - << "_Factory_function_pointer" << be_uidt_nl; + << "_Factory_function_pointer"; } else { - *os << "0" << be_uidt_nl; + *os << "0"; } - *os << ");" << be_uidt_nl << be_uidt_nl; + *os << ");" << be_uidt << be_uidt_nl << be_uidt_nl; *os << "return true;" << be_uidt_nl << "}" << be_nl; |