diff options
Diffstat (limited to 'modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp')
-rw-r--r-- | modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index e3348ce2fa8..a293b311af7 100644 --- a/modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -184,8 +184,8 @@ be_visitor_valuebox_field_ci::visit_enum (be_enum *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "", ""); - this->emit_member_get (vb_node_, field, bt, "", "", "const", ""); + this->emit_member_set (field, bt, "", ""); + this->emit_member_get (field, bt, "", "", "const", ""); return 0; } @@ -231,7 +231,7 @@ be_visitor_valuebox_field_ci::visit_interface (be_interface *node) << ">::duplicate (val);" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node_, field, bt, "", "_ptr", "const", ".in ()"); + this->emit_member_get (field, bt, "", "_ptr", "const", ".in ()"); return 0; } @@ -277,7 +277,7 @@ be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *node) << ">::duplicate (val);" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node_, field, bt, "", "_ptr", "const", ".in ()"); + this->emit_member_get (field, bt, "", "_ptr", "const", ".in ()"); return 0; } @@ -354,19 +354,18 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node) << " = ::" << bt->name() << "::_duplicate (val);" << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node_, field, bt, " ::", "_ptr", "const", - ".in ()"); + this->emit_member_get (field, bt, " ::", "_ptr", "const", ".in ()"); break; case AST_PredefinedType::PT_any: - this->emit_member_set (vb_node_, field, bt, "const ::", " &"); - this->emit_member_get (vb_node_, field, bt, "const ::", " &", "const", ""); - this->emit_member_get (vb_node_, field, bt, " ::", " &", "", ""); + this->emit_member_set (field, bt, "const ::", " &"); + this->emit_member_get (field, bt, "const ::", " &", "const", ""); + this->emit_member_get (field, bt, " ::", " &", "", ""); break; case AST_PredefinedType::PT_void: break; default: - this->emit_member_set (vb_node_, field, bt, " ::", ""); - this->emit_member_get (vb_node_, field, bt, " ::", "", "const", ""); + this->emit_member_set (field, bt, " ::", ""); + this->emit_member_get (field, bt, " ::", "", "const", ""); break; } @@ -403,9 +402,9 @@ be_visitor_valuebox_field_ci::visit_sequence (be_sequence *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "const ", " &"); - this->emit_member_get (vb_node_, field, bt, "const ", " &", "const", ""); - this->emit_member_get (vb_node_, field, bt, "", " &", "", ""); + this->emit_member_set (field, bt, "const ", " &"); + this->emit_member_get (field, bt, "const ", " &", "const", ""); + this->emit_member_get (field, bt, "", " &", "", ""); return 0; } @@ -440,8 +439,8 @@ be_visitor_valuebox_field_ci::visit_string (be_string *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "", ""); - this->emit_member_set (vb_node_, field, bt, "const ", ""); + this->emit_member_set (field, bt, "", ""); + this->emit_member_set (field, bt, "const ", ""); *os << "// Modifier to set the member." << be_nl; @@ -463,7 +462,7 @@ be_visitor_valuebox_field_ci::visit_string (be_string *node) << " = val;" << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node_, field, bt, "const ", "", "const", ""); + this->emit_member_get (field, bt, "const ", "", "const", ""); return 0; } @@ -498,9 +497,9 @@ be_visitor_valuebox_field_ci::visit_structure (be_structure *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "const ", " &"); - this->emit_member_get (vb_node_, field, bt, "const ", " &", "const", ""); - this->emit_member_get (vb_node_, field, bt, "", " &", "", ""); + this->emit_member_set (field, bt, "const ", " &"); + this->emit_member_get (field, bt, "const ", " &", "const", ""); + this->emit_member_get (field, bt, "", " &", "", ""); return 0; } @@ -554,16 +553,15 @@ be_visitor_valuebox_field_ci::visit_union (be_union *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "const ", " &"); - this->emit_member_get (vb_node_, field, bt, "const ", " &", "const", ""); - this->emit_member_get (vb_node_, field, bt, "", " &", "", ""); + this->emit_member_set (field, bt, "const ", " &"); + this->emit_member_get (field, bt, "const ", " &", "const", ""); + this->emit_member_get (field, bt, "", " &", "", ""); return 0; } void -be_visitor_valuebox_field_ci::emit_member_set (be_decl *vb_node_, - be_decl *field, +be_visitor_valuebox_field_ci::emit_member_set (be_decl *field, be_type *field_type, const char *const_arg, const char *arg_modifier) @@ -583,8 +581,7 @@ be_visitor_valuebox_field_ci::emit_member_set (be_decl *vb_node_, } void -be_visitor_valuebox_field_ci::emit_member_get (be_decl *vb_node_, - be_decl *field, +be_visitor_valuebox_field_ci::emit_member_get (be_decl *field, be_type *field_type, const char *const_prefix, const char *type_suffix, |