diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-17 08:35:56 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-17 08:35:56 +0000 |
| commit | bdd31e4d7374fb4f1cbb745021e90dd9f2e8e6d2 (patch) | |
| tree | 24d08fa33165c20198fe9658efe3bda6fbe292ac /TAO/TAO_IDL/be | |
| parent | e8cc76aad5f556c77963836aacfe813876795059 (diff) | |
| download | ATCD-bdd31e4d7374fb4f1cbb745021e90dd9f2e8e6d2.tar.gz | |
Removed trailing whitespaces
Diffstat (limited to 'TAO/TAO_IDL/be')
208 files changed, 1198 insertions, 1198 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 02c1c368c97..0ee1bec8075 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -292,7 +292,7 @@ TAO_CodeGen::start_client_header (const char *fname) *this->client_header_ << "\n#include <string>" << "\n#include <vector>\n"; } - + this->gen_stub_hdr_includes (); size_t const nfiles = idl_global->n_included_idl_files (); @@ -350,7 +350,7 @@ TAO_CodeGen::start_client_header (const char *fname) } } } - + for (ACE_Unbounded_Queue<char *>::CONST_ITERATOR i ( idl_global->ciao_ami_idl_fnames ()); !i.done (); @@ -358,7 +358,7 @@ TAO_CodeGen::start_client_header (const char *fname) { char **tmp = 0; i.next (tmp); - + // Make a String out of it. UTL_String idl_name_str (*tmp); @@ -964,7 +964,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) if (got_tao_pidl) { const char *stub_incl_dir = be_global->stub_include_dir (); - + if (stub_incl_dir == 0) { tao_prefix = "tao/"; @@ -975,7 +975,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) tao_prefix += '/'; } } - + // Generate the include statement for the client header. We just // need to put only the base names. Path info is not required. if (be_global->safe_include ()) @@ -1054,7 +1054,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) } } } - + *this->anyop_header_ << "\n"; // Begin versioned namespace support after initial headers have been @@ -1868,7 +1868,7 @@ TAO_CodeGen::end_server_header (void) /// Otherwise just generate the post_include(), if any, /// and the #endif. if (be_global->gen_skel_files ()) - { + { // End versioned namespace support. Do not place include directives // before this. *os << be_global->versioning_end (); @@ -1904,7 +1904,7 @@ TAO_CodeGen::end_server_header (void) *os << be_nl << be_nl << "#endif /* ifndef */\n" << "\n"; - + return 0; } @@ -2900,7 +2900,7 @@ TAO_CodeGen::gen_stub_src_includes (void) { this->gen_standard_include (this->client_stubs_, "tao/Vector_CDR_T.h"); - + if (be_global->any_support ()) { this->gen_standard_include ( @@ -2908,7 +2908,7 @@ TAO_CodeGen::gen_stub_src_includes (void) "tao/AnyTypeCode/Vector_AnyOp_T.h"); } } - + // Includes whatever arg helper template classes that may be needed. this->gen_stub_arg_file_includes (this->client_stubs_); @@ -3557,16 +3557,16 @@ TAO_CodeGen::gen_exec_idl_includes (void) "ccm/CCM_Object.idl"); if (!be_global->gen_lwccm ()) - { + { this->gen_standard_include ( this->ciao_exec_idl_, "ccm/CCM_Enumeration.idl"); } - + this->gen_standard_include ( this->ciao_exec_idl_, "ccm/CCM_CCMException.idl"); - + this->gen_standard_include ( this->ciao_exec_idl_, "ccm/CCM_HomeExecutorBase.idl"); @@ -3578,7 +3578,7 @@ TAO_CodeGen::gen_exec_idl_includes (void) this->gen_standard_include ( this->ciao_exec_idl_, "ccm/CCM_SessionComponent.idl"); - + if (be_global->ami4ccm_call_back ()) { this->gen_standard_include ( @@ -3598,11 +3598,11 @@ TAO_CodeGen::gen_exec_idl_includes (void) riter.advance ()) { riter.next (path_tmp); - + const char *exec_idl_fname = be_global->be_get_ciao_exec_idl_fname (true); - - /// No need to have the exec IDL file include itself. + + /// No need to have the exec IDL file include itself. if (ACE_OS::strcmp (*path_tmp, exec_idl_fname) != 0) { this->gen_standard_include (this->ciao_exec_idl_, @@ -3686,7 +3686,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) iiter.advance ()) { iiter.next (path_tmp); - + this->gen_standard_include ( this->ciao_conn_header_, *path_tmp); @@ -3698,7 +3698,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) this->ciao_conn_header_, "tao/LocalObject.h"); } - + for (size_t j = 0; j < idl_global->n_included_idl_files (); ++j) { if (j == 0) @@ -3708,7 +3708,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) char * const idl_name = idl_global->included_idl_files ()[j]; - + bool system_file = ACE_OS::strcmp (idl_name, "Components.idl") == 0 || ACE_OS::strcmp ( @@ -3725,10 +3725,10 @@ TAO_CodeGen::gen_conn_hdr_includes (void) this->gen_standard_include ( this->ciao_conn_header_, BE_GlobalData::be_get_server_hdr (&str, true)); - + str.destroy (); } - + this->gen_standard_include ( this->ciao_conn_header_, BE_GlobalData::be_get_ciao_exec_stub_header ( diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp index b4e1a8171f5..9d2cd33ab31 100644 --- a/TAO/TAO_IDL/be/be_component.cpp +++ b/TAO/TAO_IDL/be/be_component.cpp @@ -201,27 +201,27 @@ be_component::scan (UTL_Scope *s) case AST_Decl::NT_provides: ++this->n_provides_; p = AST_Provides::narrow_from_decl (d); - + if (!p->provides_type ()->is_local ()) { ++this->n_remote_provides_; } - + continue; case AST_Decl::NT_uses: ++this->n_uses_; u = AST_Uses::narrow_from_decl (d); - + if (u->is_multiple ()) { this->has_uses_multiple_ = true; } - + if (!u->uses_type ()->is_local ()) { ++this->n_remote_uses_; } - + continue; case AST_Decl::NT_publishes: ++this->n_publishes_; @@ -242,24 +242,24 @@ be_component::scan (UTL_Scope *s) continue; case AST_Decl::NT_attr: a = AST_Attribute::narrow_from_decl (d);; - + if (!a->readonly ()) { my_nt = this->node_type (); scope_nt = ScopeAsDecl (a->defined_in ())->node_type (); - + /// Attributes coming from a porttype appear - /// only on connectors. + /// only on connectors. if (my_nt == AST_Decl::NT_component && scope_nt == AST_Decl::NT_porttype) { continue; } - + this->has_rw_attributes_ = true; } - + continue; default: continue; @@ -297,7 +297,7 @@ be_component::gen_stub_inheritance (TAO_OutStream *os) if (nsupports > 0) { *os << be_idt; - + AST_Type **supp_list = this->supports (); for (long i = 0; i < nsupports; ++i) @@ -309,7 +309,7 @@ be_component::gen_stub_inheritance (TAO_OutStream *os) *os << be_uidt; } - + *os << be_uidt; } @@ -364,7 +364,7 @@ be_component::gen_is_a_ancestors (TAO_OutStream *os) << "value," << be_nl << "\"IDL:omg.org/Components/CCMObject:1.0\"" << be_uidt_nl << ") == 0" << be_uidt << be_uidt_nl; - + return 0; } @@ -399,31 +399,31 @@ be_component::mirror_scan (AST_PortType *pt) case AST_Decl::NT_provides: ++this->n_uses_; p = AST_Provides::narrow_from_decl (d); - + if (!p->provides_type ()->is_local ()) { ++this->n_remote_uses_; } - + continue; case AST_Decl::NT_uses: ++this->n_provides_; u = AST_Uses::narrow_from_decl (d); - + if (!u->uses_type ()->is_local ()) { ++this->n_remote_provides_; } - + continue; case AST_Decl::NT_attr: a = AST_Attribute::narrow_from_decl (d);; - + if (!a->readonly ()) { this->has_rw_attributes_ = true; } - + continue; default: continue; diff --git a/TAO/TAO_IDL/be/be_connector.cpp b/TAO/TAO_IDL/be/be_connector.cpp index eed6949227c..fd7742e25a4 100644 --- a/TAO/TAO_IDL/be/be_connector.cpp +++ b/TAO/TAO_IDL/be/be_connector.cpp @@ -93,11 +93,11 @@ be_connector::check_ancestors (void) /// (2010-05-05) putting derived DDS4CCM connector declarations /// in application IDL. AST_Connector *base = this; - + while (base != 0) { const char *base_fname = base->full_name (); - + if (ACE_OS::strcmp (base_fname, "CCM_DDS::DDS_TopicBase") == 0) { this->dds_connector_ = true; @@ -110,7 +110,7 @@ be_connector::check_ancestors (void) idl_global->ami_connector_seen_ = true; break; } - + base = base->base_connector (); } } diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp index 1bc36f1f7a1..8e1acae31ac 100644 --- a/TAO/TAO_IDL/be/be_enum.cpp +++ b/TAO/TAO_IDL/be/be_enum.cpp @@ -57,16 +57,16 @@ be_enum::gen_ostream_operator (TAO_OutStream *os, << "{" << be_idt_nl << "switch (_tao_enumerator)" << be_idt_nl << "{" << be_idt_nl; - + for (int i = 0; i < this->member_count (); ++i) { UTL_ScopedName *mname = this->value_to_name (static_cast<unsigned long> (i)); - + *os << "case " << mname << ": return strm << \"" << mname << "\";" << be_nl; } - + *os << "default: return strm;" << be_uidt_nl << "}" << be_uidt << be_uidt_nl << "}" << be_nl; diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp index 5d3d1679097..e8bc0c3f6ec 100644 --- a/TAO/TAO_IDL/be/be_factory.cpp +++ b/TAO/TAO_IDL/be/be_factory.cpp @@ -48,7 +48,7 @@ be_factory::destroy (void) // Call the destroy methods of our base classes. this->be_scope::destroy (); this->be_decl::destroy (); - + this->AST_Factory::destroy (); } diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp index 199e6cfbb47..bbe80f14e73 100644 --- a/TAO/TAO_IDL/be/be_field.cpp +++ b/TAO/TAO_IDL/be/be_field.cpp @@ -37,7 +37,7 @@ be_field::be_field (AST_Type *ft, // This covers valuetype fields as well, which is what we want. AST_Decl::NodeType nt = ft->unaliased_type ()->node_type (); - + if (nt == AST_Decl::NT_string || nt == AST_Decl::NT_wstring) { idl_global->string_member_seen_ = true; diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index d6ad8bc02f0..aca95d1012e 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -217,11 +217,11 @@ be_generator::create_interface (UTL_ScopedName *n, l, a), 0); - + /// Trigger this interation over the included pragmas when the /// first local interface is seen in the main file. In an /// executor IDL file (the case we want), this happens near the - /// top. In other files, it will do no harm. + /// top. In other files, it will do no harm. if (l && idl_global->in_main_file ()) { FE_Utils::create_implied_ami_uses_stuff (); @@ -982,8 +982,8 @@ be_generator::create_provides (UTL_ScopedName *n, be_provides (n, provides_type), 0); - - return retval; + + return retval; } AST_Uses * @@ -997,8 +997,8 @@ be_generator::create_uses (UTL_ScopedName *n, uses_type, is_multiple), 0); - - return retval; + + return retval; } AST_Publishes * @@ -1010,8 +1010,8 @@ be_generator::create_publishes (UTL_ScopedName *n, be_publishes (n, publishes_type), 0); - - return retval; + + return retval; } AST_Emits * @@ -1023,8 +1023,8 @@ be_generator::create_emits (UTL_ScopedName *n, be_emits (n, emits_type), 0); - - return retval; + + return retval; } AST_Consumes * be_generator::create_consumes (UTL_ScopedName *n, @@ -1035,8 +1035,8 @@ be_generator::create_consumes (UTL_ScopedName *n, be_consumes (n, consumes_type), 0); - - return retval; + + return retval; } AST_Extended_Port * @@ -1049,8 +1049,8 @@ be_generator::create_extended_port ( be_extended_port (n, porttype_ref), 0); - - return retval; + + return retval; } AST_Mirror_Port * @@ -1063,8 +1063,8 @@ be_generator::create_mirror_port ( be_mirror_port (n, porttype_ref), 0); - - return retval; + + return retval; } AST_Connector * @@ -1077,7 +1077,7 @@ be_generator::create_connector ( be_connector (n, base_connector), 0); - + return retval; } @@ -1091,10 +1091,10 @@ be_generator::create_template_module ( be_template_module (n, template_params), 0); - + return retval; } - + AST_Template_Module_Inst * be_generator::create_template_module_inst ( UTL_ScopedName *n, @@ -1107,10 +1107,10 @@ be_generator::create_template_module_inst ( ref, template_args), 0); - + return retval; } - + AST_Template_Module_Ref * be_generator::create_template_module_ref ( UTL_ScopedName *n, @@ -1123,10 +1123,10 @@ be_generator::create_template_module_ref ( ref, param_refs), 0); - + return retval; } - + AST_Param_Holder * be_generator::create_param_holder ( UTL_ScopedName *parameter_name, @@ -1137,7 +1137,7 @@ be_generator::create_param_holder ( be_param_holder (parameter_name, info), 0); - + return retval; } diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 3b72e95f6c7..25f4a8e236e 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -275,7 +275,7 @@ BE_GlobalData::be_get_client_hdr (UTL_String *idl_file_name, ACE_CString fn (idl_file_name->get_string ()); ACE_CString fn_ext = fn.substr (fn.length () - 5); bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL"); - + if (!orb_file && !be_global->gen_custom_ending () && FE_Utils::validate_orb_include (idl_file_name)) { @@ -313,7 +313,7 @@ BE_GlobalData::be_get_server_hdr (UTL_String *idl_file_name, ACE_CString fn (idl_file_name->get_string ()); ACE_CString fn_ext = fn.substr (fn.length () - 5); bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL"); - + if (!orb_file && !be_global->gen_custom_ending () && FE_Utils::validate_orb_include (idl_file_name)) { @@ -1983,7 +1983,7 @@ BE_GlobalData:: void_type (void) AST_Decl *d = idl_global->root ()->lookup_primitive_type ( AST_Expression::EV_void); - + this->void_type_ = AST_PredefinedType::narrow_from_decl (d); } @@ -2839,7 +2839,7 @@ BE_GlobalData::parse_args (long &i, char **av) else if (av[i][2] == 'M') { // AMI4CCM calls implicit option 'C': AMI with Call back. - be_global->ami_call_back (true); + be_global->ami_call_back (true); // Generate tie classes and files be_global->ami4ccm_call_back (true); } diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index 22e14bf6221..5b7ac575488 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -82,7 +82,7 @@ TAO_OutStream::TAO_OutStream (void) { this->tab_unit_str_ += ' '; } - + this->tab_unit_ = this->tab_unit_str_.c_str (); } @@ -486,14 +486,14 @@ TAO_OutStream& TAO_OutStream::print (AST_Expression *expr) { AST_Expression::AST_ExprValue *ev = expr->ev (); - + /// Never happens as far as I know, but just in case... if (ev == 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO_OutStream::print() - ") ACE_TEXT ("expression not evaluated\n"))); - + return *this; } diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp index 77e294b4ffd..cecee18c8cb 100644 --- a/TAO/TAO_IDL/be/be_home.cpp +++ b/TAO/TAO_IDL/be/be_home.cpp @@ -102,7 +102,7 @@ be_home::scan (UTL_Scope *s) AST_Decl *d = i.item (); AST_Attribute *attr = AST_Attribute::narrow_from_decl (d); - + if (attr != 0 && ! attr->readonly ()) { this->has_rw_attributes_ = true; @@ -123,67 +123,67 @@ be_home::destroy (void) { delete [] this->full_skel_name_; this->full_skel_name_ = 0; - + delete [] this->full_coll_name_; this->full_coll_name_ = 0; - + delete [] this->local_coll_name_; this->local_coll_name_ = 0; - + delete [] this->relative_skel_name_; this->relative_skel_name_ = 0; - + delete [] this->base_proxy_impl_name_; this->base_proxy_impl_name_ = 0; - + delete [] this->remote_proxy_impl_name_; this->remote_proxy_impl_name_ = 0; - + delete [] this->direct_proxy_impl_name_; this->direct_proxy_impl_name_ = 0; - + delete [] this->full_base_proxy_impl_name_; this->full_base_proxy_impl_name_ = 0; - + delete [] this->full_remote_proxy_impl_name_; this->full_remote_proxy_impl_name_ = 0; - + delete [] this->full_direct_proxy_impl_name_; this->full_direct_proxy_impl_name_ = 0; - + delete [] this->base_proxy_broker_; this->base_proxy_broker_ = 0; - + delete [] this->remote_proxy_broker_; this->remote_proxy_broker_ = 0; - + delete [] this->strategized_proxy_broker_; this->strategized_proxy_broker_ = 0; - + delete [] this->full_base_proxy_broker_name_; this->full_base_proxy_broker_name_ = 0; - + delete [] this->full_remote_proxy_broker_name_; this->full_remote_proxy_broker_name_ = 0; - + delete [] this->full_strategized_proxy_broker_name_; this->full_strategized_proxy_broker_name_ = 0; - + delete [] this->client_scope_; this->client_scope_ = 0; - + delete [] this->flat_client_scope_; this->flat_client_scope_ = 0; - + delete [] this->server_scope_; this->server_scope_ = 0; - + delete [] this->flat_server_scope_; this->flat_server_scope_ = 0; - + this->be_scope::destroy (); this->be_type::destroy (); - + // This skips AST_Interface, for the reason above. this->AST_Home::destroy (); } diff --git a/TAO/TAO_IDL/be/be_identifier_helper.cpp b/TAO/TAO_IDL/be/be_identifier_helper.cpp index af6ab6bfb32..87d6210514b 100644 --- a/TAO/TAO_IDL/be/be_identifier_helper.cpp +++ b/TAO/TAO_IDL/be/be_identifier_helper.cpp @@ -78,7 +78,7 @@ IdentifierHelper::original_local_name (Identifier * local_name) { Identifier * id = 0; const char *lname = local_name->get_string (); - + // Remove _cxx_ if: // 1. it occurs and // 2. it occurs at the beginning of the string and @@ -86,10 +86,10 @@ IdentifierHelper::original_local_name (Identifier * local_name) if (ACE_OS::strstr (lname, "_cxx_") == lname) { TAO_IDL_CPP_Keyword_Table cpp_key_tbl; - + unsigned int len = static_cast<unsigned int> (ACE_OS::strlen (lname + 5)); - + const TAO_IDL_CPP_Keyword_Entry *entry = cpp_key_tbl.lookup (lname + 5, len); @@ -101,12 +101,12 @@ IdentifierHelper::original_local_name (Identifier * local_name) 0); } } - + if (id == 0) { id = local_name->copy (); } - + return id; } @@ -133,9 +133,9 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl) for_idl ? IdentifierHelper::original_local_name (i.item ()) : i.item ()->copy (); - + i.next (); - + // Append the identifier. retval += for_idl @@ -154,12 +154,12 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl) second = true; } } - + id->destroy (); delete id; id = 0; } - + return retval; } @@ -175,7 +175,7 @@ IdentifierHelper::is_idl_keyword (Identifier * local_name) return !idl_global->idl_keywords ().find (ext_id); } -ACE_CString +ACE_CString IdentifierHelper::try_escape (Identifier * local_name) { ACE_CString s_local_name (local_name->get_string ()); diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index bf414c03ce7..6a49393a389 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -216,7 +216,7 @@ be_interface::compute_full_skel_name (const char *prefix, { return; } - + size_t namelen = ACE_OS::strlen (prefix); long first = true; long second = false; @@ -787,24 +787,24 @@ be_interface:: gen_var_out_seq_decls (void) // Generate the ifdefined macro for this interface. os->gen_ifdef_macro (this->flat_name (), "var_out"); - + // Need this clunky string compare for when we are processing // the *A.idl file. The *_sendc operations are generated in // a separate interface distinguished only by the AMI4CCM_ // prefix. Since it does not come from implied IDL (in this // execution of the IDL compiler) there is nothing // to tell the IDL compiler that this interface is in any - // way special. All we can do is search for the prefix. + // way special. All we can do is search for the prefix. ACE_CString test (lname, 0, false); bool has_ami4ccm_prefix = (test.find ("AMI4CCM_") == 0); - + bool already_ami = (this->is_ami_rh () || this->is_ami4ccm_rh () || has_ami4ccm_prefix); - + /// Forward declare the handler interface before declaring - /// the original interface. + /// the original interface. if (be_global->ami_call_back () && !already_ami) { @@ -1210,7 +1210,7 @@ be_interface::gen_operation_table (const char *flat_name, *os << "_repository_id,&" << skeleton_class_name << "::_repository_id_skel, 0" << be_nl; - + ++this->skel_count_; } @@ -1303,12 +1303,12 @@ be_interface::gen_optable_entries (be_interface *derived_interface, { be_operation *op = be_operation::narrow_from_decl (d); - + if (op->is_sendc_ami ()) { continue; } - + // We are an operation node. *os << "{\"" << d->original_local_name () << "\", &" << full_skeleton_name << "::" @@ -1404,12 +1404,12 @@ be_interface::gen_optable_entries (be_interface *derived_interface, { be_operation *op = be_operation::narrow_from_decl (d); - + if (op->is_sendc_ami ()) { continue; } - + // Generate operation name. // We are an operation node. We use the original @@ -1869,7 +1869,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) "fclose"), -1); } - + // And reset file to 0 because otherwise there is a problem during destruction of stream. tao_cg->gperf_input_stream ()->file () = 0; @@ -2212,13 +2212,13 @@ be_interface::gen_skel_helper (be_interface *derived, { be_operation *op = be_operation::narrow_from_decl (d); - - /// These are not generated on the server side. + + /// These are not generated on the server side. if (op->is_sendc_ami ()) { continue; } - + *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ @@ -2273,7 +2273,7 @@ be_interface::gen_skel_helper (be_interface *derived, { return -1; } - + *os << be_nl << be_nl; if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR) @@ -2481,7 +2481,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived, if (nt == AST_Decl::NT_op) { op = be_operation::narrow_from_decl (d); - + /// Skip these on the skeleton side. if (op->is_sendc_ami ()) { @@ -2697,64 +2697,64 @@ be_interface::destroy (void) { delete [] this->full_skel_name_; this->full_skel_name_ = 0; - + delete [] this->full_coll_name_; this->full_coll_name_ = 0; - + delete [] this->local_coll_name_; this->local_coll_name_ = 0; - + delete [] this->relative_skel_name_; this->relative_skel_name_ = 0; - + delete [] this->base_proxy_impl_name_; this->base_proxy_impl_name_ = 0; - + delete [] this->remote_proxy_impl_name_; this->remote_proxy_impl_name_ = 0; - + delete [] this->direct_proxy_impl_name_; this->direct_proxy_impl_name_ = 0; - + delete [] this->full_base_proxy_impl_name_; this->full_base_proxy_impl_name_ = 0; - + delete [] this->full_remote_proxy_impl_name_; this->full_remote_proxy_impl_name_ = 0; - + delete [] this->full_direct_proxy_impl_name_; this->full_direct_proxy_impl_name_ = 0; - + delete [] this->base_proxy_broker_; this->base_proxy_broker_ = 0; - + delete [] this->remote_proxy_broker_; this->remote_proxy_broker_ = 0; - + delete [] this->strategized_proxy_broker_; this->strategized_proxy_broker_ = 0; - + delete [] this->full_base_proxy_broker_name_; this->full_base_proxy_broker_name_ = 0; - + delete [] this->full_remote_proxy_broker_name_; this->full_remote_proxy_broker_name_ = 0; - + delete [] this->full_strategized_proxy_broker_name_; this->full_strategized_proxy_broker_name_ = 0; - + delete [] this->client_scope_; this->client_scope_ = 0; - + delete [] this->flat_client_scope_; this->flat_client_scope_ = 0; - + delete [] this->server_scope_; this->server_scope_ = 0; - + delete [] this->flat_server_scope_; this->flat_server_scope_ = 0; - + // Call the destroy methods of our base classes. this->AST_Interface::destroy (); this->be_scope::destroy (); @@ -2932,13 +2932,13 @@ be_interface::gen_stub_inheritance (TAO_OutStream *os) if (nparents > 0) { *os << be_idt; - + AST_Type **parents = this->inherits (); for (i = 0; i < nparents; ++i) { AST_Type *parent = parents[i]; - + if (! parent->is_abstract ()) { has_concrete_parent = true; @@ -3416,7 +3416,7 @@ be_interface::base_proxy_impl_name (void) this->local_name (), this->suffix_table_[PROXY_IMPL]); } - + return this->base_proxy_impl_name_; } @@ -3430,7 +3430,7 @@ be_interface::full_base_proxy_impl_name (void) this->base_proxy_impl_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_base_proxy_impl_name_, char[length + 1], 0); @@ -3440,7 +3440,7 @@ be_interface::full_base_proxy_impl_name (void) ACE_OS::strcat (this->full_base_proxy_impl_name_, base_name); } - + return this->full_base_proxy_impl_name_; } @@ -3456,7 +3456,7 @@ be_interface::remote_proxy_impl_name (void) this->suffix_table_[PROXY_IMPL], this->tag_table_[REMOTE]); } - + return this->remote_proxy_impl_name_; } @@ -3469,7 +3469,7 @@ be_interface::full_remote_proxy_impl_name (void) const char *base_name = this->remote_proxy_impl_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_remote_proxy_impl_name_, char[length + 1], 0); @@ -3479,7 +3479,7 @@ be_interface::full_remote_proxy_impl_name (void) ACE_OS::strcat (this->full_remote_proxy_impl_name_, base_name); } - + return this->full_remote_proxy_impl_name_; } @@ -3495,7 +3495,7 @@ be_interface::direct_proxy_impl_name (void) this->suffix_table_[PROXY_IMPL], this->tag_table_[DIRECT]); } - + return this->direct_proxy_impl_name_; } @@ -3509,7 +3509,7 @@ be_interface::full_direct_proxy_impl_name (void) size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_direct_proxy_impl_name_, char[length + 1], 0); @@ -3519,7 +3519,7 @@ be_interface::full_direct_proxy_impl_name (void) ACE_OS::strcat (this->full_direct_proxy_impl_name_, base_name); } - + return this->full_direct_proxy_impl_name_; } @@ -3535,7 +3535,7 @@ be_interface::base_proxy_broker_name (void) this->local_name (), this->suffix_table_[PROXY_BROKER]); } - + return this->base_proxy_broker_; } @@ -3548,7 +3548,7 @@ be_interface::full_base_proxy_broker_name (void) const char *base_name = this->base_proxy_broker_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_base_proxy_broker_name_, char[length + 1], 0); @@ -3558,7 +3558,7 @@ be_interface::full_base_proxy_broker_name (void) ACE_OS::strcat (this->full_base_proxy_broker_name_, base_name); } - + return this->full_base_proxy_broker_name_; } @@ -3575,7 +3575,7 @@ be_interface::remote_proxy_broker_name (void) this->suffix_table_[PROXY_BROKER], this->tag_table_[REMOTE]); } - + return this->remote_proxy_broker_; } @@ -3588,7 +3588,7 @@ be_interface::full_remote_proxy_broker_name (void) const char *base_name = this->remote_proxy_broker_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_remote_proxy_broker_name_, char[length + 1], 0); @@ -3598,7 +3598,7 @@ be_interface::full_remote_proxy_broker_name (void) ACE_OS::strcat (this->full_remote_proxy_broker_name_, base_name); } - + return this->full_remote_proxy_broker_name_; } @@ -3615,7 +3615,7 @@ be_interface::strategized_proxy_broker_name (void) this->suffix_table_[PROXY_BROKER], this->tag_table_[STRATEGIZED]); } - + return this->strategized_proxy_broker_; } @@ -3629,7 +3629,7 @@ be_interface::full_strategized_proxy_broker_name (void) this->strategized_proxy_broker_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_strategized_proxy_broker_name_, char[length + 1], 0); @@ -3639,7 +3639,7 @@ be_interface::full_strategized_proxy_broker_name (void) ACE_OS::strcat (this->full_strategized_proxy_broker_name_, base_name); } - + return this->full_strategized_proxy_broker_name_; } @@ -3660,7 +3660,7 @@ be_interface::client_enclosing_scope (void) ACE_OS::strncpy (this->client_scope_, full_name, length); this->client_scope_[length] = '\0'; } - + return this->client_scope_; } @@ -3675,7 +3675,7 @@ be_interface::flat_client_enclosing_scope (void) size_t offset = ACE_OS::strlen (name); size_t length = ACE_OS::strlen (full_name) - offset; - + ACE_NEW_RETURN (this->flat_client_scope_, char[length + 1], 0); @@ -3685,7 +3685,7 @@ be_interface::flat_client_enclosing_scope (void) length); this->flat_client_scope_[length] = '\0'; } - + return this->flat_client_scope_; } @@ -3709,7 +3709,7 @@ be_interface::server_enclosing_scope (void) ACE_OS::strncpy (this->server_scope_, full_name, length); this->server_scope_[length] = '\0'; } - + return this->server_scope_; } diff --git a/TAO/TAO_IDL/be/be_null_return_emitter.cpp b/TAO/TAO_IDL/be/be_null_return_emitter.cpp index d8b689dbf4e..d0d79ce406f 100644 --- a/TAO/TAO_IDL/be/be_null_return_emitter.cpp +++ b/TAO/TAO_IDL/be/be_null_return_emitter.cpp @@ -37,9 +37,9 @@ int be_null_return_emitter::emit (be_type *node) { os_ << "return "; - + be_visitor_null_return_value visitor (this->ctx_); - + if (node->accept (&visitor) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -49,8 +49,8 @@ be_null_return_emitter::emit (be_type *node) node->full_name ()), -1); } - + os_ << ";"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_param_holder.cpp b/TAO/TAO_IDL/be/be_param_holder.cpp index 2e51be56b44..958a336b779 100644 --- a/TAO/TAO_IDL/be/be_param_holder.cpp +++ b/TAO/TAO_IDL/be/be_param_holder.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Place holder referenced by AST_Field (or subclass) + * Place holder referenced by AST_Field (or subclass) * representing a corresponding template parameter in IDL. * * diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp index 425bccc2ee9..e1adf705919 100644 --- a/TAO/TAO_IDL/be/be_produce.cpp +++ b/TAO/TAO_IDL/be/be_produce.cpp @@ -209,7 +209,7 @@ BE_produce (void) be_visitor_root_is root_is_visitor (&ctx); BE_visit_root (root_is_visitor, "implementation skeleton"); } - + if (be_global->gen_ciao_svnt ()) { ctx.state (TAO_CodeGen::TAO_ROOT_SVH); @@ -220,7 +220,7 @@ BE_produce (void) be_visitor_root_svs root_svs_visitor (&ctx); BE_visit_root (root_svs_visitor, "CIAO servant source"); } - + if (be_global->gen_ciao_exec_idl ()) { ctx.state (TAO_CodeGen::TAO_ROOT_EX_IDL); @@ -238,7 +238,7 @@ BE_produce (void) be_visitor_root_exs root_exs_visitor (&ctx); BE_visit_root (root_exs_visitor, "CIAO exec impl source"); } - + if (be_global->gen_ciao_conn_impl ()) { ctx.state (TAO_CodeGen::TAO_ROOT_CNH); @@ -249,7 +249,7 @@ BE_produce (void) be_visitor_root_cns root_cns_visitor (&ctx); BE_visit_root (root_cns_visitor, "CIAO conn impl source"); } - + tao_cg->gen_export_files (); // Done with this IDL file. diff --git a/TAO/TAO_IDL/be/be_root.cpp b/TAO/TAO_IDL/be/be_root.cpp index 3901bc329e1..12679acf696 100644 --- a/TAO/TAO_IDL/be/be_root.cpp +++ b/TAO/TAO_IDL/be/be_root.cpp @@ -42,7 +42,7 @@ void be_root::destroy (void) { // Call the destroy methods of our base classes. - + // The scope of the root is handled specially, since we may // be processing multiple IDL files and we want to keep // the predefined types around until we are all done. diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index 3a8323316a5..2fa1daddacd 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -561,7 +561,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os, { *os << "std::vector<" << elem->nested_type_name (ctx_scope) << ">"; - + return 0; } */ diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp index b16aeb60867..51ad5ab53d3 100644 --- a/TAO/TAO_IDL/be/be_string.cpp +++ b/TAO/TAO_IDL/be/be_string.cpp @@ -58,12 +58,12 @@ be_string::gen_member_ostream_operator (TAO_OutStream *os, if (this->width () == 1) { *os << "\"\\\"\" << "; - + this->be_type::gen_member_ostream_operator (os, instance_name, use_underscore, accessor); - + *os << " << \"\\\"\""; } else @@ -142,7 +142,7 @@ be_string::compute_tc_name (void) ACE_NEW (id, Identifier (local_tc_name.c_str ())); } - + zero.destroy (); UTL_ScopedName *conc_name = 0; diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp index 39141f84456..f6de0494046 100644 --- a/TAO/TAO_IDL/be/be_structure.cpp +++ b/TAO/TAO_IDL/be/be_structure.cpp @@ -98,24 +98,24 @@ be_structure::gen_ostream_operator (TAO_OutStream *os, << "std::ostream& operator<< (" << be_idt << be_idt_nl << "std::ostream &strm," << be_nl << "const " << this->name () << " &"; - + long n = this->pd_decls_used; - - // be_exception is a subclass and could be empty. + + // be_exception is a subclass and could be empty. if (n > 0) - { + { *os << "_tao_aggregate"; } - + *os << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "strm << \"" << this->name () << "(\""; - + for (long i = 0; i < n; ++i) { be_field *f = be_field::narrow_from_decl (this->pd_decls[i]); - + // We don't want any decls, just members. if (f == 0) { @@ -125,11 +125,11 @@ be_structure::gen_ostream_operator (TAO_OutStream *os, if (i != 0) { *os << " << \", \""; - } - + } + *os << be_nl << " << "; - + ACE_CString instance_name ("_tao_aggregate."); instance_name += f->local_name ()->get_string (); AST_Decl::NodeType nt = f->field_type ()->node_type (); @@ -140,7 +140,7 @@ be_structure::gen_ostream_operator (TAO_OutStream *os, member_use_underscore, false); } - + *os << be_nl << " << \")\";" << be_nl << be_nl << "return strm;" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index c71c22bf93a..f8d0d9d2ec0 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -295,26 +295,26 @@ be_type::gen_stub_decls (TAO_OutStream *os) { return; } - + *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl; - + AST_Interface *i = AST_Interface::narrow_from_decl (this); AST_ValueType *v = AST_ValueType::narrow_from_decl (this); - + if (i != 0) { *os << be_nl << "typedef " << this->local_name () << (v == 0 ? "_ptr" : " *") << " _ptr_type;"; } - + bool skip_varout = false; AST_Sequence *s = AST_Sequence::narrow_from_decl (this); - + if (s != 0) { // _vars and _outs not supported yet by alt mapping. @@ -323,16 +323,16 @@ be_type::gen_stub_decls (TAO_OutStream *os) skip_varout = true; } } - + if (!skip_varout) - { + { *os << be_nl << "typedef " << this->local_name () << "_var _var_type;" << be_nl << "typedef " << this->local_name () << "_out _out_type;"; } - + bool gen_any_destructor = be_global->any_support () && (!this->is_local () diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index 660bdf84aab..4e2171676eb 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -107,20 +107,20 @@ be_union::gen_ostream_operator (TAO_OutStream *os, << "strm << \"" << this->name () << "(\";" << be_nl << be_nl << "switch (_tao_union._d ())" << be_nl << "{" << be_idt; - + for (long i = 0; i < this->pd_decls_used; ++i) { be_union_branch *ub = be_union_branch::narrow_from_decl (this->pd_decls[i]); - + // We don't want any decls, just members. if (ub == 0) { continue; } - + *os << be_nl; - + unsigned long ll_len = ub->label_list_length (); for (unsigned long j = 0; j < ll_len; ++j) @@ -151,27 +151,27 @@ be_union::gen_ostream_operator (TAO_OutStream *os, ACE_CString instance_name ("_tao_union."); instance_name += ub->local_name ()->get_string (); - + *os << "strm << "; - + ub->gen_member_ostream_operator (os, instance_name.c_str (), use_underscore, true); - + *os << ";" << be_nl << "break;" << be_uidt; } - + // Some compilers complain unless this is present, but only - // if not all values are covered in case statements. + // if not all values are covered in case statements. if (this->gen_empty_default_label ()) { *os << be_nl << "default:" << be_idt_nl << "break;" << be_uidt; } - + *os << be_uidt_nl << "}" << be_nl << be_nl << "return strm << \")\";" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp index a9df3463559..955e8bb0a20 100644 --- a/TAO/TAO_IDL/be/be_util.cpp +++ b/TAO/TAO_IDL/be/be_util.cpp @@ -43,7 +43,7 @@ be_util::gen_nested_namespace_begin (TAO_OutStream *os, { // Leave the outermost root scope. *os << be_nl << "namespace "; - + if (first_level && skel) { // We are outermost module. @@ -77,22 +77,22 @@ void be_util::gen_nesting_open (TAO_OutStream &os, AST_Decl *node) { AST_Decl::NodeType nt = node->node_type (); - + if (nt == AST_Decl::NT_root) { os << be_nl; return; } - + be_util::gen_nesting_open ( os, ScopeAsDecl (node->defined_in ())); - + if (nt == AST_Decl::NT_module) - { + { ACE_CString module_name ( IdentifierHelper::try_escape (node->original_local_name ())); - + os << be_nl << "module " << module_name.c_str () << be_nl << "{" << be_idt; @@ -104,12 +104,12 @@ be_util::gen_nesting_close (TAO_OutStream &os, AST_Decl *node) { AST_Decl *d = ScopeAsDecl (node->defined_in ()); AST_Decl::NodeType nt = d->node_type (); - + while (nt != AST_Decl::NT_root) { os << be_uidt_nl << "};"; - + d = ScopeAsDecl (d->defined_in ()); nt = d->node_type (); } diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 7d01635b3f8..1d4f6e0ccb0 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -97,7 +97,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, { be_interface *intf = be_interface::narrow_from_decl (this->pd_supports[i]); - + if (intf == 0) { // The item is a template param holder. @@ -363,7 +363,7 @@ be_valuetype::have_supported_op (be_interface * node) long i; // loop index long n_inherits = node->n_inherits (); AST_Type **inherits = node->inherits (); - + for (i = 0; i < n_inherits; ++i) { be_interface * intf = diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp index 4e16bdbc91c..6d42245906c 100644 --- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp @@ -187,14 +187,14 @@ be_visitor_amh_pre_proc::create_response_handler ( response_handler->set_imported (node->imported ()); response_handler->set_line (node->line ()); response_handler->set_file_name (node->file_name ()); - + // Set repo id to 0, so it will be recomputed on the next access, // and set the prefix to the node's prefix. All this is // necessary in case the node's prefix was modified after // its declaration. response_handler->AST_Decl::repoID (0); response_handler->prefix (const_cast<char*> (node->prefix ())); - + response_handler->gen_fwd_helper_name (); this->add_rh_node_members (node, response_handler, exception_holder); return response_handler; @@ -291,8 +291,8 @@ be_visitor_amh_pre_proc::create_response_handler_operation ( { return -1; } - - /// These are for the stub side only. + + /// These are for the stub side only. if (node->is_sendc_ami ()) { return 0; @@ -324,11 +324,11 @@ be_visitor_amh_pre_proc::create_response_handler_attribute ( this->create_response_handler_operation (get_operation, response_handler, exception_holder); - + get_operation->destroy (); delete get_operation; get_operation = 0; - + if (status == -1) { return -1; @@ -348,11 +348,11 @@ be_visitor_amh_pre_proc::create_response_handler_attribute ( this->create_response_handler_operation (set_operation, response_handler, exception_holder); - + set_operation->destroy (); delete set_operation; set_operation = 0; - + return status; } @@ -372,14 +372,14 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node, 1, 0), -1); - + node_excep->set_name (operation_name); Identifier *arg_id = 0; ACE_NEW_RETURN (arg_id, Identifier ("holder"), -1); - + UTL_ScopedName *arg_name = 0; ACE_NEW_RETURN (arg_name, UTL_ScopedName (arg_id, 0), @@ -451,7 +451,7 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, ACE_NEW_RETURN (arg_id, Identifier ("return_value"), -1); - + UTL_ScopedName *arg_name = 0; ACE_NEW_RETURN (arg_name, UTL_ScopedName (arg_id, 0), @@ -464,9 +464,9 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, node->return_type (), arg_name), -1); - + arg->set_name (arg_name); - + // Add the response handler to the argument list operation->be_add_argument (arg); } @@ -575,14 +575,14 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node) excep_holder->set_name (excep_holder_name); excep_holder->set_defined_in (node->defined_in ()); - + // Set repo id to 0, so it will be recomputed on the next access, // and set the prefix to the node's prefix. All this is // necessary in case the node's prefix was modified after // its declaration. excep_holder->AST_Decl::repoID (0); excep_holder->prefix (const_cast<char*> (node->prefix ())); - + excep_holder->gen_fwd_helper_name (); // Now our customized valuetype is created, we have to @@ -704,7 +704,7 @@ be_visitor_amh_pre_proc::create_raise_operation ( { // Copy the exceptions. UTL_ExceptList *exceptions = orig_op->exceptions (); - + if (0 != exceptions) { operation->be_add_exceptions (exceptions->copy ()); diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp index 2ed02589fb3..4fb3d1c9636 100644 --- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp @@ -64,7 +64,7 @@ be_visitor_ami_pre_proc::visit_root (be_root *node) /// Generate the *A.idl file containing AMI4CCM-related /// interfaces and connector. int status = this->generate_ami4ccm_idl (); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -204,7 +204,7 @@ be_visitor_ami_pre_proc::visit_operation (be_operation *node) // We do nothing for oneways! return 0; } - + be_interface *parent = be_interface::narrow_from_scope (node->defined_in ()); @@ -214,7 +214,7 @@ be_visitor_ami_pre_proc::visit_operation (be_operation *node) be_operation *sendc_op = this->create_sendc_operation (node); // for arguments = TRUE - + parent->be_add_operation (sendc_op); return 0; @@ -236,18 +236,18 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node) delete set_operation; set_operation = 0; } - + /// Temporarily generate the get operation. be_operation *get_operation = this->generate_get_operation (node); get_operation->set_defined_in (node->defined_in ()); this->visit_operation (get_operation); - + get_operation->destroy (); delete get_operation; get_operation = 0; - + return 0; } @@ -270,7 +270,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) UTL_ScopedName *reply_handler_name = static_cast<UTL_ScopedName *> (node->name ()->copy ()); - + reply_handler_name->last_component ()->replace_string ( reply_handler_local_name.c_str ()); @@ -302,7 +302,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) reply_handler->set_name (reply_handler_name); reply_handler->set_defined_in (s); - + /// Store here for convenient retrieval later. node->ami_handler (reply_handler); @@ -349,7 +349,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) { be_operation *get_operation = this->generate_get_operation (attribute); - + this->create_reply_handler_operation (get_operation, reply_handler); @@ -395,7 +395,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) reply_handler->is_ami_rh (true); reply_handler->is_ami4ccm_rh (true); - + return reply_handler; } @@ -423,7 +423,7 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) op_name->last_component ()->replace_string (new_op_name.c_str ()); idl_global->scopes ().push (node->defined_in ()); - + // Create the operation be_operation *op = 0; ACE_NEW_RETURN (op, @@ -433,7 +433,7 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) false, false), 0); - + idl_global->scopes ().pop (); op->set_name (op_name); @@ -467,11 +467,11 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) be_interface *field_type = be_interface::narrow_from_decl (handler); - + ACE_NEW_RETURN (id, Identifier ("ami_handler"), 0); - + UTL_ScopedName *tmp = 0; ACE_NEW_RETURN (tmp, diff --git a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp index deef051a509..95112d12455 100644 --- a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp @@ -88,7 +88,7 @@ be_visitor_any_extracted_type_decl::visit_predefined_type ( be_predefined_type *node) { os_ << node->full_name () << " "; - + switch (node->pt ()) { case AST_PredefinedType::PT_boolean: @@ -160,12 +160,12 @@ be_visitor_any_extracted_type_decl::visit_predefined_type ( os_ << "_ptr " << var_name_ << " = ::CORBA::TypeCode::_nil ();"; } - + break; default: // PT_void is left out of the case list. break; } - + return 0; } @@ -173,15 +173,15 @@ int be_visitor_any_extracted_type_decl::visit_sequence (be_sequence *node) { be_type *bt = this->ctx_->alias (); - + if (bt == 0) { bt = node; } - + os_ << "const " << bt->nested_type_name (idl_global->root ()) << " * " << var_name_ << " = 0;"; - + return 0; } @@ -204,7 +204,7 @@ be_visitor_any_extracted_type_decl::visit_typedef (be_typedef *node) { this->ctx_->alias (node); int status = node->primitive_base_type ()->accept (this); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -213,7 +213,7 @@ be_visitor_any_extracted_type_decl::visit_typedef (be_typedef *node) "accept on primitive type failed\n"), -1); } - + this->ctx_->alias (0); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index c0e1ba75532..7572d3d3629 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -159,7 +159,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node) << "TAO::Objref_Traits<" << node->name () << ">"; } - *os << "," << be_nl << this->insert_policy() + *os << "," << be_nl << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -419,7 +419,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() + << this->insert_policy() << ">" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -554,7 +554,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); - + AST_Decl *op = ScopeAsDecl (node->defined_in ()); AST_Decl *intf = ScopeAsDecl (op->defined_in ()); ACE_CString arg_flat_name (intf->flat_name ()); @@ -581,7 +581,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt_nl @@ -614,10 +614,10 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node) os->gen_ifdef_macro (alias->flat_name (), guard_suffix.c_str (), false); - + bool use_vec = (node->unbounded () && be_global->alt_mapping ()); UTL_ScopedName *sn = alias->name (); - + *os << be_nl << be_nl << "template<>" << be_nl << "class " << this->S_ << "Arg_Traits<" << sn << ">" @@ -677,13 +677,13 @@ be_visitor_arg_traits::visit_string (be_string *node) // Form a unique macro name using the local name and the bound. ACE_CDR::ULong l = bound; int num_digits = 0; - + while (l > 0) { l /= 10 ; ++num_digits ; } - + size_t bound_length = num_digits + 1; char* bound_string = 0; ACE_NEW_RETURN (bound_string, char[bound_length], -1) ; @@ -748,7 +748,7 @@ be_visitor_arg_traits::visit_string (be_string *node) << be_idt << be_idt_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() + << this->insert_policy() << be_uidt << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl @@ -932,7 +932,7 @@ be_visitor_arg_traits::visit_field (be_field *node) // recursion. So we set the field node as processed (the // field *type* may not have been reached yet) and return. AST_Decl::NodeType nt = bt->base_node_type (); - + if (nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype) { node->cli_traits_gen (true); diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp index adc708b7874..d1e0a803c07 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp @@ -88,7 +88,7 @@ int be_visitor_args_arglist::visit_array (be_array *node) int be_visitor_args_arglist::visit_enum (be_enum *node) { TAO_OutStream *os = this->ctx_->stream (); - + switch (this->direction ()) { case AST_Argument::dir_IN: @@ -303,7 +303,7 @@ int be_visitor_args_arglist::visit_sequence (be_sequence *node) { *os << this->type_name (node, "_out"); } - + break; } @@ -315,7 +315,7 @@ int be_visitor_args_arglist::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); ACE_CDR::ULong bound = node->max_size ()->ev ()->u.ulval; bool wide = (node->width () != (long) sizeof (char)); - + if (!wide && bound == 0 && be_global->alt_mapping ()) { switch (this->direction ()) @@ -327,7 +327,7 @@ int be_visitor_args_arglist::visit_string (be_string *node) *os << "std::string &"; break; } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp index 9013b758b4f..309f5cf5f4e 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp @@ -94,29 +94,29 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node, { TAO_CodeGen::CG_SUB_STATE ss = this->ctx_->sub_state (); AST_Argument::Direction d = this->direction (); - + bool in_arg = (d == AST_Argument::dir_IN); bool out_arg = (d == AST_Argument::dir_OUT); bool out_stream = (ss == TAO_CodeGen::TAO_CDR_OUTPUT); bool in_stream = (ss == TAO_CodeGen::TAO_CDR_INPUT); - + bool skip = (in_arg && for_stub && in_stream) || (in_arg && !for_stub && out_stream) || (out_arg && for_stub && out_stream) || (out_arg && !for_stub && in_stream); - + if (skip) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); const char *var_call = ""; const char *any_deref = ""; - + AST_PredefinedType::PredefinedType pt = node->pt (); bool is_any = (pt == AST_PredefinedType::PT_any); - + if (for_stub) { if (in_stream && out_arg) @@ -128,7 +128,7 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node, else if (out_stream) { var_call = ".in ()"; - + if (is_any && !out_arg) { var_call = ""; @@ -138,17 +138,17 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node, { var_call = ".out ()"; } - + ACE_CString to_from_str = (in_stream ? "::ACE_InputCDR::to_" : "::ACE_OutputCDR::from_"); - + const char *to_from = to_from_str.c_str (); - + be_argument *arg = be_argument::narrow_from_decl (this->ctx_->node ()); const char *lname = arg->local_name ()->get_string (); - + switch (pt) { case AST_PredefinedType::PT_any: @@ -173,7 +173,7 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node, *os << lname; break; } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp index 7ce9b1e9ea5..8aad43b92ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp @@ -320,7 +320,7 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node) << (wide ? "w" : "" ) << "string (" << lname << ".out (), " << bound << ")"; } - + break; case AST_Argument::dir_OUT: break; @@ -354,7 +354,7 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node) << (wide ? "w" : "" ) << "string ((" << (wide ? "CORBA::WChar" : "char") << " *)" << lname << ".in (), " << bound << ")"; - + break; } } @@ -517,7 +517,7 @@ be_visitor_args_marshal_ss::emit_common2 (be_type *node) case AST_Argument::dir_OUT: *os << lname << (st == AST_Type::VARIABLE ? ".in ()" : ""); - + break; } } diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 8a957354afe..657affc4e54 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -45,7 +45,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + // Since we don't generate CDR stream operators for types that // explicitly contain a local interface (at some level), we // must override these Any template class methods to avoid @@ -81,7 +81,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) } // If this is non-zero, we want to call its tc_name() - // for the TypeCode to pass to the Any operator impls. + // for the TypeCode to pass to the Any operator impls. be_typedef *td = this->ctx_->tdef (); *os << "void operator<<= (" << be_idt << be_idt_nl @@ -122,7 +122,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << "}"; *os << be_global->core_versioning_end () << be_nl; - + node->cli_stub_any_op_gen (1); return 0; } 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 c6973b1a09c..3b9afef5262 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 @@ -131,7 +131,7 @@ 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 (!use_underscore) diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp index e96a8cf10ec..8d00e9cce49 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor for code generation of Arrays for the + * Visitor for code generation of Arrays for the * TAO::DCPS::Serializer operators in the client header. * * @@ -32,7 +32,7 @@ be_visitor_array_serializer_op_ch::~be_visitor_array_serializer_op_ch (void) } -void +void be_visitor_array_serializer_op_ch::gen_arg_ref(be_array *node) { TAO_OutStream *os = this->ctx_->stream (); @@ -128,18 +128,18 @@ be_visitor_array_serializer_op_ch::visit_array (be_array *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; // Set the sub state as generating code for the size method - *os << be_global->stub_export_macro () - << " size_t _dcps_max_marshaled_size (" + *os << be_global->stub_export_macro () + << " size_t _dcps_max_marshaled_size (" << "const "; this->gen_arg_ref(node); - *os << be_global->stub_export_macro () - << " ::CORBA::Boolean _tao_is_bounded_size (" + *os << be_global->stub_export_macro () + << " ::CORBA::Boolean _tao_is_bounded_size (" << "const "; this->gen_arg_ref(node); - *os << be_global->stub_export_macro () - << " size_t _dcps_find_size (" + *os << be_global->stub_export_macro () + << " size_t _dcps_find_size (" << "const "; this->gen_arg_ref(node); diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp index d9de2d00506..d266d09ec0b 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp @@ -59,7 +59,7 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node) "Bad base type\n"), -1); } - + AST_Decl::NodeType nt = bt->node_type (); // If we contain an anonymous sequence, diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp index 26b72c79093..ec009509444 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp @@ -56,36 +56,36 @@ be_visitor_attribute::visit_attribute (be_attribute *node) this->ctx_->node (node); this->ctx_->attribute (node); be_interface *intf = this->ctx_->interface (); - + if (intf != 0) { AST_Decl::NodeType snt = intf->node_type (); AST_Decl::NodeType ant = ScopeAsDecl (node->defined_in ())->node_type (); - + if (snt == AST_Decl::NT_component && ant == AST_Decl::NT_porttype) { return 0; } } - + UTL_Scope *s = node->defined_in (); - AST_Decl *d = ScopeAsDecl (s); + AST_Decl *d = ScopeAsDecl (s); ACE_CString op_name (this->ctx_->port_prefix ()); op_name += node->local_name ()->get_string (); Identifier *op_id = 0; ACE_NEW_RETURN (op_id, Identifier (op_name.c_str ()), -1); - + UTL_ScopedName *op_ln = 0; ACE_NEW_RETURN (op_ln, UTL_ScopedName (op_id, 0), -1); - + UTL_ScopedName *op_sn = - static_cast<UTL_ScopedName *> (d->name ()->copy ()); + static_cast<UTL_ScopedName *> (d->name ()->copy ()); op_sn->nconc (op_ln); // first the "get" operation @@ -255,7 +255,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node) node->name ()); arg->set_name ((UTL_IdList *) node->name ()->copy ()); - + // Create the operation. be_operation set_op (&rt, AST_Operation::OP_noflags, diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp index 3b64d85ef38..58163414043 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp @@ -35,13 +35,13 @@ be_visitor_attribute_ccm_init::visit_attribute ( } be_interface *intf = this->ctx_->interface (); - + if (intf != 0) { AST_Decl::NodeType snt = intf->node_type (); AST_Decl::NodeType ant = ScopeAsDecl (node->defined_in ())->node_type (); - + if (snt == AST_Decl::NT_component && ant == AST_Decl::NT_porttype) { @@ -216,7 +216,7 @@ be_visitor_attribute_ccm_init::emit_error ( const char *corba_kind) { this->open_if_block (); - + os_ << "ACE_ERROR ((LM_ERROR," << be_nl << " \"CCM attributes of " << corba_kind << "\"" << be_nl @@ -224,7 +224,7 @@ be_visitor_attribute_ccm_init::emit_error ( << "supported by CIAO\\n\"));" << be_nl << be_nl << "ACE_UNUSED_ARG (descr_value);" << be_nl; - + this->close_if_block (); } diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp index 51c67462c59..8ffa5d9ba30 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp @@ -105,7 +105,7 @@ be_visitor_attribute_set_from_extracted::visit_predefined_type ( default: // PT_void left out of case list. break; } - + return 0; } @@ -139,7 +139,7 @@ be_visitor_attribute_set_from_extracted::visit_typedef ( { be_type *pbt = be_type::narrow_from_decl (node->primitive_base_type ()); - + return (pbt->accept (this)); } diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp index 1dfac8b8822..f4277a73955 100644 --- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp @@ -68,7 +68,7 @@ const int N_LW_EXCEPS = sizeof (LW_EXCEP_NAMES) / sizeof (char *); const int N_ADDL_EXCEPS = sizeof (ADDL_EXCEP_NAMES) / sizeof (char *); - + be_exception *LW_EXCEPS[N_LW_EXCEPS]; be_exception *ADDL_EXCEPS[N_ADDL_EXCEPS]; @@ -173,7 +173,7 @@ be_visitor_ccm_pre_proc::visit_component (be_component *node) ACE_TEXT ("lookups failed\n")), -1); } - + this->ccm_lookups_done_ = true; } @@ -1155,7 +1155,7 @@ be_visitor_ccm_pre_proc::gen_create (be_home *node, -1); arg_id.destroy (); op->be_add_argument (arg); - + UTL_ExceptList *tail = 0; ACE_NEW_RETURN (tail, UTL_ExceptList (this->invalid_key_, @@ -1210,10 +1210,10 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node, -1); arg_id.destroy (); op->be_add_argument (arg); - + UTL_ExceptList *tail = 0; UTL_ExceptList *middle = 0; - + if (!be_global->gen_lwccm ()) { ACE_NEW_RETURN (tail, @@ -1225,7 +1225,7 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node, tail), -1); } - + UTL_ExceptList *exceps = 0; ACE_NEW_RETURN (exceps, UTL_ExceptList (this->finder_failure_, @@ -1272,10 +1272,10 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node, -1); arg_id.destroy (); op->be_add_argument (arg); - + UTL_ExceptList *tail = 0; UTL_ExceptList *middle = 0; - + if (!be_global->gen_lwccm ()) { ACE_NEW_RETURN (tail, @@ -1287,7 +1287,7 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node, tail), -1); } - + UTL_ExceptList *exceps = 0; ACE_NEW_RETURN (exceps, UTL_ExceptList (this->remove_failure_, @@ -1415,7 +1415,7 @@ be_visitor_ccm_pre_proc::lookup_exceptions (void) this->create_failure_ = LW_EXCEPS[4]; this->remove_failure_ = LW_EXCEPS[5]; this->finder_failure_ = LW_EXCEPS[6]; - + if (!be_global->gen_lwccm ()) { for (int j = 0; j < N_ADDL_EXCEPS; ++j) @@ -1433,7 +1433,7 @@ be_visitor_ccm_pre_proc::lookup_exceptions (void) this->unknown_key_value_ = ADDL_EXCEPS[1]; this->duplicate_key_value_ = ADDL_EXCEPS[2]; } - + return 0; } @@ -1718,7 +1718,7 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node, ScopeAsDecl (s)); node->set_name (mangled_name); AST_Module *m = AST_Module::narrow_from_scope (s); - + /// Calling be_add_interface() here calls add_to_referenced(), /// which will give a redef error. m->add_to_scope (retval); @@ -1867,7 +1867,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) be_interface *iface = be_interface::narrow_from_decl (u->uses_type ()); - + /// The real AMI_xxx exists only in the *A.idl file, so /// we create a dummy as the uses type for the implied /// receptacle created below, but only if it hasn't @@ -1879,7 +1879,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) if (ami_iface == 0) { ACE_CString iname ("AMI4CCM_"); - + iname += iface->local_name (); Identifier itmp_id (iname.c_str ()); UTL_ScopedName itmp_sn (&itmp_id, 0); @@ -1901,11 +1901,11 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) /// Make it imported so it doesn't trigger /// any unwanted code generation. ami_iface->set_imported (true); - + s->add_to_scope (ami_iface); iface->ami4ccm_uses (ami_iface); } - + /// Now create the receptacle, passing in /// the local interface created above as the /// uses type. We don't generate anything @@ -1928,7 +1928,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) s->add_to_scope (ami_uses); idl_global->scopes ().pop (); - + if (u->is_multiple ()) { /* diff --git a/TAO/TAO_IDL/be/be_visitor_component/component.cpp b/TAO/TAO_IDL/be/be_visitor_component/component.cpp index 313280196b5..204ff9b79ad 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component.cpp @@ -322,9 +322,9 @@ be_visitor_component::visit_extended_port ( /// line to tell what scope we are actually in. this->ctx_->interface ( be_interface::narrow_from_scope (node->defined_in ())); - + be_porttype *pt = node->port_type (); - + if (this->visit_scope (pt) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -333,9 +333,9 @@ be_visitor_component::visit_extended_port ( ACE_TEXT ("visit_scope () failed\n")), -1); } - + this->ctx_->port_prefix () = ""; - + return 0; } @@ -351,9 +351,9 @@ be_visitor_component::visit_mirror_port (be_mirror_port *node) /// line to tell what scope we are actually in. this->ctx_->interface ( be_interface::narrow_from_scope (node->defined_in ())); - + be_porttype *pt = node->port_type (); - + if (this->visit_scope (pt) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -362,9 +362,9 @@ be_visitor_component::visit_mirror_port (be_mirror_port *node) ACE_TEXT ("visit_scope () failed\n")), -1); } - + this->ctx_->port_prefix () = ""; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp index 7b0c602c31d..a51558a3928 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp @@ -35,7 +35,7 @@ be_visitor_component_ex_idl::visit_component ( if (be_global->gen_lem_force_all ()) { be_visitor_facet_ex_idl facet_visitor (this->ctx_); - + if (facet_visitor.visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -49,7 +49,7 @@ be_visitor_component_ex_idl::visit_component ( be_util::gen_nesting_open (os_, node); be_visitor_executor_ex_idl exec_visitor (this->ctx_); - + if (exec_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -60,7 +60,7 @@ be_visitor_component_ex_idl::visit_component ( } be_visitor_context_ex_idl context_visitor (this->ctx_); - + if (context_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp index 34c70b74ce8..f4f1df5c200 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp @@ -38,10 +38,10 @@ be_visitor_component_exh::visit_component (be_component *node) << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + be_visitor_facet_exh facet_visitor (this->ctx_); facet_visitor.node (node); - + if (facet_visitor.visit_component_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -50,9 +50,9 @@ be_visitor_component_exh::visit_component (be_component *node) ACE_TEXT ("facet visitor failed\n")), -1); } - + be_visitor_executor_exh exec_visitor (this->ctx_); - + if (exec_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -61,12 +61,12 @@ be_visitor_component_exh::visit_component (be_component *node) ACE_TEXT ("exec visitor failed\n")), -1); } - + this->gen_exec_entrypoint_decl (); os_ << be_uidt_nl << "}"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp index f5e01b0641c..2a019f2ffbd 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp @@ -38,7 +38,7 @@ be_visitor_component_exs::visit_component (be_component *node) << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + be_visitor_facet_exs facet_visitor (this->ctx_); facet_visitor.node (node); @@ -50,7 +50,7 @@ be_visitor_component_exs::visit_component (be_component *node) ACE_TEXT ("facet visitor failed\n")), -1); } - + be_visitor_executor_exs exec_visitor (this->ctx_); if (exec_visitor.visit_component (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp index c6f749f3500..532a228dd95 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp @@ -42,14 +42,14 @@ be_visitor_component_svh::visit_component (be_component *node) { return 0; } - + /// Fills in the node's has_* members, for use in minimizing - /// code generation. + /// code generation. node->scan (node); - + // Generate the facet servant class declaration. be_visitor_facet_svh facet_visitor (this->ctx_); - + if (facet_visitor.visit_component_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -77,8 +77,8 @@ be_visitor_component_svh::visit_component (be_component *node) ACE_TEXT ("context visitor failed\n")), -1); } - - // Generate the servant class declaration. + + // Generate the servant class declaration. be_visitor_servant_svh servant_visitor (this->ctx_); if (servant_visitor.visit_component (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp index e893c3152ec..90e435e8e13 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp @@ -157,7 +157,7 @@ be_visitor_context_svh::visit_uses (be_uses *node) << "virtual " << (is_multiple ? "::Components::Cookie *" : "void") << be_nl - << "connect_" << port_name << " (" + << "connect_" << port_name << " (" << "::" << obj_name << "_ptr);" << be_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp index 309d9565a71..afe0d6f703d 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp @@ -29,7 +29,7 @@ be_visitor_executor_ex_idl::visit_component ( be_component *node) { node_ = node; - + AST_Component *base = node->base_component (); os_ << be_nl @@ -71,7 +71,7 @@ be_visitor_executor_ex_idl::visit_component ( os_ << be_uidt_nl << "};"; - + return 0; } @@ -87,7 +87,7 @@ be_visitor_executor_ex_idl::visit_attribute (be_attribute *node) AST_Decl::NodeType snt = this->node_->node_type (); AST_Decl::NodeType ant = ScopeAsDecl (node->defined_in ())->node_type (); - + /// For now, we want porttype attributes generated only for /// connectors. if (snt == AST_Decl::NT_component @@ -95,7 +95,7 @@ be_visitor_executor_ex_idl::visit_attribute (be_attribute *node) { return 0; } - + bool rd_only = node->readonly (); // Keep output statements separate because of side effects. @@ -181,11 +181,11 @@ be_visitor_executor_ex_idl::visit_provides ( ACE_CString prefix (this->ctx_->port_prefix ()); prefix += node->local_name ()->get_string (); const char *port_name = prefix.c_str (); - + os_ << be_nl << global << sname << "::CCM_" << lname << " get_" << port_name << " ();"; - + return 0; } @@ -200,7 +200,7 @@ be_visitor_executor_ex_idl::visit_consumes ( << " (in ::" << IdentifierHelper::orig_sn (impl->name ()).c_str () << " e);"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp index 7f8158a9676..7a92f3d9e64 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp @@ -129,9 +129,9 @@ be_visitor_executor_exh::visit_component (be_component *node) << "private:" << be_idt_nl << global << sname << "::CCM_" << lname << "_Context_var ciao_context_;"; - + be_visitor_facet_private_exh v (this->ctx_); - + if (v.visit_component_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -141,7 +141,7 @@ be_visitor_executor_exh::visit_component (be_component *node) ACE_TEXT ("visitor failed\n")), -1); } - + os_ << be_uidt_nl << "};"; @@ -154,7 +154,7 @@ be_visitor_executor_exh::visit_provides (be_provides *node) ACE_CString prefix (this->ctx_->port_prefix ()); prefix += node->local_name ()->get_string (); const char *port_name = prefix.c_str (); - + be_type *impl = node->provides_type (); AST_Decl *scope = ScopeAsDecl (impl->defined_in ()); diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp index 3c5b2a7e57c..9587735aa6a 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp @@ -49,7 +49,7 @@ be_visitor_facet_ex_idl::visit_provides (be_provides *node) be_util::gen_nesting_close (os_, impl); impl->ex_idl_facet_gen (true); - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp index 767308e5659..dab06fc4270 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp @@ -33,25 +33,25 @@ be_visitor_facet_exh::visit_provides (be_provides *node) be_type *impl = node->provides_type (); const char *iname = impl->original_local_name ()->get_string (); - + ACE_CString lname_str (this->ctx_->port_prefix ()); lname_str += node->original_local_name ()->get_string (); const char *lname = lname_str.c_str (); - + AST_Decl *s = ScopeAsDecl (impl->defined_in ()); ACE_CString sname_str = IdentifierHelper::orig_sn (s->name (), false); const char *sname = sname_str.c_str (); const char *global = (sname_str == "" ? "" : "::"); - + AST_Decl *c_scope = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (c_scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (is_global ? "" : "::"); - + os_ << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + os_ << be_nl << "class " << export_macro_.c_str () << " " << lname << "_exec_i" << be_idt_nl @@ -66,19 +66,19 @@ be_visitor_facet_exh::visit_provides (be_provides *node) << this->node_->local_name () << "_Context_ptr ctx);" << be_uidt_nl << "virtual ~" << lname << "_exec_i (void);"; - + if (impl->node_type () == AST_Decl::NT_interface) { be_interface *intf = be_interface::narrow_from_decl (impl); - + os_ << be_nl << be_nl << "// Operations and attributes from ::" << intf->full_name (); - - be_visitor_context ctx (*this->ctx_); + + be_visitor_context ctx (*this->ctx_); be_visitor_interface_ih v (&ctx); - + if (v.visit_scope (intf) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -88,7 +88,7 @@ be_visitor_facet_exh::visit_provides (be_provides *node) ACE_TEXT ("failed\n")), -1); } - + int status = intf->traverse_inheritance_graph ( be_visitor_interface_ih::method_helper, @@ -104,14 +104,14 @@ be_visitor_facet_exh::visit_provides (be_provides *node) -1); } } - + os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl << smart_scope << c_scope->full_name () << "::CCM_" << this->node_->local_name () << "_Context_var ciao_context_;" << be_uidt_nl << "};"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp index 571fd11ee29..1c12bac99a4 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp @@ -37,7 +37,7 @@ be_visitor_facet_exs::visit_operation (be_operation *node) { return 0; } - + be_visitor_operation_exs v (this->ctx_); v.scope (op_scope_); return v.visit_operation (node); @@ -55,7 +55,7 @@ be_visitor_facet_exs::visit_attribute (be_attribute *node) { return 0; } - + be_visitor_attribute v (this->ctx_); v.op_scope (op_scope_); return v.visit_attribute (node); @@ -73,7 +73,7 @@ be_visitor_facet_exs::visit_provides (be_provides *node) os_ << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + os_ << be_nl << comment_border_ << be_nl << "// Facet Executor Implementation Class: " @@ -83,7 +83,7 @@ be_visitor_facet_exs::visit_provides (be_provides *node) AST_Decl *c_scope = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (c_scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (is_global ? "" : "::"); - + os_ << be_nl << be_nl << lname << "_exec_i::" << lname << "_exec_i (" << be_idt << be_idt << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp index 283da630487..0ae02cd2d82 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp @@ -32,13 +32,13 @@ be_visitor_facet_private_exh::visit_provides (be_provides *node) const char *smart_scope = (is_global ? "" : "::"); ACE_CString scope_name = IdentifierHelper::orig_sn (i_scope->name (), false); - + os_ << be_nl << smart_scope << scope_name.c_str () << "::CCM_" << impl->original_local_name () << "_var ciao_" << this->ctx_->port_prefix ().c_str () << node->original_local_name () << "_;"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp index 9453829ca70..71fc9da54d1 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp @@ -35,7 +35,7 @@ be_visitor_facet_svh::visit_provides (be_provides *node) ACE_TEXT ("failed\n")), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp index cc7b2d59dc2..c9127923226 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp @@ -34,7 +34,7 @@ be_visitor_facet_svs::visit_provides (be_provides *node) ACE_TEXT ("failed\n")), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp index 47193d68f21..1eaab8d0b16 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -198,7 +198,7 @@ be_visitor_servant_svh::visit_uses (be_uses *node) << "virtual " << (is_multiple ? "::Components::Cookie *" : "void") << be_nl - << "connect_" << port_name << " (" + << "connect_" << port_name << " (" << "::" << obj_name << "_ptr);" << be_nl << be_nl; @@ -370,7 +370,7 @@ be_visitor_servant_svh::gen_non_type_specific (void) << "virtual ::CORBA::Object_ptr " << be_nl << "disconnect (const char * name, ::Components::Cookie * ck);"; } - + if (!be_global->gen_lwccm ()) { os_ << be_nl << be_nl @@ -378,7 +378,7 @@ be_visitor_servant_svh::gen_non_type_specific (void) << be_nl << "get_all_receptacles (void);"; } - + AST_Decl::NodeType nt = this->node_->node_type (); bool is_connector = (nt == AST_Decl::NT_connector); diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp index 07c853fdbd4..845545cf79f 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -92,7 +92,7 @@ be_visitor_servant_svs::visit_component (be_component *node) || this->node_->n_consumes () > 0UL) { be_visitor_populate_port_tables ppt_visitor (this->ctx_); - + if (ppt_visitor.visit_component_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -128,7 +128,7 @@ be_visitor_servant_svs::visit_component (be_component *node) << "::CORBA::Any & descr_value = descr[i]->value ();"; be_visitor_attr_set as_visitor (this->ctx_); - + /// This will get assigned to the visitor's interface_ /// member later so it can catch and skip porttype /// attributes in a component. @@ -166,7 +166,7 @@ be_visitor_servant_svs::visit_component (be_component *node) &os_, false, false); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -720,7 +720,7 @@ be_visitor_servant_svs::gen_publishes_top (void) << "throw ::Components::InvalidName ();" << be_uidt_nl << "}"; } - + if (!be_global->gen_lwccm ()) { os_ << be_nl << be_nl @@ -765,9 +765,9 @@ void be_visitor_servant_svs::gen_uses_top (void) { ACE_CDR::ULong nuses = this->node_->n_uses (); - + if (nuses > 0UL) - { + { os_ << be_nl << be_nl << "::Components::Cookie *" << be_nl << node_->local_name () << "_Servant::connect (" diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp index 09aa5f42b18..f2669690cb1 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for Any operators for a forward declared + * Visitor generating code for Any operators for a forward declared * component in the client header. * * diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp index 0e9d0106063..657bb304213 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp @@ -123,7 +123,7 @@ be_visitor_component_scope::visit_component_scope ( { return 0; } - + this->ctx_->interface (node); if (this->visit_scope (node) == -1) @@ -209,7 +209,7 @@ be_visitor_component_scope::visit_porttype_scope_mirror ( d->full_name ()), -1); } - + break; } } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp index 6f6ec2d1864..52efb700705 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp @@ -34,18 +34,18 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node) { return 0; } - + this->node_ = node; - + /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl << be_nl << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + be_visitor_facet_ami_exh facet_visitor (this->ctx_); - + /// We call visit_component() so the visitor base class member /// node_ can be set. If a facet is defined in a porttype, it /// complicates navigation to the component. @@ -57,9 +57,9 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node) ACE_TEXT ("facet visitor failed\n")), -1); } - + be_visitor_executor_ami_exh exec_visitor (this->ctx_); - + if (exec_visitor.visit_connector (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -68,25 +68,25 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node) ACE_TEXT ("exec visitor failed\n")), -1); } - + this->gen_entrypoint (); - + os_ << be_uidt_nl << "}"; - + /// Presence of -Gex option here triggers generation of AMI4CCM /// reply handler impl class, with empty methods for user to - /// complete, in its own set of files. + /// complete, in its own set of files. if (be_global->gen_ciao_exec_impl ()) { TAO_OutStream *new_stream = tao_cg->ciao_ami_rh_impl_header (); - + if (new_stream == 0) { int status = tao_cg->start_ciao_ami_rh_impl_header ( be_global->be_get_ciao_ami_conn_impl_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -96,16 +96,16 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node) ACE_TEXT ("conn rh impl header file\n")), -1); } - + new_stream = tao_cg->ciao_ami_rh_impl_header (); } - + /// Initialize new visitor with a copy of our context, /// because the new visitor gets a different stream. be_visitor_context new_ctx (*this->ctx_); new_ctx.stream (new_stream); be_visitor_connector_ami_rh_exh impl_visitor (&new_ctx); - + if (impl_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp index f1b53b52eeb..d0a014c3a71 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp @@ -69,17 +69,17 @@ be_visitor_connector_ami_exs::visit_connector (be_connector *node) /// Presence of -Gex option here triggers generation of AMI4CCM /// reply handler impl class, with empty methods for user to - /// complete, in its own set of files. + /// complete, in its own set of files. if (be_global->gen_ciao_exec_impl ()) { TAO_OutStream *new_stream = tao_cg->ciao_ami_rh_impl_source (); - + if (new_stream == 0) { int status = tao_cg->start_ciao_ami_rh_impl_source ( be_global->be_get_ciao_ami_conn_impl_src_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -89,16 +89,16 @@ be_visitor_connector_ami_exs::visit_connector (be_connector *node) ACE_TEXT ("conn rh impl header file\n")), -1); } - + new_stream = tao_cg->ciao_ami_rh_impl_source (); } - + /// Initialize new visitor with a copy of our context, /// because the new visitor gets a different stream. be_visitor_context new_ctx (*this->ctx_); new_ctx.stream (new_stream); be_visitor_connector_ami_rh_exs impl_visitor (&new_ctx); - + if (impl_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp index 190bd27a1c2..47a5f6ee6c8 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp @@ -29,16 +29,16 @@ be_visitor_connector_ami_rh_exh::visit_component (be_component *node) { return 0; } - + this->node_ = node; - + /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl << be_nl << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -48,10 +48,10 @@ be_visitor_connector_ami_rh_exh::visit_component (be_component *node) ACE_TEXT ("failed\n")), -1); } - + os_ << be_uidt_nl << "}"; - + return 0; } @@ -62,9 +62,9 @@ be_visitor_connector_ami_rh_exh::visit_provides (be_provides *node) be_interface::narrow_from_decl (node->provides_type ()); this->init (true); - + const char *suffix = "ReplyHandler"; - + os_ << be_nl << "class " << this->export_macro_.c_str () << " " << this->iface_name_ << suffix << "_i" << be_idt_nl @@ -74,7 +74,7 @@ be_visitor_connector_ami_rh_exh::visit_provides (be_provides *node) << "public:" << be_idt_nl << this->iface_name_ << suffix << "_i (void);" << be_nl << "virtual ~" << this->iface_name_ << suffix << "_i (void);"; - + /// This overload of traverse_inheritance_graph() used here /// doesn't automatically prime the queues. this->callback_iface_->get_insert_queue ().reset (); @@ -99,7 +99,7 @@ be_visitor_connector_ami_rh_exh::visit_provides (be_provides *node) ACE_TEXT ("callback interface failed\n")), -1); } - + os_ << be_uidt_nl << "};"; @@ -113,9 +113,9 @@ be_visitor_connector_ami_rh_exh::visit_attribute ( this->ctx_->interface (this->callback_iface_); TAO_CodeGen::CG_STATE state = this->ctx_->state (); this->ctx_->state (TAO_CodeGen::TAO_ROOT_IH); - + be_visitor_attribute v (this->ctx_); - + if (v.visit_attribute (node) == -1) { ACE_ERROR ((LM_ERROR, @@ -124,9 +124,9 @@ be_visitor_connector_ami_rh_exh::visit_attribute ( ACE_TEXT ("be_visitor_attribute:: ") ACE_TEXT ("visit_attribute failed\n"))); } - + this->ctx_->state (state); - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp index 65bb3156cfc..06c787e8f46 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp @@ -30,16 +30,16 @@ be_visitor_connector_ami_rh_exs::visit_component (be_component *node) { return 0; } - + this->node_ = node; - + /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl << be_nl << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -49,10 +49,10 @@ be_visitor_connector_ami_rh_exs::visit_component (be_component *node) ACE_TEXT ("failed\n")), -1); } - + os_ << be_uidt_nl << "}"; - + return 0; } @@ -63,24 +63,24 @@ be_visitor_connector_ami_rh_exs::visit_provides (be_provides *node) be_interface::narrow_from_decl (node->provides_type ()); this->init (true); - + const char *suffix = "ReplyHandler_i"; - + os_ << be_nl << this->iface_name_ << suffix << "::" << this->iface_name_ << suffix << " (void)" << be_nl << "{" << be_nl << "}"; - + os_ << be_nl << be_nl << this->iface_name_ << suffix << "::~" << this->iface_name_ << suffix << " (void)" << be_nl << "{" << be_nl << "}"; - + ACE_CString port_pfix = this->ctx_->port_prefix (); this->ctx_->port_prefix () = ""; - + /// This overload of traverse_inheritance_graph() used here /// doesn't automatically prime the queues. this->callback_iface_->get_insert_queue ().reset (); @@ -105,8 +105,8 @@ be_visitor_connector_ami_rh_exs::visit_provides (be_provides *node) ACE_TEXT ("callback interface failed\n")), -1); } - - this->ctx_->port_prefix () = port_pfix; + + this->ctx_->port_prefix () = port_pfix; return 0; } @@ -115,12 +115,12 @@ be_visitor_connector_ami_rh_exs::visit_operation ( be_operation *node) { AST_Decl::NodeType nt = node->defined_in ()->scope_node_type (); - + if (nt != AST_Decl::NT_interface) { return 0; } - + be_visitor_operation_exs v (this->ctx_); v.scope (this->callback_iface_); v.class_extension ("_i"); diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp index 7a984d168ce..b5c1167371d 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp @@ -44,7 +44,7 @@ be_visitor_connector_dds_ex_base::begin (be_connector *node) if (this->t_args_ == 0) { this->process_template_args (node); - + if (this->t_args_ == 0) { return false; @@ -58,8 +58,8 @@ be_visitor_connector_dds_ex_base::begin (be_connector *node) << "_Impl" << be_nl << "{" << be_idt; - this->base_tname_ = node->local_name (); - + this->base_tname_ = node->local_name (); + return true; } @@ -69,7 +69,7 @@ be_visitor_connector_dds_ex_base::process_template_args ( { AST_Module *m = AST_Module::narrow_from_scope (node->defined_in ()); - + /// We assume the connector comes from the instantiation /// of a template module, and the regular module it's /// defined in (at some level) will have a reference to it. diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index 7874bf9b22f..918a39c2de4 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -39,10 +39,10 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) { return -1; } - + this->gen_dds_traits (); this->gen_connector_traits (); - + /// Unset the flags in the port interfaces list so /// they can be used again in another connector. for (ACE_Unbounded_Queue<be_interface *>::ITERATOR iter ( @@ -52,10 +52,10 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) { be_interface **item = 0; iter.next (item); - + (*item)->dds_connector_traits_done (false); } - + /// Assumes parent connector exists and is either DDS_State /// or DDS_Event, so we generate inheritance from the /// corresponding template. May have to generalize this logic. @@ -116,9 +116,9 @@ be_visitor_connector_dds_exh::visit_provides (be_provides *node) { be_interface *iface = be_interface::narrow_from_decl (node->provides_type ()); - + this->gen_interface_connector_trait (iface, true); - + return 0; } @@ -127,9 +127,9 @@ be_visitor_connector_dds_exh::visit_uses (be_uses *node) { be_interface *iface = be_interface::narrow_from_decl (node->uses_type ()); - + this->gen_interface_connector_trait (iface, false); - + return 0; } @@ -166,7 +166,7 @@ be_visitor_connector_dds_exh::gen_dds_traits (void) { os_ << "RTI"; } - + os_ << "Seq dds_seq_type;" << be_nl << "typedef ::" << dt_name << "TypeSupport type_support;" << be_nl @@ -214,9 +214,9 @@ be_visitor_connector_dds_exh::gen_connector_traits (void) bool global_comp = (comp_scope->node_type () == AST_Decl::NT_root); - + os_ << be_nl << be_nl - << "struct DDS_" << this->node_->local_name () + << "struct DDS_" << this->node_->local_name () << "_Traits" << be_nl << "{" << be_idt_nl << "typedef ::CIAO_" << this->node_->flat_name () << "_Impl::" @@ -226,7 +226,7 @@ be_visitor_connector_dds_exh::gen_connector_traits (void) << "typedef " << (global_comp ? "" : "::") << comp_scope->name () << "::CCM_" << this->node_->local_name () << "_Context context_type;"; - + if (this->visit_component_scope (this->node_) == -1) { ACE_ERROR ((LM_ERROR, @@ -236,7 +236,7 @@ be_visitor_connector_dds_exh::gen_connector_traits (void) return; } - + os_ << be_uidt_nl << "};"; } @@ -247,18 +247,18 @@ be_visitor_connector_dds_exh::gen_interface_connector_trait ( bool for_facet) { if (!iface->dds_connector_traits_done ()) - { + { AST_Decl *scope = ScopeAsDecl (iface->defined_in ()); bool global = (scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (global ? "" : "::"); const char *lname = iface->local_name (); - + os_ << be_nl << "typedef ::" << scope->name () << smart_scope << (for_facet ? "CCM_" : "") << lname << " " << tao_cg->downcase (lname) << "_type;"; - - iface->dds_connector_traits_done (true); + + iface->dds_connector_traits_done (true); this->port_ifaces_.enqueue_tail (iface); } } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp index 0b244cfb1d8..c591e26d5b5 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp @@ -39,7 +39,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) { return -1; } - + os_ << be_nl << this->node_->local_name () << "_exec_i::" << this->node_->local_name () << "_exec_i (void)" @@ -78,7 +78,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) } os_ << "DDS4CCM_NDDS" << ">"; - + os_ << "()" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp index 06fb1124656..48143a2d78f 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp @@ -47,7 +47,7 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node) << scope->local_name () << suffix << " (void);" << be_nl << "virtual ~" << scope->local_name () << suffix << " (void);"; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -58,7 +58,7 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node) } os_ << be_nl << be_nl - << "virtual void set_session_context (" + << "virtual void set_session_context (" << "::Components::SessionContext_ptr ctx);" << be_nl << be_nl << "virtual void configuration_complete (void);" diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp index f5d737fd83a..41233256b86 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp @@ -33,13 +33,13 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) ACE_CString class_name_str (scope->local_name ()->get_string ()); class_name_str += suffix; const char *class_name = class_name_str.c_str (); - + os_ << be_nl << be_nl << class_name << "::" << class_name << " (void)" << be_idt_nl << ": facet_exec_ (new "; - - /// The port is the only item in the connector's scope. + + /// The port is the only item in the connector's scope. UTL_ScopeActiveIterator j (node, UTL_Scope::IK_decls); AST_Extended_Port *p = AST_Extended_Port::narrow_from_decl (j.item ()); @@ -50,24 +50,24 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) { AST_Decl *d = i.item (); AST_Provides *p = AST_Provides::narrow_from_decl (d); - + if (p != 0) { os_ << p->provides_type ()->local_name (); } } - + os_ << suffix << " ())" << be_uidt_nl << "{" << be_nl << "}"; - + os_ << be_nl << be_nl << class_name << "::~" << class_name << " (void)" << be_nl << "{" << be_idt_nl << "::CORBA::release (this->facet_exec_);" << be_uidt_nl << "}"; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -76,7 +76,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) ACE_TEXT ("visit_scope() failed\n")), -1); } - + os_ << be_nl << be_nl << "void" << be_nl << class_name << "::set_session_context (" << be_idt_nl @@ -86,26 +86,26 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) << "this->facet_exec_->set_session_context " << "(ctx);" << be_uidt_nl << "}"; - + os_ << be_nl << be_nl << "void" << be_nl << class_name << "::configuration_complete (void)" << be_nl << "{" << be_idt_nl << "this->facet_exec_->_set_component (this);" << be_uidt_nl << "}"; - + os_ << be_nl << be_nl << "void" << be_nl << class_name << "::ccm_activate (void)" << be_nl << "{" << be_nl << "}"; - + os_ << be_nl << be_nl << "void" << be_nl << class_name << "::ccm_passivate (void)" << be_nl << "{" << be_nl << "}"; - + AST_Decl *s = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (s->node_type () == AST_Decl::NT_root); @@ -120,7 +120,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) << "CCM_" << this->node_->local_name () << "::_nil ());" << be_uidt << be_uidt_nl << "}"; - + return 0; } @@ -131,18 +131,18 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node) AST_Decl *scope = ScopeAsDecl (t->defined_in ()); bool global = (scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (global ? "" : "::"); - + os_ << be_nl << be_nl << smart_scope << scope->full_name () << "::CCM_" << t->local_name () << "_ptr" << be_nl << ScopeAsDecl (this->node_->defined_in ())->local_name () << "_exec_i::get_"; - + /// The port is the only thing in the connector's scope, and - /// we need to insert its name into the operation name. + /// we need to insert its name into the operation name. UTL_ScopeActiveIterator i (this->node_, UTL_Scope::IK_decls); AST_Decl *d = i.item (); - + os_ << d->local_name () << "_" << node->local_name () << " (void)" << be_nl << "{" << be_idt_nl @@ -150,7 +150,7 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node) << smart_scope << scope->full_name () << "::CCM_" << t->local_name () << "::_duplicate (" << "this->facet_exec_);" << be_uidt_nl << "}"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp index 92916335bc3..548c623aec6 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp @@ -88,7 +88,7 @@ be_visitor_facet_ami_exh::visit_operation (be_operation *node) { return 0; } - + /// We're generating implementation operation declarations, /// so we can just use this visitor. be_visitor_operation_ih v (this->ctx_); @@ -124,7 +124,7 @@ be_visitor_facet_ami_exh::init (bool for_impl) /// by -GC, which must be applied to this IDL file. this->handler_str_ = this->scope_name_; this->handler_str_ += this->smart_scope_; - + this->handler_str_ += (for_impl ? "" : "AMI_"); ACE_CString tmp (this->iface_name_); this->handler_str_ += @@ -211,7 +211,7 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void) << iface_name << suffix << " (void);" << be_nl << be_nl << "virtual ~" << iface_name << suffix << " (void);"; - + if (this->visit_scope (this->iface_) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -221,11 +221,11 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void) ACE_TEXT ("interface failed\n")), -1); } - + os_ << be_nl << be_nl - << "virtual void set_session_context (" + << "virtual void set_session_context (" << "::Components::SessionContext_ptr ctx);"; - + AST_Decl *s = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (s->node_type () == AST_Decl::NT_root); @@ -233,13 +233,13 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void) os_ << be_nl << be_nl << "virtual ::CORBA::Object_ptr _get_component (void);"; - + os_ << be_nl << be_nl << "virtual void _set_component (" << be_idt_nl << "::" << s->name () << smart_scope << "CCM_" << this->node_->local_name () << "_ptr);" << be_uidt; - + os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl << "::" << s->name () << smart_scope diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp index f0593049bdc..486e2ae00bd 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp @@ -256,7 +256,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void) << "throw ::CORBA::INTERNAL ();" << be_uidt_nl << "}" << be_uidt << be_uidt_nl << "}"; - + AST_Decl *s = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (s->node_type () == AST_Decl::NT_root); @@ -273,7 +273,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void) << "this->component_.in ());" << be_uidt << be_uidt << be_uidt_nl << "}"; - + os_ << be_nl << be_nl << "void" << be_nl << iface_name << "_exec_i::_set_component (" << be_idt_nl @@ -334,7 +334,7 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node) os_ << "if (! ::CORBA::is_nil (this->callback_.in ()))" << be_idt_nl << "{" << be_idt_nl; - + if (is_excep) { os_ << "::CCM_AMI::ExceptionHolder_i holder (excep_holder);" @@ -366,7 +366,7 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node) } os_ << be_uidt_nl << "}" << be_uidt_nl; - + os_ << be_nl << "::PortableServer::ObjectId_var oid =" << be_idt_nl << "this->poa_->servant_to_id (this);" << be_uidt_nl @@ -395,11 +395,11 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) ACE_TEXT ("list failed\n")), -1); } - + AST_Decl *scope = ScopeAsDecl (this->iface_->defined_in ()); bool global = (scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (global ? "" : "::"); - + const char *prefix = "AMI4CCM_"; ACE_CString iface_str (this->iface_->local_name ()); ACE_CString orig_iface_str ( @@ -412,14 +412,14 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) << orig_iface_name << "_var receptacle_objref =" << be_idt_nl << "this->context_->get_connection_ami4ccm_port_ami4ccm_uses ();" << be_uidt_nl << be_nl; - + os_ << "if (! ::CORBA::is_nil (receptacle_objref.in ()))" << be_idt_nl << "{" << be_idt_nl << "::" << scope->full_name () << smart_scope << "AMI_" << orig_iface_name << "Handler_var the_handler_var;" << be_nl << be_nl; - + os_ << "if (! ::CORBA::is_nil (ami_handler))" << be_idt_nl << "{" << be_idt_nl << "::CIAO::Context_Impl_Base *ctx_base =" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp index 58d6e600d15..1b8d5fb836a 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp @@ -39,7 +39,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node) } AST_Decl::NodeType snt = node->defined_in ()->scope_node_type (); - bool in_class = (snt != AST_Decl::NT_root + bool in_class = (snt != AST_Decl::NT_root && snt != AST_Decl::NT_module); if (be_global->gen_inline_constants () && !in_class) { @@ -69,7 +69,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node) *os << "#ifndef ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE" << be_nl << " "; } *os << "const "; - + if (node->et () == AST_Expression::EV_enum) { *os << node->enum_full_name (); diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp index 2761135062a..0b400431c6e 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp @@ -43,7 +43,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node) << "// " << __FILE__ << ":" << __LINE__; be_module *module = 0; - + if (node->is_nested ()) { AST_Decl *d = node; @@ -68,18 +68,18 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - + // Generate the Any <<= and >>= operators. *os << be_nl << be_nl << macro << " void operator<<= (::CORBA::Any &, ::" << node->name () << ");" << be_nl; *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ::" << node->name () << " &);"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index 26686877228..f6cc65f415a 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -72,7 +72,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "}" << be_uidt_nl << "}" << be_nl << be_nl; } - + *os << be_global->core_versioning_end () << be_nl; @@ -101,10 +101,10 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) // Some compilers handle "any" operators in a namespace corresponding // to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - - + + // Generate the Any <<= and >>= operator declarations // Any <<= and >>= operators. *os << "void operator<<= (" << be_idt << be_idt_nl @@ -119,7 +119,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "_tao_elem" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - + *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl << "::" << node->name () << " &_tao_elem" << be_uidt_nl @@ -133,9 +133,9 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "_tao_elem " << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp index fcac3e1c015..1ca558b725e 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp @@ -48,7 +48,7 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *node) *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO_InputCDR &strm, " << node->name () << " &_tao_enumerator);" << be_nl; - + if (be_global->gen_ostream_operators ()) { *os << be_nl 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 cc754ea58da..126c5f4835c 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 @@ -62,7 +62,7 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node) << "}" << be_uidt_nl << be_nl << "return _tao_success;" << be_uidt_nl << "}" << be_nl; - + if (be_global->gen_ostream_operators ()) { node->gen_ostream_operator (os, false); diff --git a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp index dbe1732044e..43a1f062c0e 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitors for generation of code for Enum for the + * Visitors for generation of code for Enum for the * TAO::DCPS::Serializer operators * * diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp index cf5f5d9ed18..31bd6886bf4 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp @@ -68,9 +68,9 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - + *os << be_nl << be_nl << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name () << " &); // copying version" << be_nl; @@ -80,17 +80,17 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) << node->name () << " *&); // deprecated\n"; *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::" << node->name () << " *&);"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; } } - + *os << be_global->core_versioning_begin () << be_nl; - + *os << be_nl << be_nl << macro << " void operator<<= (::CORBA::Any &, const " << node->name () << " &); // copying version" << be_nl; @@ -107,7 +107,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) { *os << "\n\n#endif"; } - + // All we have to do is to visit the scope and generate code. if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp index 7295a43fa2a..48c386cc626 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp @@ -110,7 +110,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "}" << be_uidt_nl << "}"; } - + *os << be_global->core_versioning_end () << be_nl; be_module *module = 0; @@ -204,16 +204,16 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "_tao_elem" << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n"; } } - - + + *os << be_global->core_versioning_begin () << be_nl; // Copying insertion operator. @@ -281,12 +281,12 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "}"; *os << be_global->core_versioning_end () << be_nl; - + if (module != 0) { *os << "\n\n#endif"; } - + // all we have to do is to visit the scope and generate code if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp index 70351c7ebcf..dd99bcb8f51 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp @@ -69,7 +69,7 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_ch::" "visit_exception - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } 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 6b4a0e5759e..83ffd94c97e 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 @@ -39,7 +39,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_cs::" "visit_exception - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -71,9 +71,9 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_cs::" "visit_exception - " - "codegen for field decl scope failed\n"), + "codegen for field decl scope failed\n"), -1); - } + } // some members *os << "// First marshal the repository ID." << be_nl @@ -87,7 +87,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_cs::" "visit_exception - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -150,7 +150,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_cs::" "visit_exception - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -178,7 +178,7 @@ int be_visitor_exception_cdr_op_cs::post_process (be_decl *bd) { // This checks for members of an enum 'non-scope' declared inside - // the exception. If an enum val is actually a member, it will + // the exception. If an enum val is actually a member, it will // have node type NT_field. if (bd->node_type () == AST_Decl::NT_enum_val) { diff --git a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp index f7004e00d38..19f6b90b04e 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp @@ -147,13 +147,13 @@ be_visitor_exception_ctor_assign::visit_interface (be_interface *node) if (this->ctx_->exception ()) // Special constructor. { *os << "this->" << bd->local_name () << " = TAO::Objref_Traits<" - << node->name () << ">::duplicate (_tao_" + << node->name () << ">::duplicate (_tao_" << bd->local_name () << ");"; } else { *os << "this->" << bd->local_name () << " = TAO::Objref_Traits<" - << node->name () << ">::duplicate (_tao_excp." + << node->name () << ">::duplicate (_tao_excp." << bd->local_name () << ".in ());"; } @@ -350,7 +350,7 @@ be_visitor_exception_ctor_assign::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -381,7 +381,7 @@ be_visitor_exception_ctor_assign::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp index 5464067f9ee..e9e2a557895 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp @@ -40,7 +40,7 @@ int be_visitor_exception_ci::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception::" "visit_exception -" - "code for inline failed\n"), + "code for inline failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp index ff8de1848d2..b2b33af37b2 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp @@ -397,7 +397,7 @@ be_visitor_exception_ctor::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -435,7 +435,7 @@ be_visitor_exception_ctor::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp index c3337ae628f..be27d59a7c7 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp @@ -46,7 +46,7 @@ be_visitor_field_cdr_op_ch::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_ch::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -89,7 +89,7 @@ be_visitor_field_cdr_op_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -189,7 +189,7 @@ be_visitor_field_cdr_op_ch::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -251,7 +251,7 @@ be_visitor_field_cdr_op_ch::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp index 707c33f646c..3ff50b0805a 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp @@ -775,7 +775,7 @@ be_visitor_field_cdr_op_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -869,7 +869,7 @@ be_visitor_field_cdr_op_cs::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp index 35a9011d92f..a56468bda53 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp @@ -459,7 +459,7 @@ be_visitor_field_ch::visit_structure_fwd (be_structure_fwd *node) { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -546,7 +546,7 @@ be_visitor_field_ch::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp index 83dc00f14ea..f7ac597e587 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp @@ -30,13 +30,13 @@ be_visitor_field_ci::visit_field (be_field *node) { be_type *bt = be_type::narrow_from_decl (node->field_type ()); - + if (!bt) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -47,7 +47,7 @@ be_visitor_field_ci::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_field - " - "codegen for field type failed\n"), + "codegen for field type failed\n"), -1); } @@ -71,7 +71,7 @@ be_visitor_field_ci::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -100,7 +100,7 @@ be_visitor_field_ci::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -114,7 +114,7 @@ be_visitor_field_ci::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -129,7 +129,7 @@ be_visitor_field_ci::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_ci::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -152,7 +152,7 @@ be_visitor_field_ci::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_union - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -165,7 +165,7 @@ be_visitor_field_ci::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp index 348139582bc..278aa734ac1 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp @@ -41,7 +41,7 @@ be_visitor_field_cs::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -52,7 +52,7 @@ be_visitor_field_cs::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_field - " - "codegen for field type failed\n"), + "codegen for field type failed\n"), -1); } @@ -74,7 +74,7 @@ be_visitor_field_cs::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -97,7 +97,7 @@ be_visitor_field_cs::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -120,7 +120,7 @@ be_visitor_field_cs::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -143,7 +143,7 @@ be_visitor_field_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -157,7 +157,7 @@ be_visitor_field_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -172,7 +172,7 @@ be_visitor_field_cs::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_ci::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -195,7 +195,7 @@ be_visitor_field_cs::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_union - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -208,7 +208,7 @@ be_visitor_field_cs::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp index 48891c1aead..d18d39805a5 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating TAO::DCPS::Serializer operator declarator for field + * Visitor generating TAO::DCPS::Serializer operator declarator for field * in the client header * * @@ -48,7 +48,7 @@ be_visitor_field_serializer_op_ch::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_serializer_op_ch::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -91,7 +91,7 @@ be_visitor_field_serializer_op_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_serializer_op_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp index d01d7c8fd06..79f06724d11 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp @@ -782,7 +782,7 @@ be_visitor_field_serializer_op_cs::visit_string (be_string *node) if (node->node_type() == AST_Decl::NT_wstring) { *os << "_dcps_max_marshaled_size_ulong() + " - << "(_tao_aggregate." << f->local_name () << ".in () ? " + << "(_tao_aggregate." << f->local_name () << ".in () ? " << "ACE_OS::strlen(_tao_aggregate." << f->local_name () << ".in ()) * sizeof (CORBA::WChar) : 0)"; } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp index 8490704fe76..7e11bcf5344 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp @@ -36,16 +36,16 @@ be_visitor_home_exh::visit_home (be_home *node) { return 0; } - + node_ = node; comp_ = node_->managed_component (); - + /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl << be_nl << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + if (this->gen_exec_class () == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -54,12 +54,12 @@ be_visitor_home_exh::visit_home (be_home *node) ACE_TEXT ("gen_servant_class() failed\n")), -1); } - + this->gen_entrypoint (); os_ << be_uidt_nl << "}"; - + return 0; } @@ -83,10 +83,10 @@ be_visitor_home_exh::visit_factory (be_factory *node) os_ << be_nl << be_nl << "virtual ::Components::EnterpriseComponent_ptr" << be_nl << node->local_name (); - + // We can reuse this visitor. be_visitor_valuetype_init_arglist_ch v (this->ctx_); - + if (v.visit_factory (node) != 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -96,9 +96,9 @@ be_visitor_home_exh::visit_factory (be_factory *node) ACE_TEXT ("list failed\n")), -1); } - + os_ << ";"; - + return 0; } @@ -108,7 +108,7 @@ be_visitor_home_exh::gen_exec_class (void) // We don't want a '_cxx_' prefix here. const char *lname = node_->original_local_name ()->get_string (); - + os_ << be_nl << "class " << export_macro_.c_str () << " " << lname << "_exec_i" << be_idt_nl @@ -117,15 +117,15 @@ be_visitor_home_exh::gen_exec_class (void) << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt; - + os_ << be_nl << lname << "_exec_i (void);"; - + os_ << be_nl << be_nl << "virtual ~" << lname << "_exec_i (void);"; - + be_home *h = node_; - + while (h != 0) { if (this->visit_scope (h) != 0) @@ -136,19 +136,19 @@ be_visitor_home_exh::gen_exec_class (void) ACE_TEXT ("visit_scope() failed\n")), -1); } - + for (long i = 0; i < h->n_inherits (); ++i) { // A closure of all the supported interfaces is stored // in the base class 'pd_inherits_flat' member. be_interface *bi = be_interface::narrow_from_decl (h->inherits ()[i]); - + int status = bi->traverse_inheritance_graph ( be_visitor_home_exh::op_attr_decl_helper, &os_); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -159,21 +159,21 @@ be_visitor_home_exh::gen_exec_class (void) bi->full_name ()), -1); } - } - + } + h = be_home::narrow_from_decl (h->base_home ()); } - + os_ << be_nl << be_nl << "// Implicit operations."; - + os_ << be_nl << be_nl << "virtual ::Components::EnterpriseComponent_ptr" << be_nl << "create (void);"; os_ << be_uidt_nl << "};"; - + return 0; } @@ -184,7 +184,7 @@ be_visitor_home_exh::gen_entrypoint (void) << "extern \"C\" " << export_macro_.c_str () << " ::Components::HomeExecutorBase_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void);"; + << "_Impl (void);"; } int @@ -198,8 +198,8 @@ be_visitor_home_exh::op_attr_decl_helper (be_interface * /* derived */, ctx.state (TAO_CodeGen::TAO_ROOT_EXH); ctx.stream (os); be_visitor_home_exh visitor (&ctx); - - /// Since this visitor overriddes only visit_operation() and + + /// Since this visitor overriddes only visit_operation() and /// visit_attribute(), we can get away with this for the declarations. return visitor.visit_scope (ancestor); } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp index a57c9e65a34..ff1010a5022 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp @@ -140,9 +140,9 @@ be_visitor_home_exs::gen_exec_class (void) << lname << "_exec_i::~" << lname << "_exec_i (void)" << be_nl << "{" << be_nl << "}"; - + be_home *h = node_; - + while (h != 0) { if (this->visit_scope (h) != 0) @@ -154,14 +154,14 @@ be_visitor_home_exs::gen_exec_class (void) ACE_TEXT ("failed\n")), -1); } - + for (long i = 0; i < h->n_inherits (); ++i) { // A closure of all the supported interfaces is stored // in the base class 'pd_inherits_flat' member. be_interface *bi = be_interface::narrow_from_decl (h->inherits ()[i]); - + bi->get_insert_queue ().reset (); bi->get_del_queue ().reset (); bi->get_insert_queue ().enqueue_tail (bi); @@ -184,8 +184,8 @@ be_visitor_home_exs::gen_exec_class (void) bi->full_name ()), -1); } - } - + } + h = be_home::narrow_from_decl (h->base_home ()); } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp index 458afe2be1d..980a516ed8d 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp @@ -444,7 +444,7 @@ be_visitor_home_attr_set::visit_home (be_home *node) i.next ()) { be_decl *d = be_decl::narrow_from_decl (i.item ()); - + if (d->accept (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -454,9 +454,9 @@ be_visitor_home_attr_set::visit_home (be_home *node) -1); } } - + be_home *h = be_home::narrow_from_decl (node->base_home ()); - + return this->visit_home (h); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp index 9969e0061be..f86dbe4ef89 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp @@ -120,13 +120,13 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, { be_operation *op = be_operation::narrow_from_decl (d); - + /// These implied IDL operations are for stub-side only. if (op->is_sendc_ami ()) { continue; } - + *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; @@ -165,7 +165,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, { return -1; } - + *os << be_nl << be_nl; // Generate code in the inline file. diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp index efbe6efee68..7913f7d0fa4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp @@ -36,53 +36,53 @@ be_visitor_ami4ccm_rh_ex_idl::visit_interface (be_interface *node) << node->original_local_name () << "ReplyHandler" << be_idt_nl << ": "; - + long n_parents = node->n_inherits (); - + if (n_parents == 0) - { + { os_ << "::CCM_AMI::ReplyHandler"; } else { os_ << be_idt; - + for (long i = 0; i < n_parents; ++i) { if (i != 0) { os_ << "," << be_nl; } - + AST_Type *parent = node->inherits ()[i]; - + AST_Decl *d = ScopeAsDecl (parent->defined_in ()); - + bool global = (d->node_type () == AST_Decl::NT_root); - + os_ << (global ? "" : "::") << d->full_name () << "::AMI4CCM_" << parent->original_local_name () << "ReplyHandler"; } - + os_ << be_uidt; } - + os_ << be_uidt_nl << "{" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_rh_ex_idl") ACE_TEXT ("::visit_interface - ") ACE_TEXT ("visit_scope() failed\n")), - -1); + -1); } - + os_ << be_uidt_nl << "};"; - + return 0; } @@ -94,7 +94,7 @@ be_visitor_ami4ccm_rh_ex_idl::visit_operation (be_operation *node) // We do nothing for oneways! return 0; } - + if (node->is_sendc_ami ()) { return 0; @@ -103,37 +103,37 @@ be_visitor_ami4ccm_rh_ex_idl::visit_operation (be_operation *node) os_ << be_nl << "void " << node->original_local_name () << " (" << be_idt; - + if (!node->void_return_type ()) { be_type *t = be_type::narrow_from_decl (node->return_type ()); - + os_ << be_nl << "in " << IdentifierHelper::type_name (t, this) << " ami_return_val"; } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_rh_ex_idl") ACE_TEXT ("::visit_operation - ") ACE_TEXT ("visit_scope() failed\n")), - -1); + -1); } - + os_ << ");" << be_uidt; - + os_ << be_nl << "void " << node->original_local_name () << "_excep (" << be_idt_nl << "in ::CCM_AMI::ExceptionHolder excep_holder);" << be_uidt; - - /// Reset for next operation traversal. + + /// Reset for next operation traversal. this->seen_in_or_inout_arg_ = false; - + return 0; } @@ -141,12 +141,12 @@ int be_visitor_ami4ccm_rh_ex_idl::visit_attribute (be_attribute *node) { this->gen_attr_rh_ops (false, node); - + if (!node->readonly ()) { this->gen_attr_rh_ops (true, node); } - + return 0; } @@ -157,17 +157,17 @@ be_visitor_ami4ccm_rh_ex_idl::visit_argument (be_argument *node) { return 0; } - + be_type *t = be_type::narrow_from_decl (node->field_type ()); - + os_ << be_nl << "in "; - + os_ << IdentifierHelper::type_name (t, this); - + os_ << " " << node->original_local_name (); - + return 0; } @@ -208,21 +208,21 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node) { be_operation *op = be_operation::narrow_from_scope (this->ctx_->scope ()); - + if (op == 0) { return 0; } - + bool void_ret_type = op->void_return_type (); - + be_argument *arg = be_argument::narrow_from_decl (node); - + if (arg == 0) { return 0; } - + if (arg->direction () == AST_Argument::dir_IN) { return 0; @@ -231,7 +231,7 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node) if (!this->seen_in_or_inout_arg_) { this->seen_in_or_inout_arg_ = true; - + if (void_ret_type) { /// If we are here, we are generating the first @@ -240,11 +240,11 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node) return 0; } } - + /// If we are here after all the above checks, we - /// always want to generate a leading comma. + /// always want to generate a leading comma. os_ << ","; - + return 0; } @@ -255,19 +255,19 @@ be_visitor_ami4ccm_rh_ex_idl::gen_attr_rh_ops (bool is_set_op, os_ << be_nl << "void " << (is_set_op ? "set_" : "get_") << node->original_local_name () << " ("; - + if (!is_set_op) { be_type *t = be_type::narrow_from_decl (node->field_type ()); - + os_ << be_idt_nl << "in "; - + os_ << IdentifierHelper::type_name (t, this); - + os_ << " " << node->original_local_name () << be_uidt; } - + os_ << ");" << be_nl << "void " << (is_set_op ? "set_" : "get_") diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp index e4f4f3df1ad..7e4f1e347c0 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp @@ -36,36 +36,36 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_interface (be_interface *node) << "local interface AMI4CCM_" << node->original_local_name () << be_nl << "{" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_sendc_ex_idl") ACE_TEXT ("::visit_interface - ") ACE_TEXT ("visit_scope() failed\n")), - -1); + -1); } - + AST_Interface **inh_flat = node->inherits_flat (); - + for (long i = 0; i < node->n_inherits_flat (); ++i) { be_interface *ancestor = be_interface::narrow_from_decl (inh_flat[i]); - + if (this->visit_scope (ancestor) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_sendc_ex_idl") ACE_TEXT ("::visit_interface - visit ") ACE_TEXT ("ancestor scope failed\n")), - -1); + -1); } } - + os_ << be_uidt_nl << "};"; - + return 0; } @@ -77,7 +77,7 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_operation (be_operation *node) // We do nothing for oneways! return 0; } - + if (!node->is_sendc_ami ()) { return 0; @@ -86,17 +86,17 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_operation (be_operation *node) os_ << be_nl << "void " << node->original_local_name () << " (" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_rh_ex_idl::visit_operation - ") ACE_TEXT ("visit_scope() failed\n")), - -1); + -1); } - + os_ << ");" << be_uidt; - + return 0; } @@ -107,7 +107,7 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_argument (be_argument *node) { return 0; } - + /// AMI4CCM uses a different reply handler type, so we just /// replace the original handler parameter (which is always the /// first one) type. @@ -121,15 +121,15 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_argument (be_argument *node) { be_type *t = be_type::narrow_from_decl (node->field_type ()); - + os_ << be_nl << "in "; - + os_ << IdentifierHelper::type_name (t, this); } - + os_ << " " << node->original_local_name (); - + return 0; } @@ -169,24 +169,24 @@ int be_visitor_ami4ccm_sendc_ex_idl::pre_process (be_decl *node) { be_argument *arg = be_argument::narrow_from_decl (node); - + if (arg == 0) { return 0; } - + if (arg->direction () != AST_Argument::dir_IN) { return 0; } - + if (this->elem_number () == 1) { return 0; } os_ << ","; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp index 6e4f9c76cf5..fad0e3eb4f4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp @@ -41,10 +41,10 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) const char *macro = this->ctx_->export_macro (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; be_module *module = 0; @@ -96,7 +96,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) } *os << be_global->core_versioning_begin () << be_nl; - + *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () << "_ptr); // copying" << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp index f7d0caed56e..c8c3026b2f3 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp @@ -42,10 +42,10 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl; *os << be_global->core_versioning_begin () << 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 22d00a2ae0f..5c1ab004d63 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 @@ -62,7 +62,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) << "const " << node->full_name () << "_ptr _tao_objref)" << be_uidt << be_uidt_nl << "{" << be_idt_nl; - + AST_Decl::NodeType nt = node->node_type (); if (node->is_abstract ()) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp index 99b73167f7f..2881de3760a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp @@ -406,7 +406,7 @@ be_visitor_interface::visit_operation (be_operation *node) } case TAO_CodeGen::TAO_ROOT_CS: ctx.state (TAO_CodeGen::TAO_OPERATION_CS); - + if (node->is_sendc_ami ()) { be_visitor_operation_ami_cs visitor (&ctx); @@ -417,7 +417,7 @@ be_visitor_interface::visit_operation (be_operation *node) be_visitor_operation_cs visitor (&ctx); status = node->accept (&visitor); } - + break; case TAO_CodeGen::TAO_ROOT_SH: { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index e4cc2609d0a..818a49ef5fa 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -73,7 +73,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) } *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index e3e186606f3..949566c1530 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -92,10 +92,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from " << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; // Find if we are at the top scope or inside some module, @@ -165,10 +165,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node) } *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from " << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; // Generate code for the _is_a skeleton. @@ -520,7 +520,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) && !be_global->gen_minimum_corba ()) { *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from " << be_nl << "// " << __FILE__ << ":" << __LINE__; @@ -879,10 +879,10 @@ be_visitor_interface_ss::this_method (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; // The _this () operation. @@ -961,10 +961,10 @@ be_visitor_interface_ss::dispatch_method (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; *os << "void " << node->full_skel_name () @@ -1024,7 +1024,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node) || be_global->gen_thru_poa_collocation ()) { *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp index 431cc2f0159..eef8deab7ab 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp @@ -35,13 +35,13 @@ be_visitor_interface_svh::visit_interface (be_interface *node) { return 0; } - - // Skip implied IDL nodes. + + // Skip implied IDL nodes. if (node->original_interface () != 0) { return 0; } - + if (node->is_local () || node->imported () || node->is_abstract ()) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp index cfdfe89ec39..d493009484a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp @@ -35,13 +35,13 @@ be_visitor_interface_svs::visit_interface (be_interface *node) { return 0; } - - // Skip implied IDL nodes. + + // Skip implied IDL nodes. if (node->original_interface () != 0) { return 0; } - + if (node->is_local () || node->imported () || node->is_abstract ()) { return 0; @@ -56,7 +56,7 @@ be_visitor_interface_svs::visit_operation (be_operation *node) be_visitor_operation_svs v (this->ctx_); v.scope (be_interface::narrow_from_decl ( this->ctx_->scope ()->decl ())); - + return v.visit_operation (node); } @@ -64,11 +64,11 @@ int be_visitor_interface_svs::visit_attribute (be_attribute *node) { be_visitor_attribute v (this->ctx_); - + v.for_facets (true); v.op_scope (be_interface::narrow_from_decl ( this->ctx_->scope ()->decl ())); - + return v.visit_attribute (node); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp index ec4a3c01a27..257448e0622 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp @@ -95,7 +95,7 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd ( } *os << be_global->core_versioning_begin () << be_nl; - + *os << macro << " void" << " operator<<= (::CORBA::Any &, " << node->name () << "_ptr); // copying" << be_nl; @@ -107,7 +107,7 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd ( << node->name () << " *&);"; *os << be_global->core_versioning_end () << be_nl; - + if (module != 0) { *os << "\n\n#endif"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp index 9a250cebe6d..3ff4f512f52 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp @@ -55,7 +55,7 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + *os << be_global->stub_export_macro () << " ::CORBA::Boolean " << "operator<< (TAO_OutputCDR &, const " << node->full_name () << "_ptr );" << be_nl; @@ -64,7 +64,7 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node) << node->full_name () << "_ptr &);\n"; *os << be_global->core_versioning_end () << be_nl; - + node->cli_hdr_cdr_op_gen (1); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp index aaf05f86ec7..639e9b080ab 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp @@ -35,7 +35,7 @@ be_visitor_module_any_op::visit_module (be_module *node) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module::visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp index 64bacbcde9d..53fe04bc832 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp @@ -35,7 +35,7 @@ be_visitor_module_cdr_op::visit_module (be_module *node) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module_cdr_op::visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp index 8a3f05abf91..66c7410f458 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp @@ -708,8 +708,8 @@ be_visitor_module::visit_component (be_component *node) case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SS: return this->visit_interface (node); - - // Nothing for these with components. + + // Nothing for these with components. case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH: case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS: case TAO_CodeGen::TAO_ROOT_IH: @@ -885,7 +885,7 @@ be_visitor_module::visit_connector (be_connector *node) case TAO_CodeGen::TAO_ROOT_CNH: { if (node->dds_connector ()) - { + { be_visitor_connector_dds_exh visitor (&ctx); status = node->accept (&visitor); break; @@ -900,7 +900,7 @@ be_visitor_module::visit_connector (be_connector *node) case TAO_CodeGen::TAO_ROOT_CNS: { if (node->dds_connector ()) - { + { be_visitor_connector_dds_exs visitor (&ctx); status = node->accept (&visitor); break; @@ -922,7 +922,7 @@ be_visitor_module::visit_connector (be_connector *node) // In all other cases, same as component. return this->visit_component (node); } - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -931,7 +931,7 @@ be_visitor_module::visit_connector (be_connector *node) ACE_TEXT ("failed to accept visitor\n")), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp index 0e70e377f49..139890224ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp @@ -36,7 +36,7 @@ be_visitor_module_ih::visit_module (be_module *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module_ih::" "visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } } diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp index 648a9d77167..eb8781f541b 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp @@ -64,7 +64,7 @@ be_visitor_module_sh::visit_module (be_module *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module_sh::" "visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp index cae4ec74c42..b1b3fada0fe 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for the TAO::DCPS::Serializer operators + * Visitor generating code for the TAO::DCPS::Serializer operators * for types defined in Module's scope. * * @@ -35,7 +35,7 @@ be_visitor_module_serializer_op::visit_module (be_module *node) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module_serializer_op::visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp index 9e774b8c4dd..661c5084a4d 100644 --- a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp @@ -47,7 +47,7 @@ be_visitor_native_ch::visit_native (be_native *node) << be_nl << be_nl; const char *node_name = node->full_name (); - + if (ACE_OS::strcmp (node_name, "PortableServer::ServantLocator::Cookie") == 0) { *os << "typedef void *Cookie;" << be_nl; @@ -75,12 +75,12 @@ be_visitor_native_ch::visit_native (be_native *node) // strip the "Seq" ending to get the sample's name const size_t max_name_length = 2000; - + if (ACE_OS::strlen (node_name) >= max_name_length) { return -1; } - + char sample_name[max_name_length]; ACE_OS::strncpy (sample_name, node_name, diff --git a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp index cf1ca9606e1..7b56d23ce99 100644 --- a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp +++ b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp @@ -33,7 +33,7 @@ int be_visitor_null_return_value::visit_array (be_array *) { os_ << "0"; - + return 0; } @@ -115,7 +115,7 @@ be_visitor_null_return_value::visit_predefined_type (be_predefined_type *node) default: // PT_void not handled. break; } - + return 0; } @@ -123,7 +123,7 @@ int be_visitor_null_return_value::visit_sequence (be_sequence *) { os_ << "0"; - + return 0; } @@ -131,7 +131,7 @@ int be_visitor_null_return_value::visit_string (be_string *) { os_ << "0"; - + return 0; } @@ -146,7 +146,7 @@ be_visitor_null_return_value::visit_structure (be_structure *node) { os_ << "0"; } - + return 0; } @@ -167,7 +167,7 @@ be_visitor_null_return_value::visit_union (be_union *node) { os_ << "0"; } - + return 0; } @@ -175,7 +175,7 @@ int be_visitor_null_return_value::visit_valuebox (be_valuebox *) { os_ << "0"; - + return 0; } @@ -183,7 +183,7 @@ int be_visitor_null_return_value::visit_valuetype (be_valuetype *) { os_ << "0"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp index 9d1e5760977..e2eb29ee6b3 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp @@ -37,7 +37,7 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node) return 0; } - /// These are not for the server side. + /// These are not for the server side. if (node->is_sendc_ami ()) { return 0; @@ -51,13 +51,13 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node) this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp index 98cd49868d3..6f9be7a1cc5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp @@ -30,7 +30,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) return 0; } - /// These are not for the server side. + /// These are not for the server side. if (node->is_sendc_ami ()) { return 0; @@ -43,13 +43,13 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp index 29b675f53ae..3cb11413d12 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp @@ -36,8 +36,8 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node) { return 0; } - - /// These are not for the server side. + + /// These are not for the server side. if (node->is_sendc_ami ()) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index d8b7930f3b8..25b4d1c3838 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -31,7 +31,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) return 0; } - /// These are not for the server side. + /// These are not for the server side. if (node->is_sendc_ami ()) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index 88b97927506..1b0ae066275 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -195,15 +195,15 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) be_interface *intf = be_interface::narrow_from_decl (parent); ACE_CString base (node->local_name ()->get_string ()); - + /// The sendc_* operation makes the invocation with the /// original operation name. ACE_CString lname_str (base.substr (ACE_OS::strlen ("sendc_"))); const char *lname = lname_str.c_str (); - + ACE_CString opname (node->is_attr_op () ? "_" : ""); opname += lname; - + /// Some compilers can't resolve the stream operator overload. const char *op_name = opname.c_str (); ACE_CDR::ULong len = opname.length (); @@ -227,7 +227,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) *os << be_uidt_nl << ");" << be_uidt; - + *os << be_nl << be_nl << "_tao_call.invoke (" << be_idt << be_idt_nl << "ami_handler," << be_nl @@ -240,7 +240,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) *os << gparent->name () << "::"; } - + *os << "AMI_" << parent->local_name () << "Handler::" << lname << "_reply_stub" << be_uidt_nl << ");" << be_uidt; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp index 5e28e5365ed..e9014ad1c17 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp @@ -275,7 +275,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_argument ( os->indent (); *os << "{" << bt->tc_name () << ", "; - + switch (node->direction ()) { case AST_Argument::dir_IN: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp index 207e0f6862a..a6d4d0ac176 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp @@ -37,7 +37,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) bool has_args = node->argument_count () > 0; *os << " ("; - + if (has_args) { *os << be_idt_nl; @@ -74,7 +74,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) } *os << ")"; - + if (has_args) { *os << be_uidt; @@ -112,7 +112,7 @@ be_visitor_operation_arglist::visit_factory (be_factory *node) bool has_args = node->argument_count () > 0; *os << " ("; - + if (has_args) { *os << be_idt_nl; @@ -134,12 +134,12 @@ be_visitor_operation_arglist::visit_factory (be_factory *node) } *os << ")"; - + if (has_args) { *os << be_uidt; } - + // At present, visit_factory() is called only from the home // servant source visitor, so we don't need to check the state // for semicolon generation. @@ -169,7 +169,7 @@ be_visitor_operation_arglist::visit_argument (be_argument *node) { be_factory *f = be_factory::narrow_from_scope (this->ctx_->scope ()); - + intf = be_interface::narrow_from_scope (f->defined_in ()); } else @@ -178,7 +178,7 @@ be_visitor_operation_arglist::visit_argument (be_argument *node) ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ()) : be_interface::narrow_from_scope (op->defined_in ()); } - + // Set new scope. ctx.scope (intf); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp index b0ff9d80ba5..7de506bd3b0 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp @@ -109,7 +109,7 @@ be_visitor_operation_argument_invoke::post_process (be_decl *bd) "Bad argument node\n"), -1); } - + switch (this->ctx_->sub_state ()) { case TAO_CodeGen::TAO_CDR_OUTPUT: @@ -156,7 +156,7 @@ be_visitor_operation_argument_invoke::post_process (be_decl *bd) "Bad sub state\n"), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp index b349e15e088..3a399e5a071 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp @@ -49,7 +49,7 @@ be_visitor_operation_argument_marshal::pre_process (be_decl *bd) "Bad argument node\n"), -1); } - + switch (arg->direction ()) { case AST_Argument::dir_IN: @@ -109,7 +109,7 @@ be_visitor_operation_argument_marshal::post_process (be_decl *bd) "Bad argument node\n"), -1); } - + switch (this->ctx_->sub_state ()) { case TAO_CodeGen::TAO_CDR_INPUT: @@ -199,7 +199,7 @@ be_visitor_args_decl::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_args_decl::" "visit_array - " - "cannot retrieve argument node\n"), + "cannot retrieve argument node\n"), -1); } @@ -207,8 +207,8 @@ be_visitor_args_decl::visit_array (be_array *node) // the full_name with or without the underscore and use it later on. char fname [NAMEBUFSIZE]; // to hold the full and - ACE_OS::memset (fname, - '\0', + ACE_OS::memset (fname, + '\0', NAMEBUFSIZE); if (!this->ctx_->alias () // not a typedef @@ -224,23 +224,23 @@ be_visitor_args_decl::visit_array (be_array *node) be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl (); - ACE_OS::sprintf (fname, - "%s::_%s", + ACE_OS::sprintf (fname, + "%s::_%s", parent->full_name (), node->local_name ()->get_string ()); } else { - ACE_OS::sprintf (fname, - "_%s", + ACE_OS::sprintf (fname, + "_%s", node->full_name ()); } } else { // Typedefed node. - ACE_OS::sprintf (fname, - "%s", + ACE_OS::sprintf (fname, + "%s", node->full_name ()); } @@ -272,7 +272,7 @@ be_visitor_args_decl::visit_typedef (be_typedef *node) "(%N:%l) be_visitor_args_decl::" "visit_typedef - " "Bad primitive type\n" - ), + ), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp index fba6f0e5bd4..0441d4bd023 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp @@ -21,7 +21,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); // We need the interface node in which this operation was defined. However, @@ -31,13 +31,13 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 48f13b135ce..06cf8a8faaa 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -140,13 +140,13 @@ be_visitor_operation::gen_stub_operation_body ( this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -195,7 +195,7 @@ be_visitor_operation::gen_stub_operation_body ( << "::CORBA::Object::tao_object_initialize (this);" << be_uidt_nl << "}" << be_uidt_nl << be_nl; - + if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ()) { *os << "if (this->the" << intf->base_proxy_broker_name () << "_ == 0)" @@ -283,11 +283,11 @@ be_visitor_operation::gen_stub_operation_body ( } opname += node->original_local_name ()->get_string (); - + /// Some compilers can't resolve the stream operator overload. const char *lname = opname.c_str (); ACE_CDR::ULong len = opname.length (); - + *os << lname << "\"," << be_nl << len << "," << be_nl; @@ -537,13 +537,13 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope, // without the leading double colon. *os << "::"; } - + /// For now, keep a list of system operation or arg names /// that may not be remapped. May decide later to regnerate - /// ORB code for alt mapping as well. + /// ORB code for alt mapping as well. ACE_CString repo_id (scope->repoID ()); bool sys_val = (repo_id == "IDL:repository_id:1.0"); - + // For types other than the 4 above, don't unalias the type name // in case it is a sequence or array. if (nt == AST_Decl::NT_string && bound == 0) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp index 4aa05cef6b7..5258b04e727 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp @@ -50,7 +50,7 @@ be_visitor_operation_ch::visit_operation (be_operation *node) ACE_TEXT ("Bad return type\n")), -1); } - + // Grab the right visitor to generate the return type. be_visitor_context ctx (*this->ctx_); be_visitor_operation_rettype or_visitor (&ctx); @@ -83,13 +83,13 @@ be_visitor_operation_ch::visit_operation (be_operation *node) "codegen for argument list failed\n"), -1); } - + be_interface *intf = be_interface::narrow_from_scope (node->defined_in ()); - + /// If we are in a reply handler, are not an execp_* operation, /// and have no native args, then generate the AMI static - /// reply stub declaration. + /// reply stub declaration. if (intf != 0 && intf->is_ami_rh () && !node->is_excep_ami () diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index 80f9ae985af..1d333391270 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -47,13 +47,13 @@ be_visitor_operation_cs::visit_operation (be_operation *node) this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -103,7 +103,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) "codegen for return type failed\n"), -1); } - + // Generate the operation name *os << be_nl << intf->name () << "::" << node->local_name (); @@ -130,10 +130,10 @@ be_visitor_operation_cs::visit_operation (be_operation *node) "codegen for stub body failed\n"), -1); } - + /// If we are in a reply handler, are not an execp_* operation, /// and have no native args, then generate the AMI static - /// reply stub declaration. + /// reply stub declaration. if (intf != 0 && intf->is_ami_rh () && !node->is_excep_ami () @@ -141,9 +141,9 @@ be_visitor_operation_cs::visit_operation (be_operation *node) { be_visitor_operation_ami_handler_reply_stub_operation_cs v ( this->ctx_); - + int status = v.visit_operation (node); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -153,7 +153,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) -1); } } - + return 0; } @@ -191,6 +191,6 @@ be_visitor_operation_cs::visit_argument (be_argument *node) } *os << "0}"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp index 8b3ab313083..2229c61d5c6 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp @@ -37,7 +37,7 @@ be_visitor_operation_exs::visit_operation (be_operation *node) this->ctx_->node (node); os_ << be_nl << be_nl; - + // Retrieve the operation return type. be_type *rt = be_type::narrow_from_decl (node->return_type ()); @@ -70,8 +70,8 @@ be_visitor_operation_exs::visit_operation (be_operation *node) << scope_->original_local_name ()->get_string () << this->class_extension_.c_str () << "::" << node->local_name (); - - // Generate the argument list, which will use our overrridden + + // Generate the argument list, which will use our overrridden // visit_argument(). be_visitor_operation_arglist al_visitor (this->ctx_); al_visitor.unused (true); @@ -88,7 +88,7 @@ be_visitor_operation_exs::visit_operation (be_operation *node) // Must set this again, it's been changed by traversals above. this->ctx_->node (node); - + return this->gen_op_body (rt); } @@ -110,16 +110,16 @@ be_visitor_operation_exs::gen_op_body (be_type *return_type) os_ << be_nl << "{" << be_idt_nl << your_code_here_; - + be_operation *op = be_operation::narrow_from_decl (this->ctx_->node ()); - + if (! op->void_return_type ()) { os_ << be_nl; - + be_null_return_emitter emitter (this->ctx_); - + if (emitter.emit (return_type) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -130,10 +130,10 @@ be_visitor_operation_exs::gen_op_body (be_type *return_type) -1); } } - + os_ << be_uidt_nl << "}"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp index 1e1a89544e9..aa741c77706 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp @@ -36,7 +36,7 @@ be_visitor_operation_ih::visit_operation (be_operation *node) TAO_OutStream *os = this->ctx_->stream (); this->ctx_->node (node); - + *os << be_nl << be_nl; if (be_global->gen_impl_debug_info ()) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp index faf04367558..4cf1e975792 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp @@ -33,7 +33,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); this->ctx_->node (node); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 5933502c8ef..bcb02b81a7c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -33,7 +33,7 @@ be_visitor_operation_ss::visit_operation (be_operation * node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); be_type *bt = 0; @@ -131,9 +131,9 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node, UTL_Scope *s = this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); - + if (intf == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp index f23dbd3eb1b..d97d5f04ee5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp @@ -19,7 +19,7 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); this->ctx_->node (node); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp index 5b607d1214f..323474b95be 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp @@ -133,7 +133,7 @@ be_visitor_operation_rettype::visit_sequence ( be_sequence *node) { *os << "::" << this->type_name (node); - + if (!be_global->alt_mapping () || !node->unbounded ()) { *os << " *"; @@ -147,7 +147,7 @@ be_visitor_operation_rettype::visit_string (be_string *node) { ACE_CDR::ULong bound = node->max_size ()->ev ()->u.ulval; bool wide = (node->width () != (long) sizeof (char)); - + if (wide) { *os << "::CORBA::WChar *"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp index fff9050a710..9c012f6efc7 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp @@ -208,7 +208,7 @@ be_visitor_operation_rettype_return_cs::visit_union ( { *os << "_tao_retval"; } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp index e5a1973d1b6..37efa14f16b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp @@ -42,13 +42,13 @@ int be_visitor_operation_smart_proxy_cs::visit_operation (be_operation *node) this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp index 33c2f374789..3c0d92de45a 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp @@ -37,7 +37,7 @@ be_visitor_operation_tie_sh::visit_operation (be_operation *node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); this->ctx_->node (node); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp index a4e93c33c3e..7eb1d69fc16 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp @@ -35,7 +35,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); be_interface *intf = this->ctx_->interface (); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp index 874ba46a403..aa891246704 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp @@ -34,7 +34,7 @@ be_visitor_operation_upcall_command_ss::visit ( { return 0; } - + be_interface * const intf = this->ctx_->attribute () ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ()) : be_interface::narrow_from_scope (node->defined_in ()); @@ -71,7 +71,7 @@ be_visitor_operation_upcall_command_ss::visit ( be_util::gen_nested_namespace_begin (&os, module, true); } - + be_visitor_context ctx (*this->ctx_); // save the node. @@ -225,7 +225,7 @@ be_visitor_operation_upcall_command_ss::gen_upcall ( bool excep_method = ((ACE_OS::strstr (op_name, excep_suffix) + excep_suffix_len) == (op_name + ACE_OS::strlen (op_name))); - + for (; !si.is_done (); si.next (), ++index) { AST_Argument * const arg = @@ -348,7 +348,7 @@ be_visitor_operation_upcall_command_ss::gen_upcall ( exceplist.visit_operation (node); unsigned int exceptions_count = 0; - + for (UTL_ExceptlistActiveIterator ei (node->exceptions ()); !ei.is_done (); ei.next ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp index 18443c5f93a..54b14ed1c47 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp @@ -31,17 +31,17 @@ int be_visitor_root_any_op::visit_root (be_root *node) { if (be_global->gen_anyop_files ()) - { + { // Switch streams, ctx will be reassigned when this // pass is done. switch (this->ctx_->state ()) { case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: this->ctx_->stream (tao_cg->anyop_header ()); - break; + break; case TAO_CodeGen::TAO_ROOT_ANY_OP_CS: this->ctx_->stream (tao_cg->anyop_source ()); - break; + break; default: break; } @@ -51,9 +51,9 @@ be_visitor_root_any_op::visit_root (be_root *node) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_root::visit_root - ") - ACE_TEXT ("codegen for scope failed\n")), + ACE_TEXT ("codegen for scope failed\n")), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp index e20bdbdf021..5df9e4d564f 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp @@ -35,7 +35,7 @@ be_visitor_root_cdr_op::visit_root (be_root *node) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_root_cdr_op::") ACE_TEXT ("visit_root - codegen ") - ACE_TEXT ("for scope failed\n")), + ACE_TEXT ("for scope failed\n")), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp index 108787d3106..208d88336fb 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp @@ -36,7 +36,7 @@ be_visitor_root_ch::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + this->gen_fwd_decls (); if (this->visit_scope (node) == -1) @@ -46,11 +46,11 @@ be_visitor_root_ch::visit_root (be_root *node) ACE_TEXT ("codegen for scope failed\n")), -1); } - + this->gen_proxy_broker_factory_pointers (); - + this->gen_ref_counting_overrides (); - + this->gen_static_corba_overrides (); if (this->gen_obv_decls (node) == -1) @@ -80,7 +80,7 @@ be_visitor_root_ch::visit_root (be_root *node) ACE_TEXT ("failed to export templates\n")), -1); } - + if (this->gen_any_ops (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -122,7 +122,7 @@ be_visitor_root_ch::init (void) int status = tao_cg->start_client_header ( be_global->be_get_client_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -133,9 +133,9 @@ be_visitor_root_ch::init (void) /// Initialize the stream. this->ctx_->stream (tao_cg->client_header ()); - + this->o_ = this->ctx_->stream (); - + return 0; } @@ -177,15 +177,15 @@ void be_visitor_root_ch::gen_proxy_broker_factory_pointers (void) { size_t size = be_global->non_local_interfaces.size (); - + if (size == 0) { return; } - + size_t index = 0; be_interface *i = 0; - + *o_ << be_nl << be_nl << "// Proxy Broker Factory function pointer declarations." << be_nl << be_nl @@ -214,12 +214,12 @@ void be_visitor_root_ch::gen_ref_counting_overrides (void) { size_t size = be_global->non_defined_interfaces.size (); - + if (size == 0) { return; } - + size_t index = 0; be_interface_fwd *ifwd = 0; @@ -260,12 +260,12 @@ void be_visitor_root_ch::gen_static_corba_overrides (void) { size_t size = idl_global->mixed_parentage_interfaces ().size (); - + if (size == 0) { return; } - + size_t index = 0; AST_Interface *i = 0; @@ -327,8 +327,8 @@ be_visitor_root_ch::gen_template_exports (be_root *node) { return 0; } - - be_visitor_context ctx = *this->ctx_; + + be_visitor_context ctx = *this->ctx_; be_visitor_template_export export_visitor (&ctx); return node->accept (&export_visitor); } @@ -372,7 +372,7 @@ be_visitor_root_ch::gen_dds_serializer_ops (be_root *node) { return 0; } - + be_visitor_context ctx = *this->ctx_; ctx.state (TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH); be_visitor_root_cdr_op visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp index 540759a7ad3..017c73ec855 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp @@ -36,7 +36,7 @@ be_visitor_root_cnh::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -46,9 +46,9 @@ be_visitor_root_cnh::visit_root (be_root *node) } (void) tao_cg->end_ciao_conn_header (); - + TAO_OutStream *rh_impl = tao_cg->ciao_ami_rh_impl_header (); - + /// If this stream has been created during the connector AST /// pass we generate the file ending stuff here, to make sure /// that all the AST nodes have been traversed. @@ -56,7 +56,7 @@ be_visitor_root_cnh::visit_root (be_root *node) { (void) tao_cg->end_ciao_ami_rh_impl_header (); } - + return 0; } @@ -67,7 +67,7 @@ be_visitor_root_cnh::init (void) int status = tao_cg->start_ciao_conn_header ( be_global->be_get_ciao_conn_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp index 5da09f03cad..9995a73c7c8 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp @@ -36,7 +36,7 @@ be_visitor_root_cns::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -48,7 +48,7 @@ be_visitor_root_cns::visit_root (be_root *node) (void) tao_cg->end_ciao_conn_source (); TAO_OutStream *rh_impl = tao_cg->ciao_ami_rh_impl_source (); - + /// If this stream has been created during the connector AST /// pass we generate the file ending stuff here, to make sure /// that all the AST nodes have been traversed. @@ -56,7 +56,7 @@ be_visitor_root_cns::visit_root (be_root *node) { (void) tao_cg->end_ciao_ami_rh_impl_source (); } - + return 0; } @@ -67,7 +67,7 @@ be_visitor_root_cns::init (void) int status = tao_cg->start_ciao_conn_source ( be_global->be_get_ciao_conn_src_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp index 14ddf78de94..823d0aa39cf 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp @@ -35,7 +35,7 @@ be_visitor_root_cs::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->gen_arg_traits (node) == -1) { @@ -106,7 +106,7 @@ be_visitor_root_cs::init (void) int status = tao_cg->start_client_stubs ( be_global->be_get_client_stub_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -156,7 +156,7 @@ be_visitor_root_cs::gen_any_ops (be_root *node) { (void) tao_cg->end_anyop_source (); } - + return status; } @@ -176,7 +176,7 @@ be_visitor_root_cs::gen_dds_serializer_ops (be_root *node) { return 0; } - + be_visitor_context ctx = *this->ctx_; ctx.state (TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS); be_visitor_root_cdr_op visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp index 14dbb784521..97b066e0151 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp @@ -36,7 +36,7 @@ be_visitor_root_ex_idl::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp index 2d464d829b7..02afa1a3949 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp @@ -36,7 +36,7 @@ be_visitor_root_exh::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ be_visitor_root_exh::init (void) int status = tao_cg->start_ciao_exec_header ( be_global->be_get_ciao_exec_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp index a2f4717080d..16d9d5f9c7a 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp @@ -36,7 +36,7 @@ be_visitor_root_exs::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ be_visitor_root_exs::init (void) int status = tao_cg->start_ciao_exec_source ( be_global->be_get_ciao_exec_src_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp index 85d6656bdfd..472b0c9b107 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp @@ -35,7 +35,7 @@ be_visitor_root_ih::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ be_visitor_root_ih::init (void) int status = tao_cg->start_implementation_header ( be_global->be_get_implementation_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp index 5fa99b5b944..5e9389004b5 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp @@ -34,7 +34,7 @@ be_visitor_root_is::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -53,7 +53,7 @@ be_visitor_root_is::init (void) int status = tao_cg->start_implementation_skeleton ( be_global->be_get_implementation_skel_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp index b40ce5c36e6..44b6aba4236 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp @@ -35,7 +35,7 @@ be_visitor_root_sh::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + /// The SI and SS cases are caught in BE_produce(). We /// want to generate an empty skeleton header file, which /// has been done, so -SS can flag a skip of the scope @@ -64,7 +64,7 @@ be_visitor_root_sh::init (void) int status = tao_cg->start_server_header ( be_global->be_get_server_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp index e78bc2a685a..35b082bc11b 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp @@ -35,7 +35,7 @@ be_visitor_root_si::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -56,7 +56,7 @@ be_visitor_root_si::init (void) int status = tao_cg->start_server_inline ( be_global->be_get_server_inline_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp index f6e851a7bcc..b754b1d52a9 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp @@ -35,13 +35,13 @@ be_visitor_root_ss::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->gen_arg_traits (node) == -1) { /// Error message already output. return -1; } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -67,7 +67,7 @@ be_visitor_root_ss::init (void) int status = tao_cg->start_server_skeletons ( be_global->be_get_server_skeleton_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -81,7 +81,7 @@ be_visitor_root_ss::init (void) status = tao_cg->start_server_template_skeletons ( be_global->be_get_server_template_skeleton_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -129,7 +129,7 @@ be_visitor_root_ss::gen_arg_traits (be_root *node) -1); } } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp index fe3cc3cabc9..f97e6c7fda9 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp @@ -32,7 +32,7 @@ be_visitor_root_sth::visit_root (be_root *node) { return 0; } - + if (this->init () == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -40,7 +40,7 @@ be_visitor_root_sth::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -138,7 +138,7 @@ be_visitor_root_sth::init (void) int status = tao_cg->start_server_template_header ( be_global->be_get_server_template_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp index 02e07ace652..09e31cd29b2 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp @@ -35,7 +35,7 @@ be_visitor_root_svh::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp index 35f6d6c640d..d81469299ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp @@ -35,7 +35,7 @@ be_visitor_root_svs::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -56,7 +56,7 @@ be_visitor_root_svs::init (void) int status = tao_cg->start_ciao_svnt_source ( be_global->be_get_ciao_svnt_src_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp index c0ae070ab2b..f595a2c028d 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for the TAO::DCPS::Serializer operators + * Visitor generating code for the TAO::DCPS::Serializer operators * for types defined in Root's scope. * * @@ -35,7 +35,7 @@ be_visitor_root_serializer_op::visit_root (be_root *node) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_root_serializer_op::") ACE_TEXT ("visit_root - codegen ") - ACE_TEXT ("for scope failed\n")), + ACE_TEXT ("for scope failed\n")), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp index bb24050fea4..49022a2f806 100644 --- a/TAO/TAO_IDL/be/be_visitor_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp @@ -64,7 +64,7 @@ be_visitor_scope::visit_scope (be_scope *node) "bad node in this scope\n"), -1); } - + be_decl *bd = be_decl::narrow_from_decl (d); // Set the scope node as "node" in which the code is being diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp index 4efb8c70596..b5bcab811eb 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp @@ -42,21 +42,21 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) const char *macro = this->ctx_->export_macro (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; ACE_CString name; - + bool alt = be_global->alt_mapping (); - + if (alt) { be_type *bt = be_type::narrow_from_decl (node->base_type ()); - + name = "std::vector<"; name += bt->full_name (); name += ">"; @@ -66,7 +66,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) name = node->full_name (); } - be_module *module = 0; + be_module *module = 0; if (node->is_nested ()) { AST_Decl *d = node; @@ -91,7 +91,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); // Generate the Any <<= and >>= operators. @@ -100,22 +100,22 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) << " operator<<= ( ::CORBA::Any &, const ::" << name.c_str () << " &); // copying version" << be_nl; - + if (!alt) - { + { *os << macro << " void" << " operator<<= ( ::CORBA::Any &, ::" << name.c_str () << "*); // noncopying version" << be_nl; - + *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, ::" << name.c_str () << " *&); // deprecated" << be_nl; } - + *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, const ::" @@ -123,7 +123,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) << " *&);"; be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; @@ -131,29 +131,29 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) } *os << be_global->core_versioning_begin () << be_nl; - + // Generate the Any <<= and >>= operators. *os << macro << " void" << " operator<<= ( ::CORBA::Any &, const " << name.c_str () << " &); // copying version" << be_nl; - + if (!alt) - { + { *os << macro << " void" << " operator<<= ( ::CORBA::Any &, " << name.c_str () << "*); // noncopying version" << be_nl; - + *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, " << name.c_str () << " *&); // deprecated" << be_nl; } - + *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, const " @@ -167,7 +167,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) *os << "\n\n#endif"; } - + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index ead93407e9b..4627f354e69 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -46,28 +46,28 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + // These are no-ops for now, so we just generate them and return if (be_global->alt_mapping () && node->max_size ()->ev ()->u.ulval == 0) { be_type *bt = be_type::narrow_from_decl (node->base_type ()); - + if (bt->node_type () == AST_Decl::NT_typedef) { be_typedef *td = be_typedef::narrow_from_decl (bt); bt = td->primitive_base_type (); } - + enum type_category { ANY_VALUE, ANY_OBJREF, ANY_ARRAY }; - + type_category tc = ANY_VALUE; - + if (bt->node_type () == AST_Decl::NT_array) { tc = ANY_ARRAY; @@ -77,7 +77,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) { tc = ANY_OBJREF; } - + *os << be_nl << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl @@ -85,31 +85,31 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "> &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::"; - + switch (tc) { case ANY_OBJREF: *os << "insert_objref_vector<" << bt->full_name () << "_ptr> ("; - + break; case ANY_ARRAY: *os << "insert_array_vector<" << bt->full_name () << "_forany> ("; - + break; default: *os << "insert_value_vector<" << bt->full_name () << "> ("; - + break; } - + *os << be_idt_nl << "_tao_any," << be_nl << "_tao_elem);" << be_uidt << be_uidt_nl << "}"; - + *os << be_nl << be_nl << "::CORBA::Boolean operator>>= (" << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl @@ -118,38 +118,38 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl << "return" << be_idt_nl << "TAO::"; - + switch (tc) { case ANY_OBJREF: *os << "extract_objref_vector<" << bt->full_name () << "_ptr> ("; - + break; case ANY_ARRAY: *os << "extract_array_vector<" << bt->full_name () << "_forany> ("; - + break; default: *os << "extract_value_vector<" << bt->full_name () << "> ("; - + break; } - + *os << be_idt_nl << "_tao_any," << be_nl << "_tao_elem);" << be_uidt << be_uidt << be_uidt_nl << "}"; - + *os << be_nl << be_global->core_versioning_end () << be_nl; - + node->cli_stub_any_op_gen (true); return 0; } - + // Since we don't generate CDR stream operators for types that // explicitly contain a local interface (at some level), we // must override these Any template class methods to avoid @@ -178,14 +178,14 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "}" << be_uidt_nl << "}" << be_nl; } - + *os << be_global->core_versioning_end () << be_nl; // If this is non-zero, we want to call its tc_name() - // for the TypeCode to pass to the Any operator impls. + // for the TypeCode to pass to the Any operator impls. be_typedef *td = this->ctx_->tdef (); - be_module *module = 0; + be_module *module = 0; if (node->is_nested ()) { AST_Decl *d = node; @@ -210,9 +210,9 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - + // Copying insertion. *os << be_nl << "// Copying insertion." << be_nl @@ -284,7 +284,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "}"; be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; @@ -292,7 +292,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) } *os << be_global->core_versioning_begin () << be_nl; - + // Copying insertion. *os << be_nl << "// Copying insertion." << be_nl @@ -369,7 +369,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) { *os << "\n\n#endif"; } - + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp index e09eecb2157..ff6560f9df0 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp @@ -68,7 +68,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) << node->flat_name () << "_H_" << "\n#define _TAO_CDR_OP_" << node->flat_name () << "_H_"; } - + bool alt = be_global->alt_mapping (); *os << be_global->core_versioning_begin (); @@ -78,7 +78,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) << " operator<< (" << be_idt << be_idt_nl << "TAO_OutputCDR &strm," << be_nl << "const "; - + if (alt) { *os << "std::vector<" << base_type->name () << ">"; @@ -87,23 +87,23 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) { *os << node->name (); } - + *os << " &_tao_sequence" << be_uidt_nl << ");" << be_uidt_nl; - + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (" << be_idt << be_idt_nl << "TAO_InputCDR &strm," << be_nl; - + if (alt) { *os << "std::vector<" << base_type->name () << ">"; } else - { + { *os << node->name (); } - + *os << " &_tao_sequence" << be_uidt_nl << ");" << be_uidt; 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 90d74dee51b..b52d6f84967 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 @@ -97,14 +97,14 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) << node->flat_name () << "_CPP_" << be_nl << "#define _TAO_CDR_OP_" << node->flat_name () << "_CPP_" << be_nl; - + bool alt = be_global->alt_mapping (); *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); - + if (alt) { *os << "::CORBA::Boolean operator<< (" << be_idt_nl @@ -153,12 +153,12 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl << "::CORBA::ULong length = 0UL;" << be_nl << bt->full_name (); - + if (bt->size_type () == AST_Type::VARIABLE) { *os << " *"; } - + *os << " tmp;" << be_nl << be_nl << "if (! (strm >> length))" << be_idt_nl << "{" << be_idt_nl 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 864fd4cde2a..68b0e76033c 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -95,7 +95,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) } *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; @@ -103,7 +103,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) os->gen_ifdef_macro (node->flat_name ()); *os << be_nl << be_nl; - + /// If we are using std::vector, we won't be using _vars /// and _outs. They may get redefined and reinstated later. if (!be_global->alt_mapping () || !node->unbounded ()) @@ -135,9 +135,9 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) ACE_TEXT ("buffer type visit failed\n")), -1); } - + *os << "> " << node->local_name () << ";"; - + os->gen_endif (); node->cli_hdr_gen (true); return 0; @@ -147,7 +147,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << "class " << be_global->stub_export_macro () << " " << node->local_name () << be_idt_nl << ": public" << be_idt << be_idt_nl; - + int status = node->gen_base_class_name (os, "", @@ -211,7 +211,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) *os << "* buffer, " << be_nl << "::CORBA::Boolean release = false);" << be_uidt; } - + *os << be_nl << node->local_name () << " (const " << node->local_name () << " &);" << be_nl; @@ -226,7 +226,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << be_nl << be_nl << "virtual ::CORBA::ULong maximum (void) const;"; } - + *os << be_nl; node->gen_stub_decls (os); diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index 2ca1b6ed917..e469dbd42a2 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -49,7 +49,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) } } - + if (be_global->alt_mapping () && node->unbounded ()) { // We are just a typedef and don't need any stub source @@ -60,7 +60,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from " << be_nl << "// "__FILE__ << ":" << __LINE__; @@ -80,7 +80,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) << be_idt << be_idt_nl << "::CORBA::ULong max)" << be_uidt_nl << ": " << be_idt; - + int status = node->gen_base_class_name (os, "", @@ -199,7 +199,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl << "return this->size ();" << be_uidt_nl << "}"; - + *os << be_nl << be_nl << "void" << be_nl << node->name () << "::length ( ::CORBA::ULong length)" @@ -207,7 +207,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl << "this->resize (length);" << be_uidt_nl << "}"; - + *os << be_nl << be_nl << "::CORBA::ULong" << be_nl << node->name () << "::maximum (void) const" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp index 3b79e6390ee..6e3bb5659e4 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for TAO::DCPS::Serializer operators for sequences. + * Visitor generating code for TAO::DCPS::Serializer operators for sequences. * This uses compiled marshaling. * * @@ -78,20 +78,20 @@ be_visitor_sequence_serializer_op_ch::visit_sequence (be_sequence *node) *os << be_nl << be_nl; - *os << be_global->stub_export_macro () + *os << be_global->stub_export_macro () << " ::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl << "const " << node->name () << " &" << be_uidt_nl << ");" << be_uidt_nl; - *os << be_global->stub_export_macro () + *os << be_global->stub_export_macro () << " size_t _dcps_max_marshaled_size (" << be_idt << be_idt_nl << "const " << node->name () << " &" << be_uidt_nl << ");" << be_uidt_nl; - *os << be_global->stub_export_macro () + *os << be_global->stub_export_macro () << " size_t _dcps_find_size (" << be_idt << be_idt_nl << "const " << node->name () << " &" << be_uidt_nl << ");" << be_uidt_nl; - *os << be_nl << be_nl + *os << be_nl << be_nl << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (" << be_idt << be_idt_nl << "TAO::DCPS::Serializer &," << be_nl @@ -111,7 +111,7 @@ be_visitor_sequence_serializer_op_ch::visit_sequence (be_sequence *node) if (be_global->gen_dcps_type_support_only ()) { - *os << be_nl << be_nl << "#if 0 // disable TAO specific code" + *os << be_nl << be_nl << "#if 0 // disable TAO specific code" << be_nl << be_nl; } node->cli_hdr_serializer_op_gen (1); diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp index 9e346007206..ef8c729839e 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp @@ -996,12 +996,12 @@ switch (this->ctx_->sub_state ()) break; case AST_Decl::NT_string: *os << "the_length += _dcps_max_marshaled_size_ulong () " << be_nl - << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]));" + << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]));" << be_uidt_nl; break; case AST_Decl::NT_wstring: *os << "the_length += _dcps_max_marshaled_size_ulong () " << be_nl - << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]) * sizeof (CORBA::WChar));" + << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]) * sizeof (CORBA::WChar));" << be_uidt_nl; break; case AST_Decl::NT_interface: @@ -1256,12 +1256,12 @@ switch (this->ctx_->sub_state ()) case AST_Decl::NT_interface: case AST_Decl::NT_interface_fwd: *os << "//DCPS does not support interfaces"; - + break; case AST_Decl::NT_string: case AST_Decl::NT_wstring: *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);"; - + break; case AST_Decl::NT_valuetype: case AST_Decl::NT_valuetype_fwd: @@ -1269,7 +1269,7 @@ switch (this->ctx_->sub_state ()) case AST_Decl::NT_eventtype_fwd: case AST_Decl::NT_valuebox: *os << "//DCPS does not support value types"; - + break; case AST_Decl::NT_pre_defined: { diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp index cfffd42a31e..a75e0a0af1b 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp @@ -42,7 +42,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - + be_module *module = 0; if (node->is_nested ()) { @@ -68,9 +68,9 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - + *os << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name () << " &); // copying version" << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name () @@ -79,15 +79,15 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) << node->name () << " *&); // deprecated\n"; *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::" << node->name () << " *&);"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; } } - + *os << be_global->core_versioning_begin () << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name () diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index 42fb3f3c335..09e3ca4f1da 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -77,7 +77,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) *os << be_global->core_versioning_end () << be_nl; } - + be_module *module = 0; if (node->is_nested ()) @@ -174,15 +174,15 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) << "_tao_elem" << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n"; } } - + *os << be_global->core_versioning_begin () << be_nl; // Copying insertion. diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp index 8649bb5000f..2d6ac05bf4a 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp @@ -49,7 +49,7 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node) *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (TAO_OutputCDR &, const " << node->name () << " &);" << be_nl; - + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO_InputCDR &, " << node->name () << " &);" << be_nl; @@ -71,7 +71,7 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_ch::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } 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 93037b0067b..992bf766873 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 @@ -42,7 +42,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -73,7 +73,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -91,14 +91,14 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) *os << "strm"; } - *os << "," << be_nl + *os << "," << be_nl << node->name () << " &"; - + if (! node->is_local ()) { *os << "_tao_aggregate"; } - + *os << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -116,9 +116,9 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_cs::" "visit_structure - " - "codegen for field decl scope failed\n"), + "codegen for field decl scope failed\n"), -1); - } + } *os << "return" << be_idt_nl; @@ -127,7 +127,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_cs" "::visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp index 3ba993d300f..6c87e1d66e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for TAO::DCPS::Serializer operators for + * Visitor generating code for TAO::DCPS::Serializer operators for * structures. This uses compiled marshaling. * * @@ -49,18 +49,18 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) IDL_GlobalData::DCPS_Data_Type_Info* info; if (0 != (info = idl_global->is_dcps_type(node->name()))) { - *os << be_global->stub_export_macro () - << " ::CORBA::Boolean _dcps_has_key(const " + *os << be_global->stub_export_macro () + << " ::CORBA::Boolean _dcps_has_key(const " << node->name() << "& val);" << be_nl; *os << "// This structure supports use of std::map with a key" << be_nl << "// defined by one or more #pragma DCPS_DATA_KEY lines." << be_nl - << "struct " << be_global->stub_export_macro () << " " + << "struct " << be_global->stub_export_macro () << " " << node->name()->last_component() << "KeyLessThan " << be_nl << "{" << be_idt_nl << "bool operator() (" << be_idt << be_idt_nl << "const " << node->name() << "& v1," << be_nl - << "const " << node->name() << "& v2) const" << be_uidt << be_uidt_nl + << "const " << node->name() << "& v2) const" << be_uidt << be_uidt_nl << "{" << be_idt_nl; if (info->key_list_.is_empty()) @@ -96,7 +96,7 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) *os << ")"; iter.advance (); - if (iter.done ()) + if (iter.done ()) *os << ";" << be_uidt_nl; else *os << " || " << be_nl; @@ -106,17 +106,17 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) << "};" << be_nl << be_nl; } - //- _dcps_max_marshaled_size(type) method - *os << be_global->stub_export_macro () - << " size_t _dcps_max_marshaled_size (const " + //- _dcps_max_marshaled_size(type) method + *os << be_global->stub_export_macro () + << " size_t _dcps_max_marshaled_size (const " << node->name() << "& _tao_aggregate);" << be_nl; - //- _tao_is_bounded_size(type) method - *os << be_global->stub_export_macro () - << " ::CORBA::Boolean _tao_is_bounded_size (const " + //- _tao_is_bounded_size(type) method + *os << be_global->stub_export_macro () + << " ::CORBA::Boolean _tao_is_bounded_size (const " << node->name() << "& _tao_aggregate);" << be_nl; - //- _dcps_find_size(type) method - *os << be_global->stub_export_macro () - << " size_t _dcps_find_size (const " + //- _dcps_find_size(type) method + *os << be_global->stub_export_macro () + << " size_t _dcps_find_size (const " << node->name() << "& _tao_aggregate);" << be_nl; *os << be_global->stub_export_macro () << " ::CORBA::Boolean" @@ -148,7 +148,7 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_ch::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp index de822568d77..0d37fc6848f 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp @@ -44,7 +44,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -56,7 +56,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) IDL_GlobalData::DCPS_Data_Type_Info* info; if (0 != (info = idl_global->is_dcps_type(node->name()))) { - *os << "::CORBA::Boolean _dcps_has_key (const " + *os << "::CORBA::Boolean _dcps_has_key (const " << node->name() << "& ) { " << be_idt_nl; if (info->key_list_.is_empty()) *os << "return false;"; @@ -67,11 +67,11 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) //- _dcps_max_marshaled_size(type) method this->ctx_->sub_state (TAO_CodeGen::TAO_MAX_MARSHALED_SIZE); - *os << "size_t " - << "_dcps_max_marshaled_size (const " + *os << "size_t " + << "_dcps_max_marshaled_size (const " << node->name() << "& _tao_aggregate)" << be_nl << "{" << be_idt_nl - << "ACE_UNUSED_ARG (_tao_aggregate);" + << "ACE_UNUSED_ARG (_tao_aggregate);" << " // sometimes not used - avoid warning" << be_nl; { @@ -83,9 +83,9 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_serializer_op_cs::" "visit_structure - " - "codegen for field decl scope failed\n"), + "codegen for field decl scope failed\n"), -1); - } + } #ifdef DCPS_DEBUG_IDL *os << "size_t result = 0;" << be_nl; @@ -98,11 +98,11 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } } - *os << ";" << be_uidt << be_uidt_nl; + *os << ";" << be_uidt << be_uidt_nl; #ifdef DCPS_DEBUG_IDL *os << "return result;" << be_uidt_nl; #endif @@ -111,7 +111,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) //- _tao_is_bounded_size(type) method this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE); - *os << "::CORBA::Boolean _tao_is_bounded_size (const " + *os << "::CORBA::Boolean _tao_is_bounded_size (const " << node->name() << "& _tao_aggregate)" << be_nl << "{" << be_idt_nl; @@ -129,7 +129,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } } @@ -138,11 +138,11 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) //- _dcps_find_size(type) method -- like max_marshaled_size but use len - not max. this->ctx_->sub_state (TAO_CodeGen::TAO_FIND_SIZE); - *os << "size_t " - << "_dcps_find_size(const " + *os << "size_t " + << "_dcps_find_size(const " << node->name() << "& _tao_aggregate)" << be_nl << "{" << be_idt_nl - << "ACE_UNUSED_ARG(_tao_aggregate);" + << "ACE_UNUSED_ARG(_tao_aggregate);" << " // sometimes not used - avoid warning" << be_nl; { @@ -160,11 +160,11 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } } - *os << ";" << be_uidt << be_uidt_nl; + *os << ";" << be_uidt << be_uidt_nl; #ifdef DCPS_DEBUG_IDL *os << "return result;" << be_uidt_nl; #endif @@ -191,7 +191,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -209,14 +209,14 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) *os << "strm"; } - *os << "," << be_nl + *os << "," << be_nl << node->name () << " &"; - + if (! node->is_local ()) { *os << "_tao_aggregate"; } - + *os << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -237,7 +237,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs" "::visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp index 9558e7507a7..befe7cd5254 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp @@ -90,7 +90,7 @@ be_visitor_structure::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure::" "visit_field - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -100,7 +100,7 @@ be_visitor_structure::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure::" "visit_field - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp index da53e48b739..4511bc5c293 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp @@ -44,7 +44,7 @@ int be_visitor_structure_ch::visit_structure (be_structure *node) node->gen_common_varout (os); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; @@ -54,7 +54,7 @@ int be_visitor_structure_ch::visit_structure (be_structure *node) << "{" << be_idt; node->gen_stub_decls (os); - + *os << be_nl; // Generate code for field members. diff --git a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp index 4df083567e3..3bb30b2cd85 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp @@ -35,7 +35,7 @@ be_visitor_structure_fwd_ch::visit_structure_fwd (be_structure_fwd *node) TAO_OutStream *os = this->ctx_->stream (); - be_structure *fd = + be_structure *fd = be_structure::narrow_from_decl (node->full_definition ()); // This will be a no-op if it has already been done for this node. diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp index aff66b8fae4..e6cf00d24e0 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp @@ -37,8 +37,8 @@ be_visitor_typecode_decl::visit_type (be_type *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - - // If -GA is used but anyop macro isn't set, defaults to stub macro. + + // If -GA is used but anyop macro isn't set, defaults to stub macro. const char *export_macro = (be_global->gen_anyop_files () ? this->ctx_->non_null_export_macro () : be_global->stub_export_macro ()); diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp index 5d0da43b4d0..a794fbaa858 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp @@ -107,7 +107,7 @@ be_visitor_typecode_defn::gen_typecode_ptr (be_type * node) ACE_TEXT ("Error parsing nested name\n")), -1); } - + be_util::gen_nested_namespace_begin (&os, module); os << "::CORBA::TypeCode_ptr const _tc_" @@ -197,7 +197,7 @@ be_visitor_typecode_defn::gen_forward_declared_typecode (be_type * node) ACE_TEXT ("Error parsing nested name\n")), -1); } - + be_util::gen_nested_namespace_begin (&os, module); os << "extern ::CORBA::TypeCode_ptr const _tc_" @@ -211,7 +211,7 @@ be_visitor_typecode_defn::gen_forward_declared_typecode (be_type * node) os << "extern ::CORBA::TypeCode_ptr const " << node->tc_name () << ";" << be_uidt; } - + os << be_nl; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp index f8ae13522e2..6bc508d57d4 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp @@ -106,7 +106,7 @@ be_visitor_typedef::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_array - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -116,7 +116,7 @@ be_visitor_typedef::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_array - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -190,7 +190,7 @@ be_visitor_typedef::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_enum - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -200,7 +200,7 @@ be_visitor_typedef::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_enum - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -276,7 +276,7 @@ be_visitor_typedef::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_sequence - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -286,7 +286,7 @@ be_visitor_typedef::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_sequence - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -365,7 +365,7 @@ be_visitor_typedef::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_structure - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -375,7 +375,7 @@ be_visitor_typedef::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_structure - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -453,7 +453,7 @@ be_visitor_typedef::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_union - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -463,7 +463,7 @@ be_visitor_typedef::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_union - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp index 1de1131be30..88803e3e0dc 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp @@ -44,7 +44,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; be_module *module = 0; - + AST_Decl *decl = node; if (decl->is_nested ()) { @@ -67,14 +67,14 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) "Error parsing nested name\n"), -1); } - + // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - - + + *os << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name () << " &); // copying version" << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name () @@ -83,9 +83,9 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) << node->name () << " *&); // deprecated\n"; *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::" << node->name () << " *&);"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; @@ -93,7 +93,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) } *os << be_global->core_versioning_begin () << be_nl; - + *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name () << " &); // copying version" << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index e70f3b780a7..9eb1b269eb4 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -93,7 +93,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) if (decl->defined_in ()->scope_node_type () == AST_Decl::NT_module) { module = be_module::narrow_from_scope (decl->defined_in ()); - + if (!module) { ACE_ERROR_RETURN ((LM_ERROR, @@ -177,10 +177,10 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "}"; be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl - << "#else\n"; + << "#else\n"; } } diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp index 3330928c7e0..a3133be104e 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp @@ -32,8 +32,8 @@ be_visitor_union_cdr_op_ch::~be_visitor_union_cdr_op_ch (void) int be_visitor_union_cdr_op_ch::visit_union (be_union *node) { - if (node->cli_hdr_cdr_op_gen () - || node->imported () + if (node->cli_hdr_cdr_op_gen () + || node->imported () || node->is_local ()) { return 0; @@ -70,7 +70,7 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_cdr_op_ch::" "visit_union - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } 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 8037b830cc5..c40efadc350 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 @@ -58,7 +58,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << 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); @@ -197,7 +197,7 @@ 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 ()) diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp index 3564be6ade1..7dfbb40a7ed 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp @@ -71,7 +71,7 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node) << "{" << be_idt_nl << "this->_reset ();" << be_nl << "this->disc_ = "; - + // We use one of the enum values that isn't used in this // union if one is available. UTL_ScopedName *sn = node->value_to_name (dv.u.enum_val); diff --git a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp index 9e3f2b37554..cc0e591fbe1 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for TAO::DCPS::Serializer operators for unions. + * Visitor generating code for TAO::DCPS::Serializer operators for unions. * This uses compiled marshaling. * * @@ -32,8 +32,8 @@ be_visitor_union_serializer_op_ch::~be_visitor_union_serializer_op_ch (void) int be_visitor_union_serializer_op_ch::visit_union (be_union *node) { - if (node->cli_hdr_serializer_op_gen () - || node->imported () + if (node->cli_hdr_serializer_op_gen () + || node->imported () || node->is_local ()) { return 0; @@ -44,17 +44,17 @@ be_visitor_union_serializer_op_ch::visit_union (be_union *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - //- _dcps_max_marshaled_size(type) method - *os << be_global->stub_export_macro () - << " size_t _dcps_max_marshaled_size (const " + //- _dcps_max_marshaled_size(type) method + *os << be_global->stub_export_macro () + << " size_t _dcps_max_marshaled_size (const " << node->name() << "& _tao_union);" << be_nl; - //- _tao_is_bounded_size(type) method - *os << be_global->stub_export_macro () - << " ::CORBA::Boolean _tao_is_bounded_size (const " + //- _tao_is_bounded_size(type) method + *os << be_global->stub_export_macro () + << " ::CORBA::Boolean _tao_is_bounded_size (const " << node->name() << "& _tao_union);" << be_nl; - //- _dcps_find_size(type) method - *os << be_global->stub_export_macro () - << " size_t _dcps_find_size (const " + //- _dcps_find_size(type) method + *os << be_global->stub_export_macro () + << " size_t _dcps_find_size (const " << node->name() << "& _tao_union);" << be_nl; @@ -74,7 +74,7 @@ be_visitor_union_serializer_op_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_serializer_op_ch::" "visit_union - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_union/union.cpp b/TAO/TAO_IDL/be/be_visitor_union/union.cpp index 7fdb4a0643e..d1b0a706521 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union.cpp @@ -104,7 +104,7 @@ be_visitor_union::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union::" "visit_union_branch - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -114,7 +114,7 @@ be_visitor_union::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union::" "visit_union_branch - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -141,8 +141,8 @@ be_visitor_union_cdr_op_cs::pre_process (be_decl *bd) be_union_branch* b = be_union_branch::narrow_from_decl (bd); - - // Could be a type decl. + + // Could be a type decl. if (b == 0) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp index 9b2805e6c19..5b5be4a94c2 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp @@ -56,7 +56,7 @@ int be_visitor_union_ci::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_ci::" "visit_union - " - "bad discriminant type\n"), + "bad discriminant type\n"), -1); } @@ -67,7 +67,7 @@ int be_visitor_union_ci::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_ci::" "visit union - " - "codegen for discrminant failed\n"), + "codegen for discrminant failed\n"), -1); } @@ -78,7 +78,7 @@ int be_visitor_union_ci::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_ci::" "visit_union - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp index 0df5ee6c9fa..0a42da78f6a 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp @@ -39,7 +39,7 @@ be_visitor_union_branch_cdr_op_ch::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_union_branch - " - "Bad union_branch type\n"), + "Bad union_branch type\n"), -1); } @@ -50,7 +50,7 @@ be_visitor_union_branch_cdr_op_ch::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_union_branch - " - "codegen for union_branch type failed\n"), + "codegen for union_branch type failed\n"), -1); } @@ -79,7 +79,7 @@ be_visitor_union_branch_cdr_op_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -104,7 +104,7 @@ be_visitor_union_branch_cdr_op_ch::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -128,7 +128,7 @@ be_visitor_union_branch_cdr_op_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -152,7 +152,7 @@ be_visitor_union_branch_cdr_op_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -172,7 +172,7 @@ be_visitor_union_branch_cdr_op_ch::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -196,7 +196,7 @@ be_visitor_union_branch_cdr_op_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } 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 98af2ab7098..17a02d69edc 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 @@ -673,7 +673,7 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node) // Retrieve the union_branch node. be_union_branch *f = be_union_branch::narrow_from_decl (this->ctx_->node ()); - + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp index 12ff5609cd5..2e3704211ca 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp @@ -543,7 +543,7 @@ be_visitor_union_branch_private_ch::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -615,7 +615,7 @@ be_visitor_union_branch_private_ch::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp index bc33eb7a19a..fe89b58c023 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp @@ -769,7 +769,7 @@ be_visitor_union_branch_public_assign_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -866,7 +866,7 @@ be_visitor_union_branch_public_assign_cs::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp index 3510fbb126f..e283f9b3060 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp @@ -674,7 +674,7 @@ be_visitor_union_branch_public_ch::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -766,7 +766,7 @@ be_visitor_union_branch_public_ch::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp index 4c7499eadad..4e587e4077b 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp @@ -1149,7 +1149,7 @@ be_visitor_union_branch_public_ci::visit_structure_fwd (be_structure_fwd *node) { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -1286,7 +1286,7 @@ be_visitor_union_branch_public_ci::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp index 8d55e433c9f..f47b7aaf645 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp @@ -264,7 +264,7 @@ be_visitor_union_branch_public_constructor_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -333,7 +333,7 @@ be_visitor_union_branch_public_constructor_cs::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp index 0f0e0dba2d5..0419304b30c 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp @@ -37,7 +37,7 @@ be_visitor_union_branch_public_cs::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_union_branch - " - "Bad union_branch type\n"), + "Bad union_branch type\n"), -1); } @@ -48,7 +48,7 @@ be_visitor_union_branch_public_cs::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_union_branch - " - "codegen for union_branch type failed\n"), + "codegen for union_branch type failed\n"), -1); } @@ -73,7 +73,7 @@ be_visitor_union_branch_public_cs::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -93,7 +93,7 @@ be_visitor_union_branch_public_cs::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } @@ -119,7 +119,7 @@ be_visitor_union_branch_public_cs::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -145,7 +145,7 @@ be_visitor_union_branch_public_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } @@ -157,7 +157,7 @@ be_visitor_union_branch_public_cs::visit_structure_fwd (be_structure_fwd *node) { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -173,7 +173,7 @@ be_visitor_union_branch_public_cs::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_union - " - "codegen failed\n"), + "codegen failed\n"), -1); } @@ -185,7 +185,7 @@ be_visitor_union_branch_public_cs::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp index a48c03e4e2d..5114ae3b720 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp @@ -493,7 +493,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -553,7 +553,7 @@ be_visitor_union_branch_public_reset_cs::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp index c84240fb34a..12d2e272633 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp @@ -6,7 +6,7 @@ * * $Id$ * - * Visitor generating Serializer operator declarator for union_branch + * Visitor generating Serializer operator declarator for union_branch * in the client header * * @@ -40,7 +40,7 @@ be_visitor_union_branch_serializer_op_ch::visit_union_branch (be_union_branch *n ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_union_branch - " - "Bad union_branch type\n"), + "Bad union_branch type\n"), -1); } @@ -51,7 +51,7 @@ be_visitor_union_branch_serializer_op_ch::visit_union_branch (be_union_branch *n ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_union_branch - " - "codegen for union_branch type failed\n"), + "codegen for union_branch type failed\n"), -1); } @@ -80,7 +80,7 @@ be_visitor_union_branch_serializer_op_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -105,7 +105,7 @@ be_visitor_union_branch_serializer_op_ch::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -129,7 +129,7 @@ be_visitor_union_branch_serializer_op_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -153,7 +153,7 @@ be_visitor_union_branch_serializer_op_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -173,7 +173,7 @@ be_visitor_union_branch_serializer_op_ch::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -197,7 +197,7 @@ be_visitor_union_branch_serializer_op_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp index 642b22141bb..9024a994153 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp @@ -896,7 +896,7 @@ be_visitor_union_branch_serializer_op_cs::visit_sequence (be_sequence *node) // Retrieve the union_branch node. be_union_branch *f = be_union_branch::narrow_from_decl (this->ctx_->node ()); - + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -1203,7 +1203,7 @@ be_visitor_union_branch_serializer_op_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -1353,7 +1353,7 @@ be_visitor_union_branch_serializer_op_cs::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } 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 d05451062c7..3223eb227b8 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 @@ -87,7 +87,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node) } *os << be_global->core_versioning_begin () << be_nl; - + *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () << " *); // copying" << be_nl; @@ -98,7 +98,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node) << node->name () << " *&);"; *os << be_global->core_versioning_end () << be_nl; - + if (module != 0) { *os << "\n\n#endif"; 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 bd55e9d8ea5..787774126f2 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -65,7 +65,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) *os << be_uidt << be_nl << "{" << be_nl << "public:" << be_idt; - + node->gen_stub_decls (os); // _downcast method 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 f2940c3c9a3..7503e4cb75d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -411,7 +411,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node) this->emit_copy_constructor_alloc (node); this->emit_assignment_alloc (node); this->emit_accessor_modifier (node); - + // Access to the boxed value for method signatures if (node->size_type() == AST_Type::FIXED) { @@ -428,7 +428,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node) AST_Decl *d; be_field *field; be_visitor_context ctx (*this->ctx_); - + for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); !si.is_done (); si.next ()) @@ -453,8 +453,8 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node) "visit_field failed\n" ), -1); } - - // Restore the valuebox node in the field visitor's context. + + // Restore the valuebox node in the field visitor's context. ctx.node (this->ctx_->node ()); } @@ -492,10 +492,10 @@ be_visitor_valuebox_ci::visit_union (be_union *node) this->emit_copy_constructor_alloc (node); this->emit_assignment_alloc (node); this->emit_accessor_modifier (node); - + be_valuebox *vb_node = be_valuebox::narrow_from_decl (this->ctx_->node ()); - + if (node->size_type() == AST_Type::FIXED) { this->emit_boxed_access (node, ""); @@ -510,7 +510,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) AST_Decl *d; be_union_branch *member; be_visitor_context ctx (*this->ctx_); - + for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); !si.is_done (); si.next ()) @@ -535,7 +535,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) "visit_field failed\n" ), -1); } - + // Restore the valuebox node to the union member visitor's // context. ctx.node (vb_node); 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 721e6a2780c..746d8510392 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -131,7 +131,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) << "{" << be_idt_nl << "return true;" << be_uidt_nl << "}" << be_nl << be_nl; - + if (be_global->any_support ()) { @@ -181,7 +181,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) bool is_array = false; const char * unmarshal_arg; be_predefined_type *bpt = be_predefined_type::narrow_from_decl (bt); - + if (bpt != 0) { switch (bpt->pt()) @@ -256,7 +256,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) << "{" << be_idt_nl << "return " << node->name () << "::_tao_unmarshal (" << be_idt << be_idt << be_idt_nl - << " indrected_strm, vb_object);" + << " indrected_strm, vb_object);" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "}" << be_uidt_nl << be_nl << "ACE_NEW_RETURN (" << be_idt_nl @@ -269,7 +269,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) *os << at->full_name() << "_forany temp (vb_object->_boxed_inout ());" << be_nl; } - + *os << "return (strm >> "; be_string *str = be_string::narrow_from_decl (bt); @@ -451,7 +451,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) // Retrieve the base type since we will need to do some code // generation for it. be_type *bt = be_type::narrow_from_decl (node->base_type ()); - + if (bt == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -553,7 +553,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) // Accessor: const *os << "const "; - + if (bt->accept (&bt_visitor) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -562,7 +562,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) "base type visit failed\n"), -1); } - + *os << " &" << be_nl; *os << vb_node->name () << "::operator[] ( ::CORBA::ULong index) const" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index 04a380e5d87..c0d670a8dd8 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -131,7 +131,7 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node) op = be_operation::narrow_from_scope (this->ctx_->scope ()); } - + if (op == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp index f6596ae982f..a47d0530d4a 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp @@ -21,7 +21,7 @@ be_visitor_valuetype_field_cdr_ch::be_visitor_valuetype_field_cdr_ch ( be_visitor_context *ctx ) : be_visitor_decl (ctx), - pre_ (""), + pre_ (""), post_ ("") { } @@ -40,7 +40,7 @@ be_visitor_valuetype_field_cdr_ch::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -51,7 +51,7 @@ be_visitor_valuetype_field_cdr_ch::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_field - " - "codegen for field type failed\n"), + "codegen for field type failed\n"), -1); } @@ -77,7 +77,7 @@ be_visitor_valuetype_field_cdr_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -101,7 +101,7 @@ be_visitor_valuetype_field_cdr_ch::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -125,7 +125,7 @@ be_visitor_valuetype_field_cdr_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -149,7 +149,7 @@ be_visitor_valuetype_field_cdr_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -173,7 +173,7 @@ be_visitor_valuetype_field_cdr_ch::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -197,7 +197,7 @@ be_visitor_valuetype_field_cdr_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp index 8a6e3c08018..a2343809d41 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp @@ -96,7 +96,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_marshal_cs::" "visit_valuetype - " - "codegen for field out cdr scope failed\n"), + "codegen for field out cdr scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp index 82c62ac1892..005288f8ecc 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp @@ -65,7 +65,7 @@ be_visitor_obv_module::visit_module (be_module *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_obv_module::" "visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -119,7 +119,7 @@ be_visitor_obv_module::visit_valuetype (be_valuetype *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_obv_module::" "visit_valuetype - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 5f3d7fde7d2..7bc6ee39687 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -110,7 +110,7 @@ be_visitor_valuetype::visit_attribute (be_attribute *node) "codegen for get_attribute failed\n"), -1); } - + get_op.destroy (); if (node->readonly ()) @@ -153,7 +153,7 @@ be_visitor_valuetype::visit_attribute (be_attribute *node) "codegen for set_attribute failed\n"), -1); } - + set_op.destroy (); rt.destroy (); @@ -803,7 +803,7 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node, &sn); ft->seen_in_operation (seen); visitor.visit_argument (&arg); - + // AST_Argument inherits from AST_Field, which will destroy // its field type if it is anonymous - we don't want that. arg.be_decl::destroy (); @@ -904,14 +904,14 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node) // If we inherit from CORBA::Object and/or CORBA::AbstractBase // (in addition to CORBA::ValueBase) we have to override _add_ref() - // and _remove_ref() by calling the one in DefaultValueRefCountBase + // and _remove_ref() by calling the one in DefaultValueRefCountBase // to avoid ambiguity. if (node->n_supports () > 0) { return true; } - // VT needs RefCounter if it has concrete factory. + // VT needs RefCounter if it has concrete factory. if (be_valuetype::FS_CONCRETE_FACTORY == node->determine_factory_style ()) { return true; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 2579e9e9243..e02d269741d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -167,7 +167,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt; - + node->gen_stub_decls (os); if (is_an_amh_exception_holder) @@ -270,7 +270,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << "virtual ::CORBA::Boolean " << "_tao_match_formal_type (ptrdiff_t ) const;" << be_nl; } - + if (be_global->gen_ostream_operators ()) { *os << "virtual std::ostream &_tao_stream_v (std::ostream &) const;" 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 89ccc543ffe..ad2d247c1b1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -286,7 +286,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "}" << be_nl << be_nl; } } - + if (be_global->gen_ostream_operators ()) { *os << "std::ostream &" << be_nl @@ -294,10 +294,10 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << be_nl << "{" << be_idt_nl << "strm << \"" << node->name () << "(\""; - - unsigned long index = 0; + + unsigned long index = 0; this->gen_ostream_operator_r (node, index); - + *os << be_nl << " << \")\";" << be_nl << be_nl << "return strm;" << be_uidt_nl @@ -476,35 +476,35 @@ be_visitor_valuetype_cs::gen_ostream_operator_r (be_valuetype *node, { TAO_OutStream *os = this->ctx_->stream (); AST_Type *parent = node->inherits_concrete (); - - // Recurse up the parent chain. + + // Recurse up the parent chain. if (parent != 0) { this->gen_ostream_operator_r (be_valuetype::narrow_from_decl (parent), index); } - + // Generate output for the members of whichever recursion we are in. for (UTL_ScopeActiveIterator i (node, UTL_Scope::IK_decls); !i.is_done (); i.next ()) { be_field *f = be_field::narrow_from_decl (i.item ()); - + // No way to access the private members from generated code. if (f == 0 || f->visibility () != AST_Field::vis_PUBLIC) { continue; } - + if (index++ != 0) { *os << " << \", \""; } - + *os << be_nl << " << "; - + ACE_CString instance_name ("this->"); instance_name += f->local_name ()->get_string (); f->gen_member_ostream_operator (os, diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp index 198fcdf617d..f55ee58087c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp @@ -62,7 +62,7 @@ be_visitor_valuetype_obv_ci::visit_valuetype (be_valuetype *node) ), -1); } } // if !opt_accessor () - + return 0; } @@ -77,9 +77,9 @@ be_visitor_valuetype_obv_ci::visit_field (be_field *node) { be_visitor_context new_ctx (*this->ctx_); be_visitor_valuetype_field_ci visitor (&new_ctx); - + visitor.in_obv_space_ = 1; - + if (visitor.visit_field (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -88,6 +88,6 @@ be_visitor_valuetype_obv_ci::visit_field (be_field *node) "visit_field failed\n"), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp index 247650ef5d6..3828f5a4ade 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp @@ -102,12 +102,12 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node) << "public:" << be_idt_nl; *os << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_uidt_nl; - + // No copy constructor for locality constraint interface. *os << "private:" << be_idt_nl << class_name.c_str () << " (const " << class_name.c_str () << "& rhs);" << be_uidt_nl; - + *os << "};" << be_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp index aca619a2558..fbc7765aa8e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp @@ -91,14 +91,14 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( << node->local_name () << " *&);"; be_util::gen_nested_namespace_end (os, module); - + *os << be_nl << be_global->core_versioning_end () << be_nl; - + // emit #else *os << "#else\n\n"; } - + *os << be_global->core_versioning_begin () << be_nl; *os << macro << " void" @@ -110,7 +110,7 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, " << node->name () << " *&);"; - + *os << be_global->core_versioning_end () << be_nl; if (module != 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp index fe495eac0ae..3777b2db14d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp @@ -69,7 +69,7 @@ be_visitor_valuetype_fwd_cdr_op_ci::visit_valuetype_fwd ( //@@ Boris: Can I move this to be_valuetype? (as with _var, _out, etc?) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ + << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; //This is just declaration so no ACE_INLINE |