diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-03-10 10:20:55 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-03-10 10:20:55 +0100 |
| commit | 4ce4f37f259673d909c415b5b86ad927e6916941 (patch) | |
| tree | c5e771f198c930cb59d81d931f95e3377a031d7b | |
| parent | 8769426c6c91dbf87330da25ed4c65e6c6d3fd16 (diff) | |
| download | ATCD-4ce4f37f259673d909c415b5b86ad927e6916941.tar.gz | |
Some more compact code generation
* TAO/TAO_IDL/be/be_sequence.cpp:
* TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
| -rw-r--r-- | TAO/TAO_IDL/be/be_sequence.cpp | 19 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp | 16 |
2 files changed, 14 insertions, 21 deletions
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index 4bed99c0a56..e5d6b25f8ad 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -772,21 +772,16 @@ be_sequence::gen_base_class_name (TAO_OutStream *os, default: if (this->unbounded ()) { - *os << "::TAO::unbounded_value_sequence<" << linebreak - << be_idt << be_idt_nl - << elem->nested_type_name (ctx_scope) << linebreak - << be_uidt_nl - << ">" << be_uidt; + *os << "::TAO::unbounded_value_sequence<" + << elem->nested_type_name (ctx_scope) + << ">"; } else { - *os << "::TAO::bounded_value_sequence<" << linebreak - << be_idt << be_idt_nl - << elem->nested_type_name (ctx_scope) << "," << linebreak - << be_nl - << this->max_size ()->ev ()->u.ulval << linebreak - << be_uidt_nl - << ">" << be_uidt; + *os << "::TAO::bounded_value_sequence<" + << elem->nested_type_name (ctx_scope) << "," + << this->max_size ()->ev ()->u.ulval + << ">"; } break; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index fc815750ad8..b9ada482b9c 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -247,7 +247,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) *os << be_nl_2 << "virtual ::CORBA::ULong length (void) const;" << be_nl - << "virtual void length ( ::CORBA::ULong);" + << "virtual void length (::CORBA::ULong);" << be_nl_2 << "virtual ::CORBA::ULong maximum (void) const;"; } @@ -285,14 +285,12 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) && !be_global->alt_mapping ()) { *os << be_nl_2 - << "\n\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl - << node->local_name () << " (" << be_idt << be_idt_nl - << "::CORBA::ULong length," << be_nl - << "const ACE_Message_Block* mb" << be_uidt_nl - << ")" << be_uidt_nl - << " : ::TAO::unbounded_value_sequence< ::CORBA::Octet>" - << " (length, mb) {}" << "\n" - << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */"; + << "\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl + << node->local_name () << " (::CORBA::ULong length, const ACE_Message_Block* mb)" + << be_idt_nl + << ": ::TAO::unbounded_value_sequence< ::CORBA::Octet>" + << " (length, mb) {}" << be_uidt_nl + << "\n#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */"; } *os << be_uidt_nl |