diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_arg_traits.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_arg_traits.cpp | 69 |
1 files changed, 32 insertions, 37 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index d7936cbd2ed..f7a77246c3f 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -41,7 +41,6 @@ #include "be_extern.h" #include "utl_identifier.h" #include "idl_defines.h" -#include "ace/Log_Msg.h" #include <string> @@ -70,8 +69,6 @@ be_visitor_arg_traits::visit_root (be_root *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - *os << be_global->core_versioning_begin () << be_nl; - *os << be_nl << be_nl << "// Arg traits specializations." << be_nl << "namespace TAO" << be_nl @@ -88,8 +85,6 @@ be_visitor_arg_traits::visit_root (be_root *node) *os << be_uidt_nl << "}" << be_nl; - *os << be_global->core_versioning_end () << be_nl; - return 0; } @@ -163,7 +158,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node) -1); } - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -188,7 +183,7 @@ be_visitor_arg_traits::visit_interface_fwd (be_interface_fwd *node) -1); } - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -238,7 +233,7 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node) os.gen_endif (); } - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -296,7 +291,7 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node) -1); } - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -323,7 +318,7 @@ be_visitor_arg_traits::visit_valuetype_fwd (be_valuetype_fwd *node) -1); } - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -369,11 +364,11 @@ be_visitor_arg_traits::visit_operation (be_operation *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - bool wide = (str->width () != 1); + idl_bool wide = (str->width () != 1); *os << be_nl << be_nl; - bool const skel = + idl_bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); // Avoid generating a duplicate structure in the skeleton @@ -420,7 +415,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node) -1); } - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -451,7 +446,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - bool wide = (st->width () != 1); + idl_bool wide = (st->width () != 1); // It is legal IDL to declare a bounded (w)string as an operation // parameter type. There could be any number of identical @@ -462,7 +457,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node) *os << be_nl; - bool const skel = + idl_bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); // Avoid generating a duplicate structure in the skeleton when @@ -496,7 +491,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node) << "{" << be_nl << "};"; - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -532,7 +527,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - bool wide = (st->width () != 1); + idl_bool wide = (st->width () != 1); // It is legal IDL to declare a bounded (w)string as an operation // parameter type. There could be any number of identical @@ -542,7 +537,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) // parameter for Arg_Traits<>. *os << be_nl << be_nl; - bool const skel = + idl_bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); // Avoid generating a duplicate structure in the skeleton when @@ -576,7 +571,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) << "{" << be_nl << "};"; - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -618,7 +613,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node) os->gen_endif (); - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -642,7 +637,7 @@ be_visitor_arg_traits::visit_string (be_string *node) return 0; } - bool wide = (node->width () != 1); + idl_bool wide = (node->width () != 1); TAO_OutStream *os = this->ctx_->stream (); @@ -685,7 +680,7 @@ be_visitor_arg_traits::visit_string (be_string *node) delete [] bound_string; } - bool const skel = + idl_bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); // Avoid generating a duplicate structure in the skeleton when @@ -744,7 +739,7 @@ be_visitor_arg_traits::visit_string (be_string *node) os->gen_endif (); - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -833,7 +828,7 @@ be_visitor_arg_traits::visit_array (be_array *node) os->gen_endif (); - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -873,7 +868,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node) os->gen_endif (); - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -941,7 +936,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node) will not cause infinite recursion in this visitor. */ - this->generated (node, true); + this->generated (node, I_TRUE); if (this->visit_scope (node) != 0) { @@ -974,7 +969,7 @@ be_visitor_arg_traits::visit_field (be_field *node) // field *type* may not have been reached yet) and return. if (bt->base_node_type () == AST_Decl::NT_valuetype) { - node->cli_traits_gen (true); + node->cli_traits_gen (I_TRUE); return 0; } @@ -987,8 +982,8 @@ be_visitor_arg_traits::visit_field (be_field *node) -1); } - this->generated (node, true); - this->generated (bt, true); + this->generated (node, I_TRUE); + this->generated (bt, I_TRUE); return 0; } @@ -1058,7 +1053,7 @@ be_visitor_arg_traits::visit_union (be_union *node) will not cause infinite recursion in this visitor. */ - this->generated (node, true); + this->generated (node, I_TRUE); int status = this->visit_scope (node); @@ -1096,7 +1091,7 @@ be_visitor_arg_traits::visit_union_branch (be_union_branch *node) -1); } - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } @@ -1118,11 +1113,11 @@ be_visitor_arg_traits::visit_typedef (be_typedef *node) } this->ctx_->alias (0); - this->generated (node, true); + this->generated (node, I_TRUE); return 0; } -bool +idl_bool be_visitor_arg_traits::generated (be_decl *node) const { if (ACE_OS::strcmp (this->S_, "") == 0) @@ -1143,24 +1138,24 @@ be_visitor_arg_traits::generated (be_decl *node) const void be_visitor_arg_traits::generated (be_decl *node, - bool ) + idl_bool ) { if (ACE_OS::strcmp (this->S_, "") == 0) { switch (this->ctx_->state ()) { case TAO_CodeGen::TAO_ROOT_CS: - node->cli_arg_traits_gen (true); + node->cli_arg_traits_gen (I_TRUE); return; case TAO_CodeGen::TAO_ROOT_SS: - node->srv_arg_traits_gen (true); + node->srv_arg_traits_gen (I_TRUE); return; default: return; } } - node->srv_sarg_traits_gen (true); + node->srv_sarg_traits_gen (I_TRUE); } int |