diff options
37 files changed, 138 insertions, 60 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a5ee0fdfc1a..a64f4f0ac8f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,46 @@ +Tue Dec 29 04:07:06 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_union.cpp: + * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure.cpp: + * TAO_IDL/be/be_type.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: + * TAO_IDL/be/be_typedef.cpp: + * TAO_IDL/be/be_structure.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: + * TAO_IDL/be/be_field.cpp: + * TAO_IDL/be/be_predefined_type.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_enum.cpp: + * TAO_IDL/be/be_string.cpp: + * TAO_IDL/be/be_array.cpp: + * TAO_IDL/be_include/be_field.h: + * TAO_IDL/be_include/be_interface.h: + * TAO_IDL/be_include/be_enum.h: + * TAO_IDL/be_include/be_type.h: + * TAO_IDL/be_include/be_union.h: + * TAO_IDL/be_include/be_predefined_type.h: + * TAO_IDL/be_include/be_string.h: + * TAO_IDL/be_include/be_array.h: + * TAO_IDL/be_include/be_typedef.h: + * TAO_IDL/be_include/be_structure.h: + * TAO_IDL/be_include/be_valuetype.h: + * TAO_IDL/be_include/be_sequence.h: + + Fixed inconsistencies in the generation of ostream operators + for array types, both as top-level declarations and as + members. + Thu Dec 24 16:58:36 UTC 2009 Phil Mesnier <mesnierp@ociweb.com> * bin/tao_other_tests.lst: diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp index ec16b8ebb0e..c6969f2c0da 100644 --- a/TAO/TAO_IDL/be/be_array.cpp +++ b/TAO/TAO_IDL/be/be_array.cpp @@ -259,13 +259,14 @@ be_array::gen_dimensions (TAO_OutStream *os, // Overridden method void -be_array::gen_ostream_operator (TAO_OutStream *os) +be_array::gen_ostream_operator (TAO_OutStream *os, + bool use_underscore) { be_scope* scope = be_scope::narrow_from_scope (this->defined_in ()); be_decl* parent = scope->decl (); ACE_CString arg_name (ACE_CString (parent->full_name ()) + "::" - + (this->anonymous () ? "_" : "") + + (use_underscore ? "_" : "") + this->local_name ()->get_string () + "_forany &_tao_array"); @@ -311,7 +312,10 @@ be_array::gen_ostream_operator (TAO_OutStream *os) } be_type *bt = be_type::narrow_from_decl (this->base_type ()); - bt->gen_member_ostream_operator (os, instance_name.c_str ()); + bt->gen_member_ostream_operator (os, + instance_name.c_str (), + use_underscore, + false); *os << ";"; @@ -330,13 +334,14 @@ be_array::gen_ostream_operator (TAO_OutStream *os) void be_array::gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor) { be_scope* scope = be_scope::narrow_from_scope (this->defined_in ()); be_decl* parent = scope->decl (); ACE_CString decl_name (ACE_CString (parent->full_name ()) + "::" - + (this->anonymous () ? "_" : "") + + (use_underscore ? "_" : "") + this->local_name ()->get_string ()); // The container is always const, so the member is const as well, @@ -344,7 +349,10 @@ be_array::gen_member_ostream_operator (TAO_OutStream *os, *os << decl_name.c_str () << "_forany (" << "const_cast< " << decl_name.c_str () << "_slice *> ("; - this->be_type::gen_member_ostream_operator (os, instance_name, accessor); + this->be_type::gen_member_ostream_operator (os, + instance_name, + use_underscore, + accessor); *os << "))"; } diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp index 0d1cd40065e..b094f811f40 100644 --- a/TAO/TAO_IDL/be/be_enum.cpp +++ b/TAO/TAO_IDL/be/be_enum.cpp @@ -70,7 +70,8 @@ be_enum::be_enum (UTL_ScopedName *n, } void -be_enum::gen_ostream_operator (TAO_OutStream *os) +be_enum::gen_ostream_operator (TAO_OutStream *os, + bool /* use_underscore */) { *os << be_nl << "std::ostream& operator<< (std::ostream &strm, const " diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp index a65cd7c6b7e..d19f6c3894b 100644 --- a/TAO/TAO_IDL/be/be_field.cpp +++ b/TAO/TAO_IDL/be/be_field.cpp @@ -72,10 +72,14 @@ be_field::field_type (void) const void be_field::gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor) { be_type *ft = be_type::narrow_from_decl (this->field_type ()); - ft->gen_member_ostream_operator (os, instance_name, accessor); + ft->gen_member_ostream_operator (os, + instance_name, + use_underscore, + accessor); } bool diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 151d22fb118..191321d31fe 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -1347,7 +1347,8 @@ be_interface::gen_collocated_skel_body (be_interface *derived, } void -be_interface::gen_ostream_operator (TAO_OutStream *os) +be_interface::gen_ostream_operator (TAO_OutStream *os, + bool /* use_underscore */) { *os << be_nl << "std::ostream& operator<< (" << be_idt << be_idt_nl @@ -1365,6 +1366,7 @@ be_interface::gen_ostream_operator (TAO_OutStream *os) void be_interface::gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool /* use_underscore */, bool accessor) { *os << instance_name << (accessor ? " ()" : ".in ()"); diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp index 870852a8f14..7b7ef968486 100644 --- a/TAO/TAO_IDL/be/be_predefined_type.cpp +++ b/TAO/TAO_IDL/be/be_predefined_type.cpp @@ -108,6 +108,7 @@ be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t, void be_predefined_type::gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor) { switch (this->pt ()) @@ -136,6 +137,7 @@ be_predefined_type::gen_member_ostream_operator (TAO_OutStream *os, default: this->be_type::gen_member_ostream_operator (os, instance_name, + use_underscore, accessor); break; } diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp index 6e409ef0315..86ab8112f0b 100644 --- a/TAO/TAO_IDL/be/be_produce.cpp +++ b/TAO/TAO_IDL/be/be_produce.cpp @@ -74,10 +74,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "fe_extern.h" #include "global_extern.h" -ACE_RCSID (be, - be_produce, - "$Id$") - // Clean up before exit, whether successful or not. TAO_IDL_BE_Export void BE_cleanup (void) diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index bb0d944fc18..63e4bce34e6 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -409,7 +409,8 @@ be_sequence::decl (void) // Overridden method void -be_sequence::gen_ostream_operator (TAO_OutStream *os) +be_sequence::gen_ostream_operator (TAO_OutStream *os, + bool /* use_underscore */) { *os << be_nl << "std::ostream& operator<< (" << be_idt << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp index ba39be49456..4be5b3bd792 100644 --- a/TAO/TAO_IDL/be/be_string.cpp +++ b/TAO/TAO_IDL/be/be_string.cpp @@ -68,6 +68,7 @@ be_string::be_string (AST_Decl::NodeType nt, void be_string::gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor) { // For wide strings, generate code that outputs the hex values of @@ -79,6 +80,7 @@ be_string::gen_member_ostream_operator (TAO_OutStream *os, this->be_type::gen_member_ostream_operator (os, instance_name, + use_underscore, accessor); *os << " << \"\\\"\""; diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp index 0d0e1b6c526..5d4947176c2 100644 --- a/TAO/TAO_IDL/be/be_structure.cpp +++ b/TAO/TAO_IDL/be/be_structure.cpp @@ -30,10 +30,6 @@ #include "idl_defines.h" #include "global_extern.h" -ACE_RCSID (be, - be_structure, - "$Id$") - be_structure::be_structure (void) : COMMON_Base (), AST_Decl (), @@ -84,7 +80,8 @@ be_structure::redefine (AST_Structure *from) // Overridden method void -be_structure::gen_ostream_operator (TAO_OutStream *os) +be_structure::gen_ostream_operator (TAO_OutStream *os, + bool /* use_underscore */) { *os << be_nl << "std::ostream& operator<< (" << be_idt << be_idt_nl @@ -124,7 +121,13 @@ be_structure::gen_ostream_operator (TAO_OutStream *os) ACE_CString instance_name ("_tao_aggregate."); instance_name += f->local_name ()->get_string (); - f->gen_member_ostream_operator (os, instance_name.c_str ()); + AST_Decl::NodeType nt = f->field_type ()->node_type (); + bool member_use_underscore = + nt == AST_Decl::NT_array || nt == AST_Decl::NT_sequence; + f->gen_member_ostream_operator (os, + instance_name.c_str (), + member_use_underscore, + false); } *os << be_nl diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index b6c26af04ae..59799f69749 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -233,13 +233,15 @@ be_type::gen_fwd_helper_name (void) } void -be_type::gen_ostream_operator (TAO_OutStream *) +be_type::gen_ostream_operator (TAO_OutStream *, + bool /* use_underscore */) { } void be_type::gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool /* use_underscore */, bool accessor) { *os << instance_name << (accessor ? " ()" : ""); diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp index 44fcd26bf9f..f62d3be7b35 100644 --- a/TAO/TAO_IDL/be/be_typedef.cpp +++ b/TAO/TAO_IDL/be/be_typedef.cpp @@ -105,10 +105,12 @@ be_typedef::base_node_type (void) const void be_typedef::gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor) { this->primitive_base_type ()->gen_member_ostream_operator (os, instance_name, + use_underscore, accessor); } diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index 1dad9224314..aa3552f9fd8 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -121,7 +121,8 @@ be_union::has_duplicate_case_labels (void) } void -be_union::gen_ostream_operator (TAO_OutStream *os) +be_union::gen_ostream_operator (TAO_OutStream *os, + bool use_underscore) { *os << be_nl << "std::ostream& operator<< (" << be_idt << be_idt_nl @@ -179,7 +180,10 @@ be_union::gen_ostream_operator (TAO_OutStream *os) *os << "strm << "; - ub->gen_member_ostream_operator (os, instance_name.c_str (), true); + ub->gen_member_ostream_operator (os, + instance_name.c_str (), + use_underscore, + true); *os << ";" << be_nl << "break;" << be_uidt; diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index ae7070b9a3c..ae63b7e2678 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -549,7 +549,8 @@ be_valuetype::gen_helper_stubs (char *, char *) } void -be_valuetype::gen_ostream_operator (TAO_OutStream *os) +be_valuetype::gen_ostream_operator (TAO_OutStream *os, + bool /* use_underscore */) { *os << be_nl << "std::ostream& operator<< (" << be_idt << be_idt_nl 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 a56c43b1539..addecf3c3df 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 @@ -140,8 +140,10 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node) ACE_OS::memset (fname, '\0', NAMEBUFSIZE); + + bool use_underscore = (this->ctx_->tdef () == 0); - if (this->ctx_->tdef ()) + if (!use_underscore) { ACE_OS::sprintf (fname, "%s", node->full_name ()); } @@ -218,12 +220,12 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node) if (be_global->gen_ostream_operators ()) { - node->gen_ostream_operator (os); + node->gen_ostream_operator (os, use_underscore); } *os << be_global->core_versioning_end () << be_nl; - node->cli_stub_cdr_op_gen (1); + node->cli_stub_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp index d68d8f4126e..b1384d64794 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp @@ -75,7 +75,7 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node) if (be_global->gen_ostream_operators ()) { - node->gen_ostream_operator (os); + node->gen_ostream_operator (os, false); } *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp index 92b51dd0950..d04849fd46f 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp @@ -176,7 +176,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) if (be_global->gen_ostream_operators ()) { - node->gen_ostream_operator (os); + node->gen_ostream_operator (os, false); } *os << be_global->core_versioning_end () << be_nl; 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 31114b2a9db..97d63ee26f1 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 @@ -155,7 +155,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) { *os << be_nl; - node->gen_ostream_operator (os); + node->gen_ostream_operator (os, false); } *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index c304ee58b14..a5f751cfe42 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -134,10 +134,10 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) << be_uidt_nl; *os << "}" << be_nl; - + if (be_global->gen_ostream_operators ()) { - node->gen_ostream_operator (os); + node->gen_ostream_operator (os, false); } *os << be_nl << be_global->core_versioning_end (); diff --git a/TAO/TAO_IDL/be/be_visitor_structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure.cpp index 69d2b266c0b..434ad33e4c1 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure.cpp @@ -40,6 +40,3 @@ #include "be_visitor_structure/serializer_op_ch.cpp" #include "be_visitor_structure/serializer_op_cs.cpp" -ACE_RCSID (be, - be_visitor_structure, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp index d8253298b73..a2e882f665a 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure, - cdr_op_cs, - "$Id$") - be_visitor_structure_cdr_op_cs::be_visitor_structure_cdr_op_cs ( be_visitor_context *ctx ) @@ -147,7 +143,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) if (be_global->gen_ostream_operators ()) { - node->gen_ostream_operator (os); + node->gen_ostream_operator (os, false); } *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp index a23e0430275..720fe5f58de 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - cdr_op_cs, - "$Id$") - // *************************************************************************** // Union visitor for generating CDR operator declarations in the client // stubs file @@ -204,14 +200,16 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) << "}" << be_nl << be_nl << "return result;" << be_uidt_nl << "}" << be_nl; + + bool use_underscore = (this->ctx_->tdef () == 0); if (be_global->gen_ostream_operators ()) { - node->gen_ostream_operator (os); + node->gen_ostream_operator (os, use_underscore); } *os << be_global->core_versioning_end () << be_nl; - node->cli_stub_cdr_op_gen (1); + node->cli_stub_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp index c81a9a22cfd..da9aebc4d65 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - cdr_op_cs, - "$Id$") - // ********************************************** // Visitor for union_branch in the client stubs file. // ********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp index 4e06d63da22..74596766acf 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp @@ -108,7 +108,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node) if (be_global->gen_ostream_operators ()) { - node->gen_ostream_operator (os); + node->gen_ostream_operator (os, false); } *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 11580d1c82c..e72f7fe5669 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -517,6 +517,9 @@ be_visitor_valuetype_cs::gen_ostream_operator_r (be_valuetype *node, ACE_CString instance_name ("this->"); instance_name += f->local_name ()->get_string (); - f->gen_member_ostream_operator (os, instance_name.c_str (), true); + f->gen_member_ostream_operator (os, + instance_name.c_str (), + false, + true); } } diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h index 25b06363a1d..333019a7d7d 100644 --- a/TAO/TAO_IDL/be_include/be_array.h +++ b/TAO/TAO_IDL/be_include/be_array.h @@ -48,10 +48,12 @@ public: // Generate dimensions. If slice == 1, generate dimensions for the slice // definition. - virtual void gen_ostream_operator (TAO_OutStream *os); + virtual void gen_ostream_operator (TAO_OutStream *os, + bool use_underscore); virtual void gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, - bool accessor = false); + bool use_underscore, + bool accessor); // Overridden from class be_type. // Visiting. diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h index 32d9b1c8f6c..0e551833e96 100644 --- a/TAO/TAO_IDL/be_include/be_enum.h +++ b/TAO/TAO_IDL/be_include/be_enum.h @@ -42,7 +42,8 @@ public: bool abstract); // Constructor. - virtual void gen_ostream_operator (TAO_OutStream *os); + virtual void gen_ostream_operator (TAO_OutStream *os, + bool use_underscore); // Overridden from class be_type. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h index 778773e35d2..321292d8d4d 100644 --- a/TAO/TAO_IDL/be_include/be_field.h +++ b/TAO/TAO_IDL/be_include/be_field.h @@ -44,6 +44,7 @@ public: // Generate debugging ostream operator for members. void gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor = false); // Accessors for the member. diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h index a2fcc00a390..c7b3c94b4af 100644 --- a/TAO/TAO_IDL/be_include/be_interface.h +++ b/TAO/TAO_IDL/be_include/be_interface.h @@ -311,11 +311,13 @@ public: TAO_OutStream *os); // Common code called from gen_colloc_op_defn_helper(). - virtual void gen_ostream_operator (TAO_OutStream *os); + virtual void gen_ostream_operator (TAO_OutStream *os, + bool use_underscore); // Overridden from class be_type. virtual void gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor = false); // Overridden from class be_type. diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h index 9b340476879..84c0f856fb8 100644 --- a/TAO/TAO_IDL/be_include/be_predefined_type.h +++ b/TAO/TAO_IDL/be_include/be_predefined_type.h @@ -40,6 +40,7 @@ public: // Overridden from class be_type. virtual void gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor = false); // Visiting. diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index 70c27400f61..2d9b4e021a1 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -79,7 +79,8 @@ public: virtual be_decl *decl (void); // Overridden method on the be_scope class. - virtual void gen_ostream_operator (TAO_OutStream *os); + virtual void gen_ostream_operator (TAO_OutStream *os, + bool use_underscore); // Overridden from class be_type. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h index 8fafe321bef..6c5235ebc04 100644 --- a/TAO/TAO_IDL/be_include/be_string.h +++ b/TAO/TAO_IDL/be_include/be_string.h @@ -42,6 +42,7 @@ public: // Overridden from class be_type. virtual void gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor = false); // Visiting. diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h index 09b5595b2d2..c9ccc207a19 100644 --- a/TAO/TAO_IDL/be_include/be_structure.h +++ b/TAO/TAO_IDL/be_include/be_structure.h @@ -44,7 +44,8 @@ public: // Copy BE-specific values when redefining struct or union // from a forward declaration. - virtual void gen_ostream_operator (TAO_OutStream *os); + virtual void gen_ostream_operator (TAO_OutStream *os, + bool use_underscore); // Overridden from class be_type. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h index f63d55ca9e9..af0f3025215 100644 --- a/TAO/TAO_IDL/be_include/be_type.h +++ b/TAO/TAO_IDL/be_include/be_type.h @@ -57,11 +57,13 @@ public: void gen_fwd_helper_name (void); // Compute the value of the member. - virtual void gen_ostream_operator (TAO_OutStream *os); + virtual void gen_ostream_operator (TAO_OutStream *os, + bool use_underscore); // No-op, overridden in derived classes. virtual void gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor = false); // Generic implementation here, overridden for some types. diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h index 0a18687a2cf..8958edb9f49 100644 --- a/TAO/TAO_IDL/be_include/be_typedef.h +++ b/TAO/TAO_IDL/be_include/be_typedef.h @@ -53,6 +53,7 @@ public: virtual void gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, + bool use_underscore, bool accessor = false); // Overridden from class be_type. diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h index f57b86b3fa3..08f24c5c2f9 100644 --- a/TAO/TAO_IDL/be_include/be_union.h +++ b/TAO/TAO_IDL/be_include/be_union.h @@ -47,7 +47,8 @@ public: virtual bool has_duplicate_case_labels (void); // Do we have at least one member with multiple case labels? - virtual void gen_ostream_operator (TAO_OutStream *os); + virtual void gen_ostream_operator (TAO_OutStream *os, + bool use_underscore); // Overridden from class be_type. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h index e1452c1dbe8..7e21d8ba284 100644 --- a/TAO/TAO_IDL/be_include/be_valuetype.h +++ b/TAO/TAO_IDL/be_include/be_valuetype.h @@ -73,7 +73,8 @@ public: char *full_name = 0); // Generate the helper functions implementation. - virtual void gen_ostream_operator (TAO_OutStream *os); + virtual void gen_ostream_operator (TAO_OutStream *os, + bool use_underscore); // Overridden from class be_type. void gen_var_out_seq_decls (void); |