diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_valuebox')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp | 3 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp | 3 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp | 5 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp | 27 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp | 28 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp | 28 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp | 31 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp | 21 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp | 24 |
10 files changed, 57 insertions, 117 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp index 7d17a24f206..4c2220eac59 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp @@ -39,8 +39,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node) TAO_OutStream *os = this->ctx_->stream (); const char *macro = this->ctx_->export_macro (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); be_module *module = nullptr; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp index 082faf2daf5..ec440763a71 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp @@ -42,8 +42,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) // Generate the Any <<= and >>= operator declarations - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); *os << be_global->core_versioning_begin () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp index 30afffb23ee..5eba86429a6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp @@ -34,9 +34,7 @@ be_visitor_valuebox_cdr_op_ch::visit_valuebox (be_valuebox *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 - << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); *os << be_global->core_versioning_begin () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp index b1dd90b58f9..06f1f396911 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp @@ -37,10 +37,9 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node) TAO_OutStream *os = this->ctx_->stream (); node->cli_stub_cdr_op_gen (true); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); -*os << be_global->core_versioning_begin () << be_nl; + *os << be_global->core_versioning_begin () << be_nl; // Set the sub state as generating code for the output operator. this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT); diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp index fa546645e9b..30516f8ea3d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -122,8 +122,7 @@ be_visitor_valuebox_field_ch::visit_array (be_array *node) } - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); *os << "void " << field->local_name () << " (" << fname << ");" << be_nl; @@ -160,8 +159,7 @@ be_visitor_valuebox_field_ch::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", ""); this->emit_member_get (field, bt, "", "", "const"); @@ -196,8 +194,7 @@ be_visitor_valuebox_field_ch::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", "_ptr"); this->emit_member_get (field, bt, "", "_ptr", "const"); @@ -232,8 +229,7 @@ be_visitor_valuebox_field_ch::visit_interface_fwd (be_interface_fwd *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", "_ptr"); this->emit_member_get (field, bt, "", "_ptr", "const"); @@ -282,8 +278,7 @@ be_visitor_valuebox_field_ch::visit_predefined_type (be_predefined_type *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); switch (node->pt ()) { @@ -335,8 +330,7 @@ be_visitor_valuebox_field_ch::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "const ", " &"); this->emit_member_get (field, bt, "const ", " &", "const"); @@ -373,8 +367,7 @@ be_visitor_valuebox_field_ch::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", ""); this->emit_member_set (field, bt, "const ", ""); @@ -424,8 +417,7 @@ be_visitor_valuebox_field_ch::visit_structure (be_structure *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "const ", " &"); this->emit_member_get (field, bt, "const ", " &", "const"); @@ -484,8 +476,7 @@ be_visitor_valuebox_field_ch::visit_union (be_union *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "const ", " &"); this->emit_member_get (field, bt, "const ", " &", "const"); diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index 31bbb25ea69..befadc961dc 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -120,8 +120,7 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node) bt->full_name ()); } - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); *os << "/// Modifier to set the member." << be_nl; @@ -174,9 +173,7 @@ be_visitor_valuebox_field_ci::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; - + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", ""); this->emit_member_get (field, bt, "", "", "const", ""); @@ -211,8 +208,7 @@ be_visitor_valuebox_field_ci::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); *os << "// Modifier to set the member." << be_nl; @@ -257,8 +253,7 @@ be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); *os << "// Modifier to set the member." << be_nl; @@ -331,8 +326,7 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); switch (node->pt ()) { @@ -393,8 +387,7 @@ be_visitor_valuebox_field_ci::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "const ", " &"); this->emit_member_get (field, bt, "const ", " &", "const", ""); @@ -430,8 +423,7 @@ be_visitor_valuebox_field_ci::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", ""); this->emit_member_set (field, bt, "const ", ""); @@ -488,8 +480,7 @@ be_visitor_valuebox_field_ci::visit_structure (be_structure *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "const ", " &"); this->emit_member_get (field, bt, "const ", " &", "const", ""); @@ -544,8 +535,7 @@ be_visitor_valuebox_field_ci::visit_union (be_union *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "const ", " &"); this->emit_member_get (field, bt, "const ", " &", "const", ""); diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp index 562a4fa0dea..18c7a86cf41 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp @@ -118,8 +118,7 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node) bt->full_name ()); } - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); *os << "/// Modifier to set the member." << be_nl; @@ -171,9 +170,7 @@ be_visitor_valuebox_union_member_ci::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; - + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", ""); this->emit_member_get (field, bt, "", "", "const"); @@ -208,8 +205,7 @@ be_visitor_valuebox_union_member_ci::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", "_ptr"); this->emit_member_get (field, bt, "", "_ptr", "const"); @@ -244,8 +240,7 @@ be_visitor_valuebox_union_member_ci::visit_interface_fwd (be_interface_fwd *node TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", "_ptr"); this->emit_member_get (field, bt, "", "_ptr", "const"); @@ -294,8 +289,7 @@ be_visitor_valuebox_union_member_ci::visit_predefined_type (be_predefined_type * TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); switch (node->pt ()) { @@ -347,8 +341,7 @@ be_visitor_valuebox_union_member_ci::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "const ", " &"); this->emit_member_get (field, bt, "const ", " &", "const"); @@ -384,8 +377,7 @@ be_visitor_valuebox_union_member_ci::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "", ""); this->emit_member_set (field, bt, "const ", ""); @@ -442,8 +434,7 @@ be_visitor_valuebox_union_member_ci::visit_structure (be_structure *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "const ", " &"); this->emit_member_get (field, bt, "const ", " &", "const"); @@ -498,8 +489,7 @@ be_visitor_valuebox_union_member_ci::visit_union (be_union *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_member_set (field, bt, "const ", " &"); this->emit_member_get (field, bt, "const ", " &", "const"); diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp index 63fbc5addff..9fde836d8b6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -37,8 +37,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) this->ctx_->node (node); // save the node - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); *os << be_nl_2 << "class " << node->local_name () << ";" ; @@ -110,8 +109,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) -1); } - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); // Generate the "protected" destructor @@ -163,8 +161,7 @@ be_visitor_valuebox_ch::visit_array (be_array *node) { TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl; + TAO_INSERT_COMMENT (os); this->emit_default_constructor(); @@ -282,8 +279,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) // Indicate that this type has been used as a sequence element. bt->seen_in_sequence (true); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); this->emit_default_constructor(); @@ -402,8 +398,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node) // Retrieve the node being visited by this be_visitor_valuebox_ch. be_decl * vb_node = this->ctx_->node (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); this->emit_default_constructor (); this->emit_constructor_one_arg (node, "", "", ""); @@ -474,8 +469,7 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node) { TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); this->emit_default_constructor(); @@ -542,8 +536,7 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node) } } - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); // Member variable of underlying type; this->emit_boxed_member_var (node, "_var"); @@ -576,8 +569,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node) { TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); this->emit_default_constructor(); @@ -668,9 +660,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node) -1); } - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; - + TAO_INSERT_COMMENT (os); // Member variable of underlying type; this->emit_boxed_member_var (node, "_var"); @@ -686,8 +676,7 @@ be_visitor_valuebox_ch::emit_for_predef_enum (be_type *node, { TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); this->emit_default_constructor (); diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index 1e1f560c15c..429e571b166 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -45,8 +45,7 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node) -1); } - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl; + TAO_INSERT_COMMENT (os); *os << "ACE_INLINE const char*" << be_nl << node->name () << "::_tao_obv_static_repository_id ()" << be_nl @@ -68,8 +67,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node) // Retrieve the node being visited by this be_visitor_valuebox_ch. be_decl * vb_node = this->ctx_->node (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); // Public default constructor *os << "ACE_INLINE" << be_nl @@ -216,8 +214,7 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node) // Retrieve the node being visited by this be_visitor_valuebox_ch. be_decl * vb_node = this->ctx_->node (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_default_constructor_alloc (node); this->emit_constructor_one_arg_alloc (node); @@ -278,8 +275,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Retrieve the node being visited by this be_visitor_valuebox_ch. be_decl * vb_node = this->ctx_->node (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_default_constructor (); this->emit_constructor_one_arg (node, ""); @@ -394,8 +390,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node) { TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_default_constructor_alloc (node); this->emit_constructor_one_arg_alloc (node); @@ -475,8 +470,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) { TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); this->emit_default_constructor_alloc (node); this->emit_constructor_one_arg_alloc (node); @@ -575,8 +569,7 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, // Retrieve the node being visited by this be_visitor_valuebox_ci. be_decl * vb_node = this->ctx_->node (); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); if (is_any) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp index 91d897f3cd4..25c627a1d8f 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -48,8 +48,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) this->ctx_->node (node); // save the node - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + TAO_INSERT_COMMENT (os); if (node->is_defined ()) { @@ -334,8 +333,7 @@ be_visitor_valuebox_cs::visit_array (be_array * node) // Retrieve the node being visited by this be_visitor_valuebox_cs. be_decl * const vb_node = this->ctx_->node (); - os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (&os); this->emit_destructor (); @@ -360,8 +358,7 @@ be_visitor_valuebox_cs::visit_enum (be_enum *) // Retrieve the node being visited by this be_visitor_valuebox_cs. be_decl * const vb_node = this->ctx_->node (); - os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (&os); this->emit_destructor (); @@ -477,8 +474,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) ctx.state (TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH); be_visitor_sequence_buffer_type bt_visitor (&ctx); - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (os); if (node->unbounded ()) { @@ -631,8 +627,7 @@ be_visitor_valuebox_cs::visit_string (be_string *str) // Retrieve the node being visited by this be_visitor_valuebox_cs. be_decl * const vb_node = this->ctx_->node (); - os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (&os); this->emit_destructor (); @@ -677,8 +672,7 @@ be_visitor_valuebox_cs::visit_structure (be_structure *) // Retrieve the node being visited by this be_visitor_valuebox_cs. be_decl * const vb_node = this->ctx_->node (); - os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (&os); this->emit_destructor (); @@ -719,8 +713,7 @@ be_visitor_valuebox_cs::visit_union (be_union *) // Retrieve the node being visited by this be_visitor_valuebox_cs. be_decl * const vb_node = this->ctx_->node (); - os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (&os); this->emit_destructor (); @@ -756,8 +749,7 @@ be_visitor_valuebox_cs::emit_for_predef_enum (char const * marshal_arg) // Retrieve the node being visited by this be_visitor_valuebox_cs. be_decl * const vb_node = this->ctx_->node (); - os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; + TAO_INSERT_COMMENT (&os); this->emit_destructor (); |