diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-02-09 16:44:15 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-02-09 16:44:15 +0000 |
| commit | 29f5162e78fa497cd467d3c081d5a28ec72091bf (patch) | |
| tree | eb60a179a996a75244bd170519c42c79a1b4ada1 /TAO/TAO_IDL/be | |
| parent | 7aa37187e3373a6cd59effa47976b7a4f166a57e (diff) | |
| download | ATCD-29f5162e78fa497cd467d3c081d5a28ec72091bf.tar.gz | |
ChangeLogTag: Thu Feb 9 16:31:17 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/TAO_IDL/be')
118 files changed, 1135 insertions, 1151 deletions
diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp index 1aafd25caa1..da75994bb51 100644 --- a/TAO/TAO_IDL/be/be_argument.cpp +++ b/TAO/TAO_IDL/be/be_argument.cpp @@ -66,7 +66,7 @@ be_argument::be_argument (AST_Argument::Direction d, && (idl_global->in_main_file () || dcl->is_abstract ())) { be_type *bt = be_type::narrow_from_decl (ft); - bt->seen_in_operation (I_TRUE); + bt->seen_in_operation (true); this->set_arg_seen_bit (bt); } } diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp index 179208e68c4..3c13a4589b2 100644 --- a/TAO/TAO_IDL/be/be_array.cpp +++ b/TAO/TAO_IDL/be/be_array.cpp @@ -48,13 +48,13 @@ be_array::be_array (void) be_array::be_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_array, n, - I_TRUE), + true), AST_Type (AST_Decl::NT_array, n), AST_ConcreteType (AST_Decl::NT_array, diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp index 2f62f94e7cc..ad9b0daf940 100644 --- a/TAO/TAO_IDL/be/be_attribute.cpp +++ b/TAO/TAO_IDL/be/be_attribute.cpp @@ -47,11 +47,11 @@ be_attribute::be_attribute (void) this->set_strategy_ = bods; } -be_attribute::be_attribute (idl_bool ro, +be_attribute::be_attribute (bool ro, AST_Type *ft, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_attr, diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 409b79db827..d1098eefcd5 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -443,7 +443,7 @@ TAO_CodeGen::start_server_header (const char *fname) if (idl_global->non_local_iface_seen_) { // Include the Messaging files if AMI is enabled. - if (be_global->ami_call_back () == I_TRUE) + if (be_global->ami_call_back () == true) { // Include Messaging skeleton file. this->gen_standard_include (this->server_header_, @@ -1531,7 +1531,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void) "tao/Valuetype/AbstractBase.h"); // Turn on generation of the rest of the Valuetype library includes. - idl_global->valuetype_seen_ = I_TRUE; + idl_global->valuetype_seen_ = true; } if (idl_global->valuebase_seen_) @@ -1642,7 +1642,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void) this->client_header_); // Include the Messaging library entry point, if AMI is enabled. - if (be_global->ami_call_back () == I_TRUE) + if (be_global->ami_call_back () == true) { // Include Messaging skeleton file. this->gen_standard_include (this->client_header_, @@ -1650,7 +1650,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void) } // Include the smart proxy base class if smart proxies are enabled. - if (be_global->gen_smart_proxies () == I_TRUE) + if (be_global->gen_smart_proxies () == true) { this->gen_standard_include (this->client_header_, "tao/SmartProxies/Smart_Proxies.h"); @@ -1782,7 +1782,7 @@ TAO_CodeGen::gen_stub_src_includes (void) ); } - if (be_global->ami_call_back () == I_TRUE) + if (be_global->ami_call_back () == true) { this->gen_standard_include (this->client_stubs_, "tao/Messaging/Asynch_Invocation_Adapter.h"); @@ -1868,7 +1868,7 @@ TAO_CodeGen::gen_stub_src_includes (void) "ace/OS_NS_string.h"); } - if (be_global->gen_amh_classes () == I_TRUE) + if (be_global->gen_amh_classes () == true) { // Necessary for the AIX compiler. this->gen_standard_include (this->client_stubs_, diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp index 291bd1079fc..a19d6a27eb1 100644 --- a/TAO/TAO_IDL/be/be_component.cpp +++ b/TAO/TAO_IDL/be/be_component.cpp @@ -23,8 +23,8 @@ #include "global_extern.h" #include "utl_err.h" -ACE_RCSID (be, - be_component, +ACE_RCSID (be, + be_component, "$Id$") be_component::be_component (void) @@ -39,7 +39,7 @@ be_component::be_component (void) be_interface () { this->size_type (AST_Type::VARIABLE); - this->has_constructor (I_TRUE); + this->has_constructor (true); } be_component::be_component (UTL_ScopedName *n, @@ -48,8 +48,8 @@ be_component::be_component (UTL_ScopedName *n, long n_supports, AST_Interface **supports_flat, long n_supports_flat) - : COMMON_Base (I_FALSE, - I_FALSE), + : COMMON_Base (false, + false), AST_Decl (AST_Decl::NT_component, n), AST_Type (AST_Decl::NT_component, @@ -60,8 +60,8 @@ be_component::be_component (UTL_ScopedName *n, n_supports, supports_flat, n_supports_flat, - I_FALSE, - I_FALSE), + false, + false), AST_Component (n, base_component, supports, @@ -76,11 +76,11 @@ be_component::be_component (UTL_ScopedName *n, n_supports, supports_flat, n_supports_flat, - I_FALSE, - I_FALSE) + false, + false) { this->size_type (AST_Type::VARIABLE); - this->has_constructor (I_TRUE); + this->has_constructor (true); } be_component::~be_component (void) @@ -110,7 +110,7 @@ be_component::accept (be_visitor *visitor) idl_global->err ()->ignore_idl3_error (this); return -1; } - + return visitor->visit_component (this); } diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp index 75afab4cbcb..a492b119e8d 100644 --- a/TAO/TAO_IDL/be/be_decl.cpp +++ b/TAO/TAO_IDL/be/be_decl.cpp @@ -52,49 +52,49 @@ ACE_RCSID (be, be_decl::be_decl (void) : COMMON_Base (), AST_Decl (), - cli_hdr_gen_ (I_FALSE), - cli_stub_gen_ (I_FALSE), - cli_inline_gen_ (I_FALSE), - srv_hdr_gen_ (I_FALSE), - impl_hdr_gen_ (I_FALSE), - srv_skel_gen_ (I_FALSE), - impl_skel_gen_ (I_FALSE), - srv_inline_gen_ (I_FALSE), - cli_hdr_any_op_gen_ (I_FALSE), - cli_stub_any_op_gen_ (I_FALSE), - cli_hdr_cdr_op_gen_ (I_FALSE), - cli_stub_cdr_op_gen_ (I_FALSE), - cli_inline_cdr_op_gen_ (I_FALSE), - cli_inline_cdr_decl_gen_ (I_FALSE), - cli_hdr_serializer_op_gen_ (I_FALSE), - cli_stub_serializer_op_gen_ (I_FALSE), - cli_inline_serializer_op_gen_ (I_FALSE), - cli_inline_serializer_decl_gen_ (I_FALSE), - cli_traits_gen_ (I_FALSE), - cli_arg_traits_gen_ (I_FALSE), - srv_arg_traits_gen_ (I_FALSE), - srv_sarg_traits_gen_ (I_FALSE), - cli_tmpl_class_gen_ (I_FALSE), - cli_pragma_inst_gen_ (I_FALSE), - cli_inarg_tmpl_class_gen_ (I_FALSE), - cli_inarg_pragma_inst_gen_ (I_FALSE), - cli_inoutarg_tmpl_class_gen_ (I_FALSE), - cli_inoutarg_pragma_inst_gen_ (I_FALSE), - cli_outarg_tmpl_class_gen_ (I_FALSE), - cli_outarg_pragma_inst_gen_ (I_FALSE), - cli_retarg_tmpl_class_gen_ (I_FALSE), - cli_retarg_pragma_inst_gen_ (I_FALSE), - srv_tmpl_class_gen_ (I_FALSE), - srv_pragma_inst_gen_ (I_FALSE), - srv_inarg_tmpl_class_gen_ (I_FALSE), - srv_inarg_pragma_inst_gen_ (I_FALSE), - srv_inoutarg_tmpl_class_gen_ (I_FALSE), - srv_inoutarg_pragma_inst_gen_ (I_FALSE), - srv_outarg_tmpl_class_gen_ (I_FALSE), - srv_outarg_pragma_inst_gen_ (I_FALSE), - srv_retarg_tmpl_class_gen_ (I_FALSE), - srv_retarg_pragma_inst_gen_ (I_FALSE), - ccm_pre_proc_gen_ (I_FALSE) + cli_hdr_gen_ (false), + cli_stub_gen_ (false), + cli_inline_gen_ (false), + srv_hdr_gen_ (false), + impl_hdr_gen_ (false), + srv_skel_gen_ (false), + impl_skel_gen_ (false), + srv_inline_gen_ (false), + cli_hdr_any_op_gen_ (false), + cli_stub_any_op_gen_ (false), + cli_hdr_cdr_op_gen_ (false), + cli_stub_cdr_op_gen_ (false), + cli_inline_cdr_op_gen_ (false), + cli_inline_cdr_decl_gen_ (false), + cli_hdr_serializer_op_gen_ (false), + cli_stub_serializer_op_gen_ (false), + cli_inline_serializer_op_gen_ (false), + cli_inline_serializer_decl_gen_ (false), + cli_traits_gen_ (false), + cli_arg_traits_gen_ (false), + srv_arg_traits_gen_ (false), + srv_sarg_traits_gen_ (false), + cli_tmpl_class_gen_ (false), + cli_pragma_inst_gen_ (false), + cli_inarg_tmpl_class_gen_ (false), + cli_inarg_pragma_inst_gen_ (false), + cli_inoutarg_tmpl_class_gen_ (false), + cli_inoutarg_pragma_inst_gen_ (false), + cli_outarg_tmpl_class_gen_ (false), + cli_outarg_pragma_inst_gen_ (false), + cli_retarg_tmpl_class_gen_ (false), + cli_retarg_pragma_inst_gen_ (false), + srv_tmpl_class_gen_ (false), + srv_pragma_inst_gen_ (false), + srv_inarg_tmpl_class_gen_ (false), + srv_inarg_pragma_inst_gen_ (false), + srv_inoutarg_tmpl_class_gen_ (false), + srv_inoutarg_pragma_inst_gen_ (false), + srv_outarg_tmpl_class_gen_ (false), + srv_outarg_pragma_inst_gen_ (false), + srv_retarg_tmpl_class_gen_ (false), + srv_retarg_pragma_inst_gen_ (false), + ccm_pre_proc_gen_ (false) { } @@ -104,49 +104,49 @@ be_decl::be_decl (AST_Decl::NodeType type, : COMMON_Base (), AST_Decl (type, n), - cli_hdr_gen_ (I_FALSE), - cli_stub_gen_ (I_FALSE), - cli_inline_gen_ (I_FALSE), - srv_hdr_gen_ (I_FALSE), - impl_hdr_gen_ (I_FALSE), - srv_skel_gen_ (I_FALSE), - impl_skel_gen_ (I_FALSE), - srv_inline_gen_ (I_FALSE), - cli_hdr_any_op_gen_ (I_FALSE), - cli_stub_any_op_gen_ (I_FALSE), - cli_hdr_cdr_op_gen_ (I_FALSE), - cli_stub_cdr_op_gen_ (I_FALSE), - cli_inline_cdr_op_gen_ (I_FALSE), - cli_inline_cdr_decl_gen_ (I_FALSE), - cli_hdr_serializer_op_gen_ (I_FALSE), - cli_stub_serializer_op_gen_ (I_FALSE), - cli_inline_serializer_op_gen_ (I_FALSE), - cli_inline_serializer_decl_gen_ (I_FALSE), - cli_traits_gen_ (I_FALSE), - cli_arg_traits_gen_ (I_FALSE), - srv_arg_traits_gen_ (I_FALSE), - srv_sarg_traits_gen_ (I_FALSE), - cli_tmpl_class_gen_ (I_FALSE), - cli_pragma_inst_gen_ (I_FALSE), - cli_inarg_tmpl_class_gen_ (I_FALSE), - cli_inarg_pragma_inst_gen_ (I_FALSE), - cli_inoutarg_tmpl_class_gen_ (I_FALSE), - cli_inoutarg_pragma_inst_gen_ (I_FALSE), - cli_outarg_tmpl_class_gen_ (I_FALSE), - cli_outarg_pragma_inst_gen_ (I_FALSE), - cli_retarg_tmpl_class_gen_ (I_FALSE), - cli_retarg_pragma_inst_gen_ (I_FALSE), - srv_tmpl_class_gen_ (I_FALSE), - srv_pragma_inst_gen_ (I_FALSE), - srv_inarg_tmpl_class_gen_ (I_FALSE), - srv_inarg_pragma_inst_gen_ (I_FALSE), - srv_inoutarg_tmpl_class_gen_ (I_FALSE), - srv_inoutarg_pragma_inst_gen_ (I_FALSE), - srv_outarg_tmpl_class_gen_ (I_FALSE), - srv_outarg_pragma_inst_gen_ (I_FALSE), - srv_retarg_tmpl_class_gen_ (I_FALSE), - srv_retarg_pragma_inst_gen_ (I_FALSE), - ccm_pre_proc_gen_ (I_FALSE) + cli_hdr_gen_ (false), + cli_stub_gen_ (false), + cli_inline_gen_ (false), + srv_hdr_gen_ (false), + impl_hdr_gen_ (false), + srv_skel_gen_ (false), + impl_skel_gen_ (false), + srv_inline_gen_ (false), + cli_hdr_any_op_gen_ (false), + cli_stub_any_op_gen_ (false), + cli_hdr_cdr_op_gen_ (false), + cli_stub_cdr_op_gen_ (false), + cli_inline_cdr_op_gen_ (false), + cli_inline_cdr_decl_gen_ (false), + cli_hdr_serializer_op_gen_ (false), + cli_stub_serializer_op_gen_ (false), + cli_inline_serializer_op_gen_ (false), + cli_inline_serializer_decl_gen_ (false), + cli_traits_gen_ (false), + cli_arg_traits_gen_ (false), + srv_arg_traits_gen_ (false), + srv_sarg_traits_gen_ (false), + cli_tmpl_class_gen_ (false), + cli_pragma_inst_gen_ (false), + cli_inarg_tmpl_class_gen_ (false), + cli_inarg_pragma_inst_gen_ (false), + cli_inoutarg_tmpl_class_gen_ (false), + cli_inoutarg_pragma_inst_gen_ (false), + cli_outarg_tmpl_class_gen_ (false), + cli_outarg_pragma_inst_gen_ (false), + cli_retarg_tmpl_class_gen_ (false), + cli_retarg_pragma_inst_gen_ (false), + srv_tmpl_class_gen_ (false), + srv_pragma_inst_gen_ (false), + srv_inarg_tmpl_class_gen_ (false), + srv_inarg_pragma_inst_gen_ (false), + srv_inoutarg_tmpl_class_gen_ (false), + srv_inoutarg_pragma_inst_gen_ (false), + srv_outarg_tmpl_class_gen_ (false), + srv_outarg_pragma_inst_gen_ (false), + srv_retarg_tmpl_class_gen_ (false), + srv_retarg_pragma_inst_gen_ (false), + ccm_pre_proc_gen_ (false) { } @@ -186,7 +186,7 @@ be_decl::compute_full_name (const char *prefix, else { // Get scope name. - be_decl *parent = + be_decl *parent = be_scope::narrow_from_scope (this->defined_in ())->decl (); if (parent == 0) @@ -288,7 +288,7 @@ be_decl::destroy (void) } void -be_decl::set_local (idl_bool val) +be_decl::set_local (bool val) { this->is_local_ = val; } @@ -343,259 +343,259 @@ be_decl::scope (void) } // Boolean methods to test if code was already generated. -idl_bool +bool be_decl::cli_hdr_gen (void) { return this->cli_hdr_gen_; } -idl_bool +bool be_decl::cli_stub_gen (void) { return this->cli_stub_gen_; } -idl_bool +bool be_decl::cli_hdr_any_op_gen (void) { return this->cli_hdr_any_op_gen_; } -idl_bool +bool be_decl::cli_stub_any_op_gen (void) { return this->cli_stub_any_op_gen_; } -idl_bool +bool be_decl::cli_hdr_cdr_op_gen (void) { return this->cli_hdr_cdr_op_gen_; } -idl_bool +bool be_decl::cli_stub_cdr_op_gen (void) { return this->cli_stub_cdr_op_gen_; } -idl_bool +bool be_decl::cli_inline_cdr_op_gen (void) { return this->cli_inline_cdr_op_gen_; } -idl_bool +bool be_decl::cli_inline_cdr_decl_gen (void) { return this->cli_inline_cdr_decl_gen_; } -idl_bool +bool be_decl::cli_hdr_serializer_op_gen (void) { return this->cli_hdr_serializer_op_gen_; } -idl_bool +bool be_decl::cli_stub_serializer_op_gen (void) { return this->cli_stub_serializer_op_gen_; } -idl_bool +bool be_decl::cli_inline_serializer_op_gen (void) { return this->cli_inline_serializer_op_gen_; } -idl_bool +bool be_decl::cli_inline_serializer_decl_gen (void) { return this->cli_inline_cdr_decl_gen_; } -idl_bool +bool be_decl::cli_traits_gen (void) { return this->cli_traits_gen_; } -idl_bool +bool be_decl::cli_arg_traits_gen (void) { return this->cli_arg_traits_gen_; } -idl_bool +bool be_decl::srv_arg_traits_gen (void) { return this->srv_arg_traits_gen_; } -idl_bool +bool be_decl::srv_sarg_traits_gen (void) { return this->srv_sarg_traits_gen_; } -idl_bool +bool be_decl::cli_tmpl_class_gen (void) { return this->cli_tmpl_class_gen_; } -idl_bool +bool be_decl::cli_pragma_inst_gen (void) { return this->cli_pragma_inst_gen_; } -idl_bool +bool be_decl::cli_inarg_tmpl_class_gen (void) { return this->cli_inarg_tmpl_class_gen_; } -idl_bool +bool be_decl::cli_inarg_pragma_inst_gen (void) { return this->cli_inarg_pragma_inst_gen_; } -idl_bool +bool be_decl::cli_inoutarg_tmpl_class_gen (void) { return this->cli_inoutarg_tmpl_class_gen_; } -idl_bool +bool be_decl::cli_inoutarg_pragma_inst_gen (void) { return this->cli_inoutarg_pragma_inst_gen_; } -idl_bool +bool be_decl::cli_outarg_tmpl_class_gen (void) { return this->cli_outarg_tmpl_class_gen_; } -idl_bool +bool be_decl::cli_outarg_pragma_inst_gen (void) { return this->cli_outarg_pragma_inst_gen_; } -idl_bool +bool be_decl::cli_retarg_tmpl_class_gen (void) { return this->cli_retarg_tmpl_class_gen_; } -idl_bool +bool be_decl::cli_retarg_pragma_inst_gen (void) { return this->cli_retarg_pragma_inst_gen_; } -idl_bool +bool be_decl::srv_tmpl_class_gen (void) { return this->srv_tmpl_class_gen_; } -idl_bool +bool be_decl::srv_pragma_inst_gen (void) { return this->srv_pragma_inst_gen_; } -idl_bool +bool be_decl::srv_inarg_tmpl_class_gen (void) { return this->srv_inarg_tmpl_class_gen_; } -idl_bool +bool be_decl::srv_inarg_pragma_inst_gen (void) { return this->srv_inarg_pragma_inst_gen_; } -idl_bool +bool be_decl::srv_inoutarg_tmpl_class_gen (void) { return this->srv_inoutarg_tmpl_class_gen_; } -idl_bool +bool be_decl::srv_inoutarg_pragma_inst_gen (void) { return this->srv_inoutarg_pragma_inst_gen_; } -idl_bool +bool be_decl::srv_outarg_tmpl_class_gen (void) { return this->srv_outarg_tmpl_class_gen_; } -idl_bool +bool be_decl::srv_outarg_pragma_inst_gen (void) { return this->srv_outarg_pragma_inst_gen_; } -idl_bool +bool be_decl::srv_retarg_tmpl_class_gen (void) { return this->srv_retarg_tmpl_class_gen_; } -idl_bool +bool be_decl::srv_retarg_pragma_inst_gen (void) { return this->cli_retarg_pragma_inst_gen_; } -idl_bool +bool be_decl::cli_inline_gen (void) { return this->cli_inline_gen_; } -idl_bool +bool be_decl::srv_hdr_gen (void) { return this->srv_hdr_gen_; } -idl_bool +bool be_decl::impl_hdr_gen (void) { return this->impl_hdr_gen_; } -idl_bool +bool be_decl::srv_skel_gen (void) { return this->srv_skel_gen_; } -idl_bool +bool be_decl::impl_skel_gen (void) { return this->impl_skel_gen_; } -idl_bool +bool be_decl::srv_inline_gen (void) { return this->srv_inline_gen_; } -idl_bool +bool be_decl::ccm_pre_proc_gen (void) { return this->ccm_pre_proc_gen_; @@ -603,254 +603,254 @@ be_decl::ccm_pre_proc_gen (void) // Set the flag indicating that code generation is done. void -be_decl::cli_hdr_gen (idl_bool val) +be_decl::cli_hdr_gen (bool val) { this->cli_hdr_gen_ = val; } void -be_decl::cli_stub_gen (idl_bool val) +be_decl::cli_stub_gen (bool val) { this->cli_stub_gen_ = val; } void -be_decl::cli_hdr_any_op_gen (idl_bool val) +be_decl::cli_hdr_any_op_gen (bool val) { this->cli_hdr_any_op_gen_ = val; } void -be_decl::cli_stub_any_op_gen (idl_bool val) +be_decl::cli_stub_any_op_gen (bool val) { this->cli_stub_any_op_gen_ = val; } void -be_decl::cli_hdr_cdr_op_gen (idl_bool val) +be_decl::cli_hdr_cdr_op_gen (bool val) { this->cli_hdr_cdr_op_gen_ = val; } void -be_decl::cli_stub_cdr_op_gen (idl_bool val) +be_decl::cli_stub_cdr_op_gen (bool val) { this->cli_stub_cdr_op_gen_ = val; } void -be_decl::cli_inline_cdr_op_gen (idl_bool val) +be_decl::cli_inline_cdr_op_gen (bool val) { this->cli_inline_cdr_op_gen_ = val; } void -be_decl::cli_inline_cdr_decl_gen (idl_bool val) +be_decl::cli_inline_cdr_decl_gen (bool val) { this->cli_inline_cdr_decl_gen_ = val; } void -be_decl::cli_hdr_serializer_op_gen (idl_bool val) +be_decl::cli_hdr_serializer_op_gen (bool val) { this->cli_hdr_serializer_op_gen_ = val; } void -be_decl::cli_stub_serializer_op_gen (idl_bool val) +be_decl::cli_stub_serializer_op_gen (bool val) { this->cli_stub_serializer_op_gen_ = val; } void -be_decl::cli_inline_serializer_op_gen (idl_bool val) +be_decl::cli_inline_serializer_op_gen (bool val) { this->cli_inline_serializer_op_gen_ = val; } void -be_decl::cli_inline_serializer_decl_gen (idl_bool val) +be_decl::cli_inline_serializer_decl_gen (bool val) { this->cli_inline_serializer_decl_gen_ = val; } void -be_decl::cli_inline_gen (idl_bool val) +be_decl::cli_inline_gen (bool val) { this->cli_inline_gen_ = val; } void -be_decl::cli_traits_gen (idl_bool val) +be_decl::cli_traits_gen (bool val) { this->cli_traits_gen_ = val; } void -be_decl::cli_arg_traits_gen (idl_bool val) +be_decl::cli_arg_traits_gen (bool val) { this->cli_arg_traits_gen_ = val; } void -be_decl::srv_arg_traits_gen (idl_bool val) +be_decl::srv_arg_traits_gen (bool val) { this->srv_arg_traits_gen_ = val; } void -be_decl::srv_sarg_traits_gen (idl_bool val) +be_decl::srv_sarg_traits_gen (bool val) { this->srv_sarg_traits_gen_ = val; } void -be_decl::cli_tmpl_class_gen (idl_bool val) +be_decl::cli_tmpl_class_gen (bool val) { this->cli_tmpl_class_gen_ = val; } void -be_decl::cli_pragma_inst_gen (idl_bool val) +be_decl::cli_pragma_inst_gen (bool val) { this->cli_pragma_inst_gen_ = val; } void -be_decl::cli_inarg_tmpl_class_gen (idl_bool val) +be_decl::cli_inarg_tmpl_class_gen (bool val) { this->cli_inarg_tmpl_class_gen_ = val; } void -be_decl::cli_inarg_pragma_inst_gen (idl_bool val) +be_decl::cli_inarg_pragma_inst_gen (bool val) { this->cli_inarg_pragma_inst_gen_ = val; } void -be_decl::cli_inoutarg_tmpl_class_gen (idl_bool val) +be_decl::cli_inoutarg_tmpl_class_gen (bool val) { this->cli_inoutarg_tmpl_class_gen_ = val; } void -be_decl::cli_inoutarg_pragma_inst_gen (idl_bool val) +be_decl::cli_inoutarg_pragma_inst_gen (bool val) { this->cli_inoutarg_pragma_inst_gen_ = val; } void -be_decl::cli_outarg_tmpl_class_gen (idl_bool val) +be_decl::cli_outarg_tmpl_class_gen (bool val) { this->cli_outarg_tmpl_class_gen_ = val; } void -be_decl::cli_outarg_pragma_inst_gen (idl_bool val) +be_decl::cli_outarg_pragma_inst_gen (bool val) { this->cli_outarg_pragma_inst_gen_ = val; } void -be_decl::cli_retarg_tmpl_class_gen (idl_bool val) +be_decl::cli_retarg_tmpl_class_gen (bool val) { this->cli_retarg_tmpl_class_gen_ = val; } void -be_decl::cli_retarg_pragma_inst_gen (idl_bool val) +be_decl::cli_retarg_pragma_inst_gen (bool val) { this->cli_retarg_pragma_inst_gen_ = val; } void -be_decl::srv_tmpl_class_gen (idl_bool val) +be_decl::srv_tmpl_class_gen (bool val) { this->srv_tmpl_class_gen_ = val; } void -be_decl::srv_pragma_inst_gen (idl_bool val) +be_decl::srv_pragma_inst_gen (bool val) { this->srv_pragma_inst_gen_ = val; } void -be_decl::srv_inarg_tmpl_class_gen (idl_bool val) +be_decl::srv_inarg_tmpl_class_gen (bool val) { this->srv_inarg_tmpl_class_gen_ = val; } void -be_decl::srv_inarg_pragma_inst_gen (idl_bool val) +be_decl::srv_inarg_pragma_inst_gen (bool val) { this->srv_inarg_pragma_inst_gen_ = val; } void -be_decl::srv_inoutarg_tmpl_class_gen (idl_bool val) +be_decl::srv_inoutarg_tmpl_class_gen (bool val) { this->srv_inoutarg_tmpl_class_gen_ = val; } void -be_decl::srv_inoutarg_pragma_inst_gen (idl_bool val) +be_decl::srv_inoutarg_pragma_inst_gen (bool val) { this->srv_inoutarg_pragma_inst_gen_ = val; } void -be_decl::srv_outarg_tmpl_class_gen (idl_bool val) +be_decl::srv_outarg_tmpl_class_gen (bool val) { this->srv_outarg_tmpl_class_gen_ = val; } void -be_decl::srv_outarg_pragma_inst_gen (idl_bool val) +be_decl::srv_outarg_pragma_inst_gen (bool val) { this->srv_outarg_pragma_inst_gen_ = val; } void -be_decl::srv_retarg_tmpl_class_gen (idl_bool val) +be_decl::srv_retarg_tmpl_class_gen (bool val) { this->srv_retarg_tmpl_class_gen_ = val; } void -be_decl::srv_retarg_pragma_inst_gen (idl_bool val) +be_decl::srv_retarg_pragma_inst_gen (bool val) { this->srv_retarg_pragma_inst_gen_ = val; } void -be_decl::srv_hdr_gen (idl_bool val) +be_decl::srv_hdr_gen (bool val) { this->srv_hdr_gen_ = val; } void -be_decl::impl_hdr_gen (idl_bool val) +be_decl::impl_hdr_gen (bool val) { this->impl_hdr_gen_ = val; } void -be_decl::srv_skel_gen (idl_bool val) +be_decl::srv_skel_gen (bool val) { this->srv_skel_gen_ = val; } void -be_decl::srv_inline_gen (idl_bool val) +be_decl::srv_inline_gen (bool val) { this->srv_inline_gen_ = val; } void -be_decl::ccm_pre_proc_gen (idl_bool val) +be_decl::ccm_pre_proc_gen (bool val) { this->ccm_pre_proc_gen_ = val; } diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp index 8890a95eff9..35256b01780 100644 --- a/TAO/TAO_IDL/be/be_enum.cpp +++ b/TAO/TAO_IDL/be/be_enum.cpp @@ -24,8 +24,8 @@ #include "global_extern.h" -ACE_RCSID (be, - be_enum, +ACE_RCSID (be, + be_enum, "$Id$") be_enum::be_enum (void) @@ -42,8 +42,8 @@ be_enum::be_enum (void) } be_enum::be_enum (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_enum, diff --git a/TAO/TAO_IDL/be/be_eventtype.cpp b/TAO/TAO_IDL/be/be_eventtype.cpp index 6f770a3158d..75c484d39c3 100644 --- a/TAO/TAO_IDL/be/be_eventtype.cpp +++ b/TAO/TAO_IDL/be/be_eventtype.cpp @@ -51,9 +51,9 @@ be_eventtype::be_eventtype (UTL_ScopedName *n, AST_Interface **supports, long n_supports, AST_Interface *supports_concrete, - idl_bool abstract, - idl_bool truncatable, - idl_bool custom) + bool abstract, + bool truncatable, + bool custom) : COMMON_Base (0, abstract), AST_Decl (AST_Decl::NT_eventtype, diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp index ffc5e2b1129..9982658aa41 100644 --- a/TAO/TAO_IDL/be/be_exception.cpp +++ b/TAO/TAO_IDL/be/be_exception.cpp @@ -25,8 +25,8 @@ #include "global_extern.h" -ACE_RCSID (be, - be_exception, +ACE_RCSID (be, + be_exception, "$Id$") be_exception::be_exception (void) @@ -45,8 +45,8 @@ be_exception::be_exception (void) } be_exception::be_exception (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_except, diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp index 3c940b81abd..40da1b84eea 100644 --- a/TAO/TAO_IDL/be/be_expression.cpp +++ b/TAO/TAO_IDL/be/be_expression.cpp @@ -22,8 +22,8 @@ #include "be_expression.h" #include "be_visitor.h" -ACE_RCSID (be, - be_expression, +ACE_RCSID (be, + be_expression, "$Id$") be_expression::be_expression (UTL_ScopedName *n) @@ -51,16 +51,14 @@ be_expression::be_expression (long l) { } -be_expression::be_expression (long l, - AST_Expression::ExprType t) - : AST_Expression (l, - t) +be_expression::be_expression (bool b) + : AST_Expression (b) { } be_expression::be_expression (idl_uns_long l, AST_Expression::ExprType t) - : AST_Expression (l, + : AST_Expression (l, t) { } diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index a0f32ba09d1..806c41eb4ac 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -206,8 +206,8 @@ be_generator::create_interface (UTL_ScopedName *n, long nih, AST_Interface **ih_flat, long nih_flat, - idl_bool l, - idl_bool a) + bool l, + bool a) { be_interface *retval = 0; ACE_NEW_RETURN (retval, @@ -225,11 +225,11 @@ be_generator::create_interface (UTL_ScopedName *n, AST_InterfaceFwd * be_generator::create_interface_fwd (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Decl *d = - idl_global->scopes ().top_non_null ()->lookup_by_name (n, I_TRUE); + idl_global->scopes ().top_non_null ()->lookup_by_name (n, true); AST_Interface *dummy = this->create_interface (n, 0, @@ -276,9 +276,9 @@ be_generator::create_valuetype (UTL_ScopedName *n, AST_Interface **supports, long n_supports, AST_Interface *supports_concrete, - idl_bool abstract, - idl_bool truncatable, - idl_bool custom) + bool abstract, + bool truncatable, + bool custom) { be_valuetype *retval = 0; ACE_NEW_RETURN (retval, @@ -301,7 +301,7 @@ be_generator::create_valuetype (UTL_ScopedName *n, AST_ValueTypeFwd * be_generator::create_valuetype_fwd (UTL_ScopedName *n, - idl_bool abstract) + bool abstract) { AST_ValueType *dummy = this->create_valuetype (n, 0, @@ -335,9 +335,9 @@ be_generator::create_eventtype (UTL_ScopedName *n, AST_Interface **supports, long n_supports, AST_Interface *supports_concrete, - idl_bool abstract, - idl_bool truncatable, - idl_bool custom) + bool abstract, + bool truncatable, + bool custom) { be_eventtype *retval = 0; ACE_NEW_RETURN (retval, @@ -360,7 +360,7 @@ be_generator::create_eventtype (UTL_ScopedName *n, AST_EventTypeFwd * be_generator::create_eventtype_fwd (UTL_ScopedName *n, - idl_bool abstract) + bool abstract) { AST_EventType *dummy = this->create_eventtype (n, 0, @@ -451,8 +451,8 @@ be_generator::create_home (UTL_ScopedName *n, AST_Exception * be_generator::create_exception (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { be_exception *retval = 0; ACE_NEW_RETURN (retval, @@ -466,8 +466,8 @@ be_generator::create_exception (UTL_ScopedName *n, AST_Structure * be_generator::create_structure (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { be_structure *retval = 0; ACE_NEW_RETURN (retval, @@ -497,8 +497,8 @@ be_generator::create_structure_fwd (UTL_ScopedName *n) AST_Enum * be_generator::create_enum (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { be_enum *retval = 0; ACE_NEW_RETURN (retval, @@ -514,8 +514,8 @@ AST_Operation * be_generator::create_operation (AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { be_operation *retval = 0; ACE_NEW_RETURN (retval, @@ -560,11 +560,11 @@ be_generator::create_argument (AST_Argument::Direction d, } AST_Attribute * -be_generator::create_attribute (idl_bool ro, +be_generator::create_attribute (bool ro, AST_Type *ft, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { be_attribute *retval = 0; ACE_NEW_RETURN (retval, @@ -581,8 +581,8 @@ be_generator::create_attribute (idl_bool ro, AST_Union * be_generator::create_union (AST_ConcreteType *dt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { be_union *retval = 0; ACE_NEW_RETURN (retval, @@ -802,8 +802,8 @@ AST_Array * be_generator::create_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { be_array *retval = 0; ACE_NEW_RETURN (retval, @@ -821,8 +821,8 @@ AST_Sequence * be_generator::create_sequence (AST_Expression *v, AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { be_sequence *retval = 0; ACE_NEW_RETURN (retval, @@ -880,8 +880,8 @@ be_generator::create_wstring (AST_Expression *v) AST_Typedef * be_generator::create_typedef (AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { be_typedef *retval = 0; ACE_NEW_RETURN (retval, diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index de6a86924a6..0385f93b7fc 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -66,36 +66,36 @@ BE_GlobalData::BE_GlobalData (void) anyop_src_ending_ (ACE::strnew ("A.cpp")), output_dir_ (0), anyop_output_dir_ (0), - any_support_ (I_TRUE), - tc_support_ (I_TRUE), + any_support_ (true), + tc_support_ (true), obv_opt_accessor_ (0), - gen_impl_files_ (I_FALSE), - gen_impl_debug_info_ (I_FALSE), - gen_copy_ctor_ (I_FALSE), - gen_assign_op_ (I_FALSE), - gen_thru_poa_collocation_ (I_TRUE), // Default is thru_poa. - gen_direct_collocation_ (I_FALSE), + gen_impl_files_ (false), + gen_impl_debug_info_ (false), + gen_copy_ctor_ (false), + gen_assign_op_ (false), + gen_thru_poa_collocation_ (true), // Default is thru_poa. + gen_direct_collocation_ (false), #ifdef ACE_HAS_EXCEPTIONS - exception_support_ (I_TRUE), + exception_support_ (true), #else - exception_support_ (I_FALSE), + exception_support_ (false), #endif /* ACE_HAS_EXCEPTIONS */ - use_raw_throw_ (I_FALSE), - opt_tc_ (I_FALSE), - ami_call_back_ (I_FALSE), - gen_amh_classes_ (I_FALSE), - gen_tie_classes_ (I_TRUE), - gen_smart_proxies_ (I_FALSE), - gen_inline_constants_ (I_TRUE), - gen_dcps_type_support_ (I_FALSE), + use_raw_throw_ (false), + opt_tc_ (false), + ami_call_back_ (false), + gen_amh_classes_ (false), + gen_tie_classes_ (true), + gen_smart_proxies_ (false), + gen_inline_constants_ (true), + gen_dcps_type_support_ (false), lookup_strategy_ (TAO_PERFECT_HASH), void_type_ (0), ccmobject_ (0), exceptionholder_ (0), - gen_anyop_files_ (I_FALSE), - gen_skel_files_ (I_TRUE), - gen_client_inline_ (I_TRUE), - gen_server_inline_ (I_TRUE) + gen_anyop_files_ (false), + gen_skel_files_ (true), + gen_client_inline_ (true), + gen_server_inline_ (true) { } @@ -839,215 +839,215 @@ BE_GlobalData::anyop_output_dir (void) const } void -BE_GlobalData::any_support (idl_bool val) +BE_GlobalData::any_support (bool val) { this->any_support_ = val; } -idl_bool +bool BE_GlobalData::any_support (void) const { return this->any_support_; } void -BE_GlobalData::tc_support (idl_bool val) +BE_GlobalData::tc_support (bool val) { this->tc_support_ = val; } -idl_bool +bool BE_GlobalData::tc_support (void) const { return this->tc_support_; } void -BE_GlobalData::obv_opt_accessor (idl_bool val) +BE_GlobalData::obv_opt_accessor (bool val) { this->obv_opt_accessor_ = val; } -idl_bool +bool BE_GlobalData::obv_opt_accessor (void) const { return this->obv_opt_accessor_; } void -BE_GlobalData::gen_impl_files (idl_bool val) +BE_GlobalData::gen_impl_files (bool val) { this->gen_impl_files_ = val; } -idl_bool +bool BE_GlobalData::gen_impl_files (void) const { return this->gen_impl_files_; } void -BE_GlobalData::gen_impl_debug_info (idl_bool val) +BE_GlobalData::gen_impl_debug_info (bool val) { this->gen_impl_debug_info_ = val; } -idl_bool +bool BE_GlobalData::gen_impl_debug_info (void) const { return this->gen_impl_debug_info_; } void -BE_GlobalData::gen_copy_ctor (idl_bool val) +BE_GlobalData::gen_copy_ctor (bool val) { this->gen_copy_ctor_ = val; } -idl_bool +bool BE_GlobalData::gen_copy_ctor (void) const { return this->gen_copy_ctor_; } void -BE_GlobalData::gen_assign_op (idl_bool val) +BE_GlobalData::gen_assign_op (bool val) { this->gen_assign_op_ = val; } -idl_bool +bool BE_GlobalData::gen_assign_op (void) const { return this->gen_assign_op_; } void -BE_GlobalData::gen_thru_poa_collocation (idl_bool val) +BE_GlobalData::gen_thru_poa_collocation (bool val) { this->gen_thru_poa_collocation_ = val; } -idl_bool +bool BE_GlobalData::gen_thru_poa_collocation (void) const { return this->gen_thru_poa_collocation_; } void -BE_GlobalData::gen_direct_collocation (idl_bool val) +BE_GlobalData::gen_direct_collocation (bool val) { this->gen_direct_collocation_ = val; } -idl_bool +bool BE_GlobalData::gen_direct_collocation (void) const { return this->gen_direct_collocation_; } void -BE_GlobalData::exception_support (idl_bool val) +BE_GlobalData::exception_support (bool val) { this->exception_support_ = val; } -idl_bool +bool BE_GlobalData::exception_support (void) const { return this->exception_support_; } void -BE_GlobalData::use_raw_throw (idl_bool val) +BE_GlobalData::use_raw_throw (bool val) { this->use_raw_throw_ = val; } -idl_bool +bool BE_GlobalData::use_raw_throw (void) const { return this->use_raw_throw_; } void -BE_GlobalData::opt_tc (idl_bool val) +BE_GlobalData::opt_tc (bool val) { this->opt_tc_ = val; } -idl_bool +bool BE_GlobalData::opt_tc (void) const { return this->opt_tc_; } void -BE_GlobalData::ami_call_back (idl_bool val) +BE_GlobalData::ami_call_back (bool val) { this->ami_call_back_ = val; } -idl_bool +bool BE_GlobalData::ami_call_back (void) const { return this->ami_call_back_; } void -BE_GlobalData::gen_amh_classes (idl_bool val) +BE_GlobalData::gen_amh_classes (bool val) { this->gen_amh_classes_ = val; } -idl_bool +bool BE_GlobalData::gen_amh_classes (void) const { return this->gen_amh_classes_; } void -BE_GlobalData::gen_tie_classes (idl_bool val) +BE_GlobalData::gen_tie_classes (bool val) { this->gen_tie_classes_ = val; } -idl_bool +bool BE_GlobalData::gen_tie_classes (void) const { return this->gen_tie_classes_; } void -BE_GlobalData::gen_smart_proxies (idl_bool val) +BE_GlobalData::gen_smart_proxies (bool val) { this->gen_smart_proxies_ = val; } -idl_bool +bool BE_GlobalData::gen_smart_proxies (void) const { return this->gen_smart_proxies_; } void -BE_GlobalData::gen_inline_constants (idl_bool val) +BE_GlobalData::gen_inline_constants (bool val) { this->gen_inline_constants_ = val; } -idl_bool +bool BE_GlobalData::gen_inline_constants (void) const { return this->gen_inline_constants_; } void -BE_GlobalData::gen_dcps_type_support (idl_bool val) +BE_GlobalData::gen_dcps_type_support (bool val) { this->gen_dcps_type_support_ = val; } -idl_bool +bool BE_GlobalData::gen_dcps_type_support (void) const { return this->gen_dcps_type_support_; @@ -1165,50 +1165,50 @@ BE_GlobalData::exceptionholder (be_valuetype *val) this->exceptionholder_ = val; } -idl_bool +bool BE_GlobalData::gen_anyop_files (void) const { return this->gen_anyop_files_; } void -BE_GlobalData::gen_anyop_files (idl_bool val) +BE_GlobalData::gen_anyop_files (bool val) { this->gen_anyop_files_ = val; } -idl_bool +bool BE_GlobalData::gen_skel_files (void) const { return this->gen_skel_files_; } void -BE_GlobalData::gen_skel_files (idl_bool val) +BE_GlobalData::gen_skel_files (bool val) { this->gen_skel_files_ = val; } -idl_bool +bool BE_GlobalData::gen_client_inline (void) const { return this->gen_client_inline_; } void -BE_GlobalData::gen_client_inline (idl_bool val) +BE_GlobalData::gen_client_inline (bool val) { this->gen_client_inline_ = val; } -idl_bool +bool BE_GlobalData::gen_server_inline (void) const { return this->gen_server_inline_; } void -BE_GlobalData::gen_server_inline (idl_bool val) +BE_GlobalData::gen_server_inline (bool val) { this->gen_server_inline_ = val; } @@ -1555,18 +1555,18 @@ BE_GlobalData::parse_args (long &i, char **av) if (av[i][2] == 'C') { // AMI with Call back. - be_global->ami_call_back (I_TRUE); + be_global->ami_call_back (true); } else if (av[i][2] == 'H') { // AMH classes. - be_global->gen_amh_classes (I_TRUE); + be_global->gen_amh_classes (true); } else if (av[i][2] == 'A') { // TAO-team-only, undocumented option to generate // Any operators into a separate set of files. - be_global->gen_anyop_files (I_TRUE); + be_global->gen_anyop_files (true); } else if (av[i][2] == 'e') { @@ -1587,7 +1587,7 @@ BE_GlobalData::parse_args (long &i, char **av) if (av[i][3] == 'p') { // smart proxies - be_global->gen_smart_proxies (I_TRUE); + be_global->gen_smart_proxies (true); } else { @@ -1608,7 +1608,7 @@ BE_GlobalData::parse_args (long &i, char **av) if (av[i][3] == 'c') { // inline constants - be_global->gen_inline_constants (I_FALSE); + be_global->gen_inline_constants (false); } else { @@ -1641,7 +1641,7 @@ BE_GlobalData::parse_args (long &i, char **av) if (av[i][4] == 'p' && av[i][5] =='s' && '\0' == av[i][6]) { // DDS DCSP type support - be_global->gen_dcps_type_support (I_TRUE); + be_global->gen_dcps_type_support (true); } else { @@ -1750,31 +1750,31 @@ BE_GlobalData::parse_args (long &i, char **av) if (av[i][2] == 'a') { // suppress Any support - be_global->any_support (I_FALSE); + be_global->any_support (false); } else if (av[i][2] == 't') { // suppress typecode support // Anys must be suppressed as well - be_global->tc_support (I_FALSE); - be_global->any_support (I_FALSE); + be_global->tc_support (false); + be_global->any_support (false); } else if (av[i][2] == 'p') { // suppress generating Thru_POA collocated stubs - be_global->gen_thru_poa_collocation (I_FALSE); + be_global->gen_thru_poa_collocation (false); } else if (av[i][2] == 'd') { // suppress generating Direct collocated stubs - be_global->gen_direct_collocation (I_FALSE); + be_global->gen_direct_collocation (false); } else if (av[i][2] == 'c') { if (av[i][3] == 'i') { // no client inline - be_global->gen_client_inline (I_FALSE); + be_global->gen_client_inline (false); } else { @@ -1790,14 +1790,14 @@ BE_GlobalData::parse_args (long &i, char **av) else if (av[i][2] == 'S') { // disable skeleton file generation. - be_global->gen_skel_files (I_FALSE); + be_global->gen_skel_files (false); } else if (av[i][2] == 's') { if (av[i][3] == 'i') { // no client inline - be_global->gen_server_inline (I_FALSE); + be_global->gen_server_inline (false); } else { diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index 58471781762..9f5b4683ab0 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -21,6 +21,7 @@ #include "be_helper.h" #include "be_codegen.h" +#include "be_extern.h" #include "idl_defines.h" #include "ace/OS_NS_string.h" @@ -76,6 +77,44 @@ const TAO_INDENT be_idt_nl (1); const TAO_UNINDENT be_uidt; const TAO_UNINDENT be_uidt_nl (1); +TAO_ENV_ARG::TAO_ENV_ARG (bool with_defaults, + bool single, + bool arg, + bool not_used) + : with_defaults_ (with_defaults), + single_ (single), + arg_ (arg), + not_used_ (not_used) +{ +} + +const TAO_ENV_ARG env_decl; +const TAO_ENV_ARG env_dflts (true); +const TAO_ENV_ARG env_sngl (false, true); +const TAO_ENV_ARG env_sngl_dflts (true, true); +const TAO_ENV_ARG env_not (false, false, false, true); +const TAO_ENV_ARG env_sngl_not (false, true, false, true); +const TAO_ENV_ARG env_arg (false, false, true); +const TAO_ENV_ARG env_sngl_arg (false, true, true); + +TAO_ACE_CHECK::TAO_ACE_CHECK (const char *retval, + bool do_return) + : retval_ (retval), + do_return_ (retval != 0 || do_return) +{ +} + +TAO_ACE_TRY_CHECK::TAO_ACE_TRY_CHECK (void) +{ +} + +TAO_ACE_ENDTRY::TAO_ACE_ENDTRY (void) +{ +} + +const TAO_ACE_TRY_CHECK ace_try_check; +const TAO_ACE_ENDTRY ace_endtry; + // Methods of the TAO_OutStream class. TAO_OutStream::TAO_OutStream (void) @@ -460,6 +499,63 @@ TAO_OutStream::operator<< (const TAO_UNINDENT& i) } TAO_OutStream & +TAO_OutStream::operator<< (const TAO_ENV_ARG& i) +{ + if (!be_global->use_raw_throw ()) + { + (*this) << be_nl + << "ACE_ENV_" + << (i.single_ ? "SINGLE_" : "") + << "ARG_" + << (i.arg_ ? "PARAMETER" : "DECL") + << (i.with_defaults_ ? "_WITH_DEFAULTS" : "") + << (i.not_used_ ? "_NOT_USED" : ""); + } + + return *this; +} + +TAO_OutStream & +TAO_OutStream::operator<< (TAO_ACE_CHECK& i) +{ + if (!be_global->use_raw_throw ()) + { + (*this) << be_nl + << "ACE_CHECK" + << (i.do_return_ ? "_RETURN (" : "") + << (i.retval_ ? i.retval_ : "") + << (i.do_return_ ? ")" : "") + << ";"; + } + + return *this; +} + +TAO_OutStream & +TAO_OutStream::operator<< (const TAO_ACE_TRY_CHECK&) +{ + if (!be_global->use_raw_throw ()) + { + (*this) << be_nl + << "ACE_TRY_CHECK;"; + } + + return *this; +} + +TAO_OutStream & +TAO_OutStream::operator<< (const TAO_ACE_ENDTRY&) +{ + if (!be_global->use_raw_throw ()) + { + (*this) << be_nl + << "ACE_ENDTRY;"; + } + + return *this; +} + +TAO_OutStream & TAO_OutStream::operator<< (Identifier *id) { return this->print (id); diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp index 1d1bfb89860..4ebcd57d557 100644 --- a/TAO/TAO_IDL/be/be_home.cpp +++ b/TAO/TAO_IDL/be/be_home.cpp @@ -49,8 +49,8 @@ be_home::be_home (UTL_ScopedName *n, long n_supports, AST_Interface **supports_flat, long n_supports_flat) - : COMMON_Base (I_FALSE, - I_FALSE), + : COMMON_Base (false, + false), AST_Decl (AST_Decl::NT_home, n), AST_Type (AST_Decl::NT_home, @@ -61,8 +61,8 @@ be_home::be_home (UTL_ScopedName *n, n_supports, supports_flat, n_supports_flat, - I_FALSE, - I_FALSE), + false, + false), AST_Home (n, base_home, managed_component, @@ -79,11 +79,11 @@ be_home::be_home (UTL_ScopedName *n, n_supports, supports_flat, n_supports_flat, - I_FALSE, - I_FALSE) + false, + false) { this->size_type (AST_Type::VARIABLE); - + // Some previous error may have caused a lookup failure, in which // case we'll crash if we do the narrow below. if (managed_component == 0) @@ -95,7 +95,7 @@ be_home::be_home (UTL_ScopedName *n, be_component *bt = be_component::narrow_from_decl (managed_component); - bt->seen_in_operation (I_TRUE); + bt->seen_in_operation (true); idl_global->object_arg_seen_ = true; } @@ -120,7 +120,7 @@ be_home::accept (be_visitor *visitor) idl_global->err ()->ignore_idl3_error (this); return -1; } - + return visitor->visit_home (this); } diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 996a705dd41..01ea43affcf 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -73,8 +73,8 @@ be_interface::be_interface (UTL_ScopedName *n, long nih, AST_Interface **ih_flat, long nih_flat, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_interface, @@ -228,8 +228,8 @@ be_interface::compute_full_skel_name (const char *prefix, else { size_t namelen = ACE_OS::strlen (prefix); - long first = I_TRUE; - long second = I_FALSE; + long first = true; + long second = false; char *item_name = 0; // In the first loop compute the total length. @@ -243,7 +243,7 @@ be_interface::compute_full_skel_name (const char *prefix, } else if (second) { - first = second = I_FALSE; + first = second = false; } // Print the identifier. @@ -256,11 +256,11 @@ be_interface::compute_full_skel_name (const char *prefix, if (ACE_OS::strcmp (item_name, "") != 0) { // Does not start with a "". - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } @@ -268,8 +268,8 @@ be_interface::compute_full_skel_name (const char *prefix, ACE_NEW (skelname, char [namelen+1]); skelname[0] = '\0'; - first = I_TRUE; - second = I_FALSE; + first = true; + second = false; ACE_OS::strcat (skelname, prefix); for (UTL_IdListActiveIterator j (this->name ()); @@ -282,7 +282,7 @@ be_interface::compute_full_skel_name (const char *prefix, } else if (second) { - first = second = I_FALSE; + first = second = false; } // Print the identifier. @@ -294,11 +294,11 @@ be_interface::compute_full_skel_name (const char *prefix, if (ACE_OS::strcmp (item_name, "") != 0) { // Does not start with a "". - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } @@ -541,7 +541,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) << "TAO_ORB_Core *oc" << be_uidt_nl << ")" << be_nl << ": "; - + bool the_check = (this->has_mixed_parentage_ && !this->is_abstract_ @@ -560,7 +560,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) << "servant" << (the_check ? "" : ", oc") << be_uidt_nl << ")" << be_uidt; - + if (!the_check) { *os << "," << be_nl @@ -577,7 +577,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) this->traverse_inheritance_graph ( be_interface::gen_abstract_init_helper, os, - I_TRUE + true ); if (status == -1) @@ -591,7 +591,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) { *os << be_idt; } - + if (the_check && !this->is_abstract_) { *os << "," << be_uidt_nl; @@ -771,7 +771,7 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface, { // Hack to force the generation of the pure virtual ' = 0' // at the end of the operation declaration. - d->set_local (I_TRUE); + d->set_local (true); if (d->accept (this->visitor_) == -1) { @@ -781,7 +781,7 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface, -1); } - d->set_local (I_FALSE); + d->set_local (false); } } @@ -1294,7 +1294,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived, be_interface *ancestor, AST_Decl *d, const char *prefix, - idl_bool /* direct */, + bool /* direct */, UTL_ExceptList *list, TAO_OutStream *os) { @@ -1308,8 +1308,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived, << "::" << prefix << d->local_name () << " (" << be_idt << be_idt_nl << "TAO_Abstract_ServantBase *servant," << be_nl << "TAO::Argument ** args," << be_nl - << "int num_args" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "int num_args" << env_decl << be_uidt_nl << ")"; be_interface::gen_throw_spec (list, os); @@ -1320,8 +1319,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived, << "::" << prefix << d->local_name () << " (" << be_idt << be_idt_nl << "servant," << be_nl << "args," << be_nl - << "num_args" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "num_args" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"<< be_nl; @@ -1351,7 +1349,7 @@ be_interface::analyze_parentage (void) } AST_Decl::NodeType nt = this->node_type (); - idl_bool can_be_mixed = nt == AST_Decl::NT_interface + bool can_be_mixed = nt == AST_Decl::NT_interface || nt == AST_Decl::NT_component || nt == AST_Decl::NT_home; @@ -1385,7 +1383,7 @@ be_code_emitter_wrapper::emit (be_interface *derived_interface, int be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen, TAO_OutStream *os, - idl_bool abstract_paths_only) + bool abstract_paths_only) { // Make sure the queues are empty. this->insert_queue.reset (); @@ -1412,7 +1410,7 @@ int be_interface::traverse_inheritance_graph ( TAO_IDL_Inheritance_Hierarchy_Worker &worker, TAO_OutStream *os, - idl_bool abstract_paths_only + bool abstract_paths_only ) { AST_Interface *intf = 0; // element inside the queue @@ -1926,8 +1924,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "void * servant" << env_dflts << be_uidt_nl << ");" << be_uidt; } else @@ -1940,8 +1937,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -1955,8 +1951,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "server_request," << be_nl << "servant_upcall," << be_nl - << "impl" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "impl" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } @@ -1980,8 +1975,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "void * servant" << env_dflts << be_uidt_nl << ");" << be_uidt; } else @@ -1994,8 +1988,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -2009,8 +2002,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "server_request," << be_nl << "servant_upcall," << be_nl - << "impl" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "impl" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } @@ -2028,8 +2020,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "void * servant" << env_dflts << be_uidt_nl << ");" << be_uidt; } else @@ -2043,8 +2034,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -2058,8 +2048,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "server_request," << be_nl << "servant_upcall," << be_nl - << "impl" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "impl" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } @@ -2112,8 +2101,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived, << d->local_name () << " (" << be_idt << be_idt_nl << "TAO_Abstract_ServantBase *servant, " << be_nl << "TAO::Argument ** args," << be_nl - << "int num_args" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "int num_args" << env_dflts << be_uidt_nl << ")"; list = be_operation::narrow_from_decl (d)->exceptions (); @@ -2135,8 +2123,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived, << "_get_" << d->local_name () << " (" << be_idt << be_idt_nl << "TAO_Abstract_ServantBase *servant, " << be_nl << "TAO::Argument ** args," << be_nl - << "int num_args" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "int num_args" << env_dflts << be_uidt_nl << ")"; list = attr->get_get_exceptions (); @@ -2154,8 +2141,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived, << "_set_" << d->local_name () << " (" << be_idt << be_idt_nl << "TAO_Abstract_ServantBase *servant, " << be_nl << "TAO::Argument ** args," << be_nl - << "int num_args" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "int num_args" << env_dflts << be_uidt_nl << ")"; list = attr->get_set_exceptions (); @@ -2211,7 +2197,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived, ancestor, d, "", - I_TRUE, + true, op->exceptions (), os); } @@ -2232,7 +2218,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived, ancestor, d, "_get_", - I_TRUE, + true, attr->get_get_exceptions (), os ); @@ -2247,7 +2233,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived, ancestor, d, "_set_", - I_TRUE, + true, attr->get_set_exceptions (), os ); @@ -2273,7 +2259,7 @@ be_interface::copy_ctor_helper (be_interface *derived, *os << "," << be_idt_nl; - idl_bool is_rh_base = + bool is_rh_base = (ACE_OS::strcmp (base->flat_name (), "Messaging_ReplyHandler") == 0); if (is_rh_base) @@ -2477,7 +2463,7 @@ be_interface::session_component_child (void) AST_Decl *session_component = const_cast<be_interface*> (this)->scope ()->lookup_by_name (&sn, - I_TRUE); + true); tail_id.destroy (); head_id.destroy (); @@ -2507,7 +2493,7 @@ be_interface::session_component_child (void) return this->session_component_child_; } -idl_bool +bool be_interface::is_event_consumer (void) { return diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp index a74eeceded9..6577daeeabf 100644 --- a/TAO/TAO_IDL/be/be_interface_fwd.cpp +++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp @@ -64,7 +64,7 @@ be_interface_fwd::~be_interface_fwd (void) } void -be_interface_fwd::seq_elem_tmplinst (idl_bool val) +be_interface_fwd::seq_elem_tmplinst (bool val) { this->be_type::seq_elem_tmplinst (val); be_interface *fd = @@ -73,7 +73,7 @@ be_interface_fwd::seq_elem_tmplinst (idl_bool val) } void -be_interface_fwd::seen_in_sequence (idl_bool val) +be_interface_fwd::seen_in_sequence (bool val) { this->be_type::seen_in_sequence (val); be_interface *fd = @@ -82,7 +82,7 @@ be_interface_fwd::seen_in_sequence (idl_bool val) } void -be_interface_fwd::seen_in_operation (idl_bool val) +be_interface_fwd::seen_in_operation (bool val) { this->be_type::seen_in_operation (val); be_interface *fd = diff --git a/TAO/TAO_IDL/be/be_native.cpp b/TAO/TAO_IDL/be/be_native.cpp index d4f10163cd0..be5d28e0091 100644 --- a/TAO/TAO_IDL/be/be_native.cpp +++ b/TAO/TAO_IDL/be/be_native.cpp @@ -19,8 +19,8 @@ #include "be_native.h" #include "be_visitor.h" -ACE_RCSID (be, - be_native, +ACE_RCSID (be, + be_native, "$Id$") @@ -50,19 +50,19 @@ be_native::be_native (UTL_ScopedName *n) UTL_Scope (AST_Decl::NT_native), AST_Structure (AST_Decl::NT_native, n, - I_TRUE, - I_FALSE), + true, + false), AST_Exception (n, - I_TRUE, - I_FALSE), + true, + false), AST_Native (n), be_decl (AST_Decl::NT_native, n), be_type (AST_Decl::NT_native, n), be_exception (n, - I_TRUE, - I_FALSE) + true, + false) { } diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp index ad495310970..7fc7ba0f21b 100644 --- a/TAO/TAO_IDL/be/be_operation.cpp +++ b/TAO/TAO_IDL/be/be_operation.cpp @@ -45,8 +45,8 @@ be_operation::be_operation (void) be_operation::be_operation (AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_op, @@ -68,13 +68,13 @@ be_operation::be_operation (AST_Type *rt, { return; } - + idl_global->operation_seen_ = true; if (!this->is_local ()) { be_type *bt = be_type::narrow_from_decl (rt); - bt->seen_in_operation (I_TRUE); + bt->seen_in_operation (true); this->set_arg_seen_bit (bt); idl_global->non_local_op_seen_ = true; } diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp index 657e90f8c03..613be8a7c7c 100644 --- a/TAO/TAO_IDL/be/be_predefined_type.cpp +++ b/TAO/TAO_IDL/be/be_predefined_type.cpp @@ -48,7 +48,7 @@ be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t, : COMMON_Base (), AST_Decl (AST_Decl::NT_pre_defined, n, - I_TRUE), + true), AST_Type (AST_Decl::NT_pre_defined, n), AST_ConcreteType (AST_Decl::NT_pre_defined, diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index 268c0316121..4e37e686a1c 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -54,19 +54,19 @@ be_sequence::be_sequence (void) field_node_ (0) { // Always the case. - this->has_constructor (I_TRUE); + this->has_constructor (true); } be_sequence::be_sequence (AST_Expression *v, AST_Type *t, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (t->is_local () || local, abstract), AST_Decl (AST_Decl::NT_sequence, n, - I_TRUE), + true), AST_Type (AST_Decl::NT_sequence, n), AST_ConcreteType (AST_Decl::NT_sequence, @@ -86,7 +86,7 @@ be_sequence::be_sequence (AST_Expression *v, field_node_ (0) { // Always the case. - this->has_constructor (I_TRUE); + this->has_constructor (true); // Don't want to set any bits below for imported nodes. if (this->imported ()) @@ -216,7 +216,7 @@ be_sequence::gen_name (void) } // Append the size (if any). - if (this->unbounded () == I_FALSE) + if (this->unbounded () == false) { char ulval_str [NAMEBUFSIZE]; ACE_OS::sprintf (ulval_str, diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp index 497dcec1d39..2b1bdf520b4 100644 --- a/TAO/TAO_IDL/be/be_string.cpp +++ b/TAO/TAO_IDL/be/be_string.cpp @@ -48,7 +48,7 @@ be_string::be_string (AST_Decl::NodeType nt, : COMMON_Base (), AST_Decl (nt, n, - I_TRUE), + true), AST_Type (nt, n), AST_String (nt, diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp index 438c8fa4668..dae08f4df58 100644 --- a/TAO/TAO_IDL/be/be_structure.cpp +++ b/TAO/TAO_IDL/be/be_structure.cpp @@ -30,8 +30,8 @@ #include "idl_defines.h" #include "global_extern.h" -ACE_RCSID (be, - be_structure, +ACE_RCSID (be, + be_structure, "$Id$") be_structure::be_structure (void) @@ -48,8 +48,8 @@ be_structure::be_structure (void) } be_structure::be_structure (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_struct, diff --git a/TAO/TAO_IDL/be/be_sunsoft.cpp b/TAO/TAO_IDL/be/be_sunsoft.cpp index 0dec1f2b844..06be8962802 100644 --- a/TAO/TAO_IDL/be/be_sunsoft.cpp +++ b/TAO/TAO_IDL/be/be_sunsoft.cpp @@ -9,8 +9,8 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" -ACE_RCSID (be, - be_sunsoft, +ACE_RCSID (be, + be_sunsoft, "$Id$") TAO_SunSoft_OutStream::TAO_SunSoft_OutStream (void) @@ -34,8 +34,8 @@ TAO_SunSoft_OutStream::print (Identifier *id) TAO_OutStream & TAO_SunSoft_OutStream::print (UTL_IdList *idl) { - long first = I_TRUE; - long second = I_FALSE; + long first = true; + long second = false; Identifier *id = 0; for (UTL_IdListActiveIterator i (idl); !i.is_done (); i.next ()) @@ -46,7 +46,7 @@ TAO_SunSoft_OutStream::print (UTL_IdList *idl) } else if (second) { - first = second = I_FALSE; + first = second = false; } // Print the identifier. @@ -58,11 +58,11 @@ TAO_SunSoft_OutStream::print (UTL_IdList *idl) if (ACE_OS::strcmp (id->get_string (), "") != 0) { // Does not start with a "". - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } @@ -126,8 +126,8 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr) else if ((unsigned char) ev->u.cval > ACE_CHAR_MAX) this->TAO_OutStream::print ("%hd", ev->u.cval); else if (isprint (ev->u.cval)) - this->TAO_OutStream::print ("'%c'", ev->u.cval); - else if (iscntrl (ev->u.cval)) + this->TAO_OutStream::print ("'%c'", ev->u.cval); + else if (iscntrl (ev->u.cval)) switch (ev->u.cval) { case '\n': @@ -157,8 +157,8 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr) default: this->TAO_OutStream::print ("'\\x%x'", ev->u.cval); } - else - this->TAO_OutStream::print ("'\\x%x'", ev->u.cval); + else + this->TAO_OutStream::print ("'\\x%x'", ev->u.cval); break; case AST_Expression::EV_wchar: this->TAO_OutStream::print ("L'%lc'", ev->u.wcval); diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index 802d23f47b1..599e9018584 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -38,10 +38,10 @@ be_type::be_type (void) AST_Type (), be_decl (), tc_name_ (0), - common_varout_gen_ (I_FALSE), - seq_elem_tmplinst_ (I_FALSE), - seen_in_sequence_ (I_FALSE), - seen_in_operation_ (I_FALSE) + common_varout_gen_ (false), + seq_elem_tmplinst_ (false), + seen_in_sequence_ (false), + seen_in_operation_ (false) { } @@ -55,10 +55,10 @@ be_type::be_type (AST_Decl::NodeType nt, be_decl (nt, n), tc_name_ (0), - common_varout_gen_ (I_FALSE), - seq_elem_tmplinst_ (I_FALSE), - seen_in_sequence_ (I_FALSE), - seen_in_operation_ (I_FALSE) + common_varout_gen_ (false), + seq_elem_tmplinst_ (false), + seen_in_sequence_ (false), + seen_in_operation_ (false) { if (n != 0) { @@ -292,38 +292,38 @@ be_type::gen_common_varout (TAO_OutStream *os) this->common_varout_gen_ = 1; } -idl_bool +bool be_type::seq_elem_tmplinst (void) const { return this->seq_elem_tmplinst_; } void -be_type::seq_elem_tmplinst (idl_bool val) +be_type::seq_elem_tmplinst (bool val) { this->seq_elem_tmplinst_ = val; } -idl_bool +bool be_type::seen_in_sequence (void) const { return this->seen_in_sequence_; } void -be_type::seen_in_sequence (idl_bool val) +be_type::seen_in_sequence (bool val) { this->seen_in_sequence_ = val; } -idl_bool +bool be_type::seen_in_operation (void) const { return this->seen_in_operation_; } void -be_type::seen_in_operation (idl_bool val) +be_type::seen_in_operation (bool val) { this->seen_in_operation_ = val; } diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp index 453ecaab484..0c0274172b2 100644 --- a/TAO/TAO_IDL/be/be_typedef.cpp +++ b/TAO/TAO_IDL/be/be_typedef.cpp @@ -39,8 +39,8 @@ be_typedef::be_typedef (void) be_typedef::be_typedef (AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (bt->is_local () || local, abstract), AST_Decl (AST_Decl::NT_typedef, @@ -61,26 +61,26 @@ be_typedef::be_typedef (AST_Type *bt, if (nt == AST_Decl::NT_sequence) { - pbt->anonymous (I_FALSE); + pbt->anonymous (false); } } void -be_typedef::seq_elem_tmplinst (idl_bool val) +be_typedef::seq_elem_tmplinst (bool val) { this->be_type::seq_elem_tmplinst (val); this->primitive_base_type ()->seq_elem_tmplinst (val); } void -be_typedef::seen_in_sequence (idl_bool val) +be_typedef::seen_in_sequence (bool val) { this->be_type::seen_in_sequence (val); this->primitive_base_type ()->seen_in_sequence (val); } void -be_typedef::seen_in_operation (idl_bool val) +be_typedef::seen_in_operation (bool val) { this->be_type::seen_in_operation (val); this->primitive_base_type ()->seen_in_operation (val); diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index c483a315565..b5ce7cbd7d5 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -48,13 +48,13 @@ be_union::be_union (void) be_type () { // Always the case. - this->has_constructor (I_TRUE); + this->has_constructor (true); } be_union::be_union (AST_ConcreteType *dt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_union, @@ -79,7 +79,7 @@ be_union::be_union (AST_ConcreteType *dt, n) { // Always the case. - this->has_constructor (I_TRUE); + this->has_constructor (true); if (!this->imported ()) { @@ -97,7 +97,7 @@ be_union::redefine (AST_Structure *from) AST_Union::redefine (from); } -idl_bool +bool be_union::has_duplicate_case_labels (void) { for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls); @@ -110,11 +110,11 @@ be_union::has_duplicate_case_labels (void) if (ub->label_list_length () > 1) { - return I_TRUE; + return true; } } - return I_FALSE; + return false; } void @@ -132,38 +132,38 @@ be_union::accept (be_visitor *visitor) return visitor->visit_union (this); } -idl_bool +bool be_union::gen_empty_default_label (void) { // A non-empty explicit default label will be generated. if (this->default_index () != -1) { - return I_FALSE; + return false; } - + AST_ConcreteType *disc = this->disc_type (); AST_Decl::NodeType nt = disc->node_type (); - + if (nt == AST_Decl::NT_enum) { - return I_TRUE; + return true; } - + AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (disc); - + if (pdt == 0) { - return I_TRUE; + return true; } - + unsigned long n_labels = this->nlabels (); - + if (pdt->pt () == AST_PredefinedType::PT_boolean && n_labels == 2) { - return I_FALSE; + return false; } - - return I_TRUE; + + return true; } unsigned long @@ -180,11 +180,11 @@ be_union::nlabels (void) AST_UnionBranch::narrow_from_decl (d); if (ub != 0) - { + { retval += ub->label_list_length (); } } - + return retval; } diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 3e2550cd081..dc168c5d8bc 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -58,7 +58,7 @@ be_valuetype::be_valuetype (void) } // Always the case. - this->has_constructor (I_TRUE); + this->has_constructor (true); } // Constructor used to build the AST. @@ -71,9 +71,9 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, AST_Interface **supports, long n_supports, AST_Interface *supports_concrete, - idl_bool abstract, - idl_bool truncatable, - idl_bool custom) + bool abstract, + bool truncatable, + bool custom) : COMMON_Base (0, abstract), AST_Decl (AST_Decl::NT_valuetype, @@ -129,13 +129,13 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, } // Always the case. - this->has_constructor (I_TRUE); + this->has_constructor (true); for (long i = 0; i < this->pd_n_supports; ++i) { if (this->pd_supports[i]->is_abstract ()) { - this->supports_abstract_ = I_TRUE; + this->supports_abstract_ = true; break; } } @@ -170,7 +170,7 @@ be_valuetype::redefine (AST_Interface *from) // Is true if non-virtual accessor and modifier should be generated // If #pragma TAO OBV opt_accessor (todo) is used or -Wb,obv_opt_accessor. -idl_bool +bool be_valuetype::opt_accessor (void) { return be_global->obv_opt_accessor (); @@ -214,8 +214,8 @@ be_valuetype::determine_factory_style (void) } // Check whether we have at least one operation or not. - idl_bool have_operation = this->have_operation (); - idl_bool have_factory = 0; + bool have_operation = this->have_operation (); + bool have_factory = 0; // Try only our own scope. if (this->nmembers () > 0) @@ -266,12 +266,12 @@ be_valuetype::determine_factory_style (void) return factory_style; } -idl_bool +bool be_valuetype::have_operation (void) { // Check whatever scope we get for operations/attributes. - idl_bool have_operation = I_FALSE; + bool have_operation = false; // Operations are either operations or attributes of: // -its own @@ -304,7 +304,7 @@ be_valuetype::have_operation (void) if (nt == AST_Decl::NT_op || nt == AST_Decl::NT_attr) { - have_operation = I_TRUE; + have_operation = true; break; } } // end of for loop @@ -323,7 +323,7 @@ be_valuetype::have_operation (void) if (vt != 0 && vt->have_operation ()) { - have_operation = I_TRUE; + have_operation = true; break; } } @@ -348,15 +348,15 @@ be_valuetype::have_operation (void) return have_operation; } -idl_bool +bool be_valuetype::have_supported_op (be_interface * node) { - idl_bool have_supported_op = 0; + bool have_supported_op = 0; if (node->nmembers () == 0) { - return I_FALSE; + return false; } // Initialize an iterator for supported interface elements @@ -410,7 +410,7 @@ be_valuetype::have_supported_op (be_interface * node) return have_supported_op; } -idl_bool +bool be_valuetype::will_have_factory (void) { FactoryStyle fs = this->determine_factory_style (); @@ -422,19 +422,19 @@ bool be_valuetype::has_member (void) { AST_ValueType *parent = this->pd_inherits_concrete; - + // We're looking for inherited members too. if (parent != 0) { be_valuetype *be_parent = be_valuetype::narrow_from_decl (parent); - + if (be_parent->has_member ()) { return true; } } - + for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls); !si.is_done (); si.next()) @@ -444,7 +444,7 @@ be_valuetype::has_member (void) return true; } } - + return false; } @@ -458,7 +458,7 @@ be_valuetype::gen_helper_header (char *, char *) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + *os << "namespace CORBA" << be_nl << "{" << be_idt_nl @@ -471,7 +471,7 @@ be_valuetype::gen_helper_header (char *, char *) << "}"; *os << be_global->core_versioning_end () << be_nl; - + return 0; } @@ -650,7 +650,7 @@ be_valuetype::data_members_count (AST_Field::Visibility vis) return count; } -idl_bool +bool be_valuetype::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) { list.enqueue_tail (this); @@ -728,7 +728,7 @@ be_valuetype::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) return this->in_recursion_; } -idl_bool +bool be_valuetype::supports_abstract (void) const { return this->supports_abstract_; @@ -741,11 +741,11 @@ int be_valuetype::traverse_supports_list_graphs ( be_interface::tao_code_emitter gen, TAO_OutStream *os, - idl_bool use_abstract_paths, - idl_bool use_concrete_paths + bool use_abstract_paths, + bool use_concrete_paths ) { - idl_bool abstract_paths_only = use_abstract_paths && !use_concrete_paths; + bool abstract_paths_only = use_abstract_paths && !use_concrete_paths; long n_supports = this->n_supports (); @@ -893,8 +893,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req, " << be_nl << "void *obj," << be_nl - << "void *context" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "void *context" << env_dflts << be_uidt_nl << ");" << be_uidt << "\n\n"; } else @@ -906,8 +905,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *context" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *context" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; *os << ancestor->full_skel_name () @@ -920,8 +918,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete, << "req," << be_nl << "(" << ancestor->full_skel_name () << "_ptr) impl," << be_nl - << "context" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "context" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n"; } 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 dc823256753..86d6b596c50 100644 --- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp @@ -432,7 +432,7 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node) excep_holder->set_defined_in (s); excep_holder->set_name (excep_holder_name); - excep_holder->seen_in_operation (I_TRUE); + excep_holder->seen_in_operation (true); // Now our customized valuetype is created, we have to // add now the operations and attributes to the scope. @@ -565,7 +565,7 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node) 0); inherit_vt->set_name (inherit_name); - inherit_vt->seen_in_operation (I_TRUE); + inherit_vt->seen_in_operation (true); // Notice the valuetype "ExceptionHolder" that it is defined in the // "Messaging" module @@ -607,7 +607,7 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node) 0); idl_global->scopes ().pop (); - excep_holder->seen_in_operation (I_TRUE); + excep_holder->seen_in_operation (true); excep_holder->cli_hdr_gen (true); excep_holder->set_imported (true); diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index 57fb11c2c6c..d7936cbd2ed 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -71,7 +71,7 @@ be_visitor_arg_traits::visit_root (be_root *node) << "// " << __FILE__ << ":" << __LINE__; *os << be_global->core_versioning_begin () << be_nl; - + *os << be_nl << be_nl << "// Arg traits specializations." << be_nl << "namespace TAO" << be_nl @@ -89,7 +89,7 @@ be_visitor_arg_traits::visit_root (be_root *node) << "}" << be_nl; *os << be_global->core_versioning_end () << be_nl; - + return 0; } @@ -163,7 +163,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node) -1); } - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -188,7 +188,7 @@ be_visitor_arg_traits::visit_interface_fwd (be_interface_fwd *node) -1); } - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -238,7 +238,7 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node) os.gen_endif (); } - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -296,7 +296,7 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node) -1); } - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -323,7 +323,7 @@ be_visitor_arg_traits::visit_valuetype_fwd (be_valuetype_fwd *node) -1); } - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -369,11 +369,11 @@ be_visitor_arg_traits::visit_operation (be_operation *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - idl_bool wide = (str->width () != 1); + bool wide = (str->width () != 1); *os << be_nl << be_nl; - idl_bool const skel = + bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); // Avoid generating a duplicate structure in the skeleton @@ -420,7 +420,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node) -1); } - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -451,7 +451,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - idl_bool wide = (st->width () != 1); + bool wide = (st->width () != 1); // It is legal IDL to declare a bounded (w)string as an operation // parameter type. There could be any number of identical @@ -462,7 +462,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node) *os << be_nl; - idl_bool const skel = + bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); // Avoid generating a duplicate structure in the skeleton when @@ -496,7 +496,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node) << "{" << be_nl << "};"; - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -532,7 +532,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - idl_bool wide = (st->width () != 1); + bool wide = (st->width () != 1); // It is legal IDL to declare a bounded (w)string as an operation // parameter type. There could be any number of identical @@ -542,7 +542,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) // parameter for Arg_Traits<>. *os << be_nl << be_nl; - idl_bool const skel = + bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); // Avoid generating a duplicate structure in the skeleton when @@ -576,7 +576,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) << "{" << be_nl << "};"; - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -618,7 +618,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node) os->gen_endif (); - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -642,7 +642,7 @@ be_visitor_arg_traits::visit_string (be_string *node) return 0; } - idl_bool wide = (node->width () != 1); + bool wide = (node->width () != 1); TAO_OutStream *os = this->ctx_->stream (); @@ -685,7 +685,7 @@ be_visitor_arg_traits::visit_string (be_string *node) delete [] bound_string; } - idl_bool const skel = + bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); // Avoid generating a duplicate structure in the skeleton when @@ -744,7 +744,7 @@ be_visitor_arg_traits::visit_string (be_string *node) os->gen_endif (); - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -833,7 +833,7 @@ be_visitor_arg_traits::visit_array (be_array *node) os->gen_endif (); - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -873,7 +873,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node) os->gen_endif (); - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -941,7 +941,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node) will not cause infinite recursion in this visitor. */ - this->generated (node, I_TRUE); + this->generated (node, true); if (this->visit_scope (node) != 0) { @@ -974,7 +974,7 @@ be_visitor_arg_traits::visit_field (be_field *node) // field *type* may not have been reached yet) and return. if (bt->base_node_type () == AST_Decl::NT_valuetype) { - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -987,8 +987,8 @@ be_visitor_arg_traits::visit_field (be_field *node) -1); } - this->generated (node, I_TRUE); - this->generated (bt, I_TRUE); + this->generated (node, true); + this->generated (bt, true); return 0; } @@ -1058,7 +1058,7 @@ be_visitor_arg_traits::visit_union (be_union *node) will not cause infinite recursion in this visitor. */ - this->generated (node, I_TRUE); + this->generated (node, true); int status = this->visit_scope (node); @@ -1096,7 +1096,7 @@ be_visitor_arg_traits::visit_union_branch (be_union_branch *node) -1); } - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } @@ -1118,11 +1118,11 @@ be_visitor_arg_traits::visit_typedef (be_typedef *node) } this->ctx_->alias (0); - this->generated (node, I_TRUE); + this->generated (node, true); return 0; } -idl_bool +bool be_visitor_arg_traits::generated (be_decl *node) const { if (ACE_OS::strcmp (this->S_, "") == 0) @@ -1143,24 +1143,24 @@ be_visitor_arg_traits::generated (be_decl *node) const void be_visitor_arg_traits::generated (be_decl *node, - idl_bool ) + bool ) { if (ACE_OS::strcmp (this->S_, "") == 0) { switch (this->ctx_->state ()) { case TAO_CodeGen::TAO_ROOT_CS: - node->cli_arg_traits_gen (I_TRUE); + node->cli_arg_traits_gen (true); return; case TAO_CodeGen::TAO_ROOT_SS: - node->srv_arg_traits_gen (I_TRUE); + node->srv_arg_traits_gen (true); return; default: return; } } - node->srv_sarg_traits_gen (I_TRUE); + node->srv_sarg_traits_gen (true); } int diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp index edac236eaa3..97293ddf2a3 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_argument, - arglist, +ACE_RCSID (be_visitor_argument, + arglist, "$Id$") @@ -218,9 +218,9 @@ int be_visitor_args_arglist::visit_predefined_type (be_predefined_type *node) || pt == AST_PredefinedType::PT_object) { // The only PT_pseudo that doesn't take a _ptr suffix. - idl_bool is_tckind = + bool is_tckind = (ACE_OS::strcmp (node->local_name ()->get_string (), "TCKind") == 0); - + switch (this->direction ()) { case AST_Argument::dir_IN: diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp index f863ede4891..d560cd87fda 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -248,6 +248,6 @@ int be_visitor_array_ci::visit_array (be_array *node) *os << be_nl; - node->cli_inline_gen (I_TRUE); + node->cli_inline_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp index d99afdcc692..5328b16cd5f 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -352,7 +352,7 @@ int be_visitor_array_cs::visit_array (be_array *node) } } - node->cli_stub_gen (I_TRUE); + node->cli_stub_gen (true); return 0; } 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 bb8acd5e5fc..e9f8c41cdb7 100644 --- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp @@ -255,7 +255,7 @@ be_visitor_ccm_pre_proc::visit_eventtype (be_eventtype *node) { return 0; } - + if (this->create_event_consumer (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -265,16 +265,16 @@ be_visitor_ccm_pre_proc::visit_eventtype (be_eventtype *node) -1); } - node->ccm_pre_proc_gen (I_TRUE); + node->ccm_pre_proc_gen (true); return 0; } int be_visitor_ccm_pre_proc::visit_eventtype_fwd (be_eventtype_fwd *node) { - be_eventtype *fd = + be_eventtype *fd = be_eventtype::narrow_from_decl (node->full_definition ()); - + return this->visit_eventtype (fd); } @@ -325,7 +325,7 @@ be_visitor_ccm_pre_proc::gen_uses (be_component *node) { iter.next (pd); - if (pd->is_multiple == I_FALSE) + if (pd->is_multiple == false) { if (this->gen_connect_single (node, pd) == -1) { @@ -849,7 +849,7 @@ be_visitor_ccm_pre_proc::gen_get_connection_multiple ( UTL_ScopedName connections_name (&connections_id, 0); AST_Decl *d = node->lookup_by_name (&connections_name, - I_TRUE); + true); be_typedef *td = be_typedef::narrow_from_decl (d); connections_id.destroy (); @@ -882,8 +882,8 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node, be_operation (be_global->void_type (), AST_Operation::OP_noflags, 0, - I_FALSE, - I_FALSE), + false, + false), -1); push_op->set_defined_in (consumer); push_op->set_imported (node->imported ()); @@ -1353,7 +1353,7 @@ be_visitor_ccm_pre_proc::lookup_ccmobject (void) &local_name); AST_Decl *d = idl_global->scopes ().top_non_null ()->lookup_by_name (&sn, - I_TRUE); + true); if (d == 0) { @@ -1375,7 +1375,7 @@ be_visitor_ccm_pre_proc::lookup_cookie (be_component *node) UTL_ScopedName cookie_name (&this->module_id_, &local_name); AST_Decl *d = node->lookup_by_name (&cookie_name, - I_TRUE); + true); local_id.destroy (); if (d == 0) @@ -1438,7 +1438,7 @@ be_visitor_ccm_pre_proc::lookup_one_exception (be_component *node, UTL_ScopedName scoped_name (&this->module_id_, &local_name); AST_Decl *d = node->lookup_by_name (&scoped_name, - I_TRUE); + true); id.destroy (); if (d == 0) @@ -1484,17 +1484,17 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node) 0); FE_InterfaceHeader header (consumer_name, &parent_list, - I_FALSE, - I_FALSE, - I_TRUE); + false, + false, + true); ACE_NEW_RETURN (event_consumer, be_interface (header.name (), header.inherits (), header.n_inherits (), header.inherits_flat (), header.n_inherits_flat (), - I_FALSE, - I_FALSE), + false, + false), -1); parent_id.destroy (); @@ -1504,7 +1504,7 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node) event_consumer->set_defined_in (s); event_consumer->set_imported (node->imported ()); event_consumer->set_name (consumer_name); - + // Set repo id to 0, so it will be recomputed on the next access, // and set the prefix to the eventtype's prefix. All this is // necessary in case the eventtype's prefix was modified after @@ -1512,7 +1512,7 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node) // derived event consumer interface should have the same prefix. event_consumer->repoID (0); event_consumer->prefix (const_cast<char*> (node->prefix ())); - + be_type::narrow_from_decl (event_consumer)->gen_fwd_helper_name (); m->be_add_interface (event_consumer); return this->gen_push_op (node, @@ -1551,9 +1551,9 @@ be_visitor_ccm_pre_proc::create_explicit (be_home *node) UTL_NameList *parent_list = this->compute_inheritance (node); FE_InterfaceHeader header (0, parent_list, - I_FALSE, - I_FALSE, - I_TRUE); + false, + false, + true); parent_list->destroy (); UTL_ScopedName *explicit_name = this->create_scoped_name (0, @@ -1573,8 +1573,8 @@ be_visitor_ccm_pre_proc::create_explicit (be_home *node) header.n_inherits (), header.inherits_flat (), header.n_inherits_flat (), - I_FALSE, - I_FALSE), + false, + false), 0); // Back to reality. @@ -1635,9 +1635,9 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node) FE_InterfaceHeader header (0, parent_list_ptr, - I_FALSE, - I_FALSE, - I_TRUE); + false, + false, + true); parent_id.destroy (); // We're at global scope here so we need to fool the scope stack @@ -1652,8 +1652,8 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node) header.n_inherits (), header.inherits_flat (), header.n_inherits_flat (), - I_FALSE, - I_FALSE), + false, + false), 0); // Back to reality. @@ -1685,9 +1685,9 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node, &tail); FE_InterfaceHeader header (0, &parent_list, - I_FALSE, - I_FALSE, - I_TRUE); + false, + false, + true); // We're at global scope here so we need to fool the scope stack // for a minute so the correct repo id can be calculated at @@ -1701,15 +1701,15 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node, header.n_inherits (), header.inherits_flat (), header.n_inherits_flat (), - I_FALSE, - I_FALSE), + false, + false), 0); // Back to reality. idl_global->scopes ().pop (); - + // So we can skip typecode generation. - retval->home_equiv (I_TRUE); + retval->home_equiv (true); retval->set_name (equiv_name); retval->set_defined_in (s); diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp index d73a9054403..6841108b42b 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp @@ -116,8 +116,7 @@ be_visitor_component_ch::visit_component (be_component *node) << node->local_name () << "_ptr obj);" << be_nl << be_nl << "static " << node->local_name () << "_ptr " << "_narrow (" << be_idt << be_idt_nl - << "::CORBA::Object_ptr obj" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "::CORBA::Object_ptr obj" << env_dflts << be_uidt_nl << ");" << be_uidt_nl << be_nl; // This method is defined in the header file to workaround old @@ -166,8 +165,7 @@ be_visitor_component_ch::visit_component (be_component *node) *os << be_nl << be_nl << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl - << "const char *type_id" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "const char *type_id" << env_dflts << be_uidt_nl << ");" << be_uidt; // The _interface_repository_id method. @@ -274,6 +272,6 @@ be_visitor_component_ch::visit_component (be_component *node) } } - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp index 4458f9f847a..3f943723081 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp @@ -66,6 +66,6 @@ be_visitor_component_ci::visit_component (be_component *node) << "}" ; os->gen_endif (); - node->cli_inline_gen (I_TRUE); + node->cli_inline_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp index 6041157e9a0..c6b06d36e47 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp @@ -205,8 +205,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << node->full_name () << "_ptr" << be_nl << node->full_name () << "::_narrow (" << be_idt << be_idt_nl << "::CORBA::Object_ptr" - << " _tao_objref" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << " _tao_objref" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -219,8 +218,7 @@ be_visitor_component_cs::visit_component (be_component *node) << "\"" << node->repoID () << "\"," << be_nl << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () - << "_Factory_function_pointer" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "_Factory_function_pointer" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; @@ -240,8 +238,7 @@ be_visitor_component_cs::visit_component (be_component *node) // The is_a method. *os << "::CORBA::Boolean" << be_nl << node->full_name () << "::_is_a (" << be_idt << be_idt_nl - << "const char *value" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "const char *value" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "if (" << be_idt << be_idt_nl; @@ -270,8 +267,7 @@ be_visitor_component_cs::visit_component (be_component *node) << "{" << be_idt_nl << "return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (" << be_idt << be_idt_nl - << "value" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "value" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp index 5a26b0e29f5..f08209f25a7 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp @@ -161,60 +161,53 @@ be_visitor_component_sh::visit_component (be_component *node) // _is_a *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl - << "const char* logical_type_id" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "const char* logical_type_id" << env_dflts << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _is_a method. *os << "static void _is_a_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *servant," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _non_existent method. *os << "static void _non_existent_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *servant," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _interface method. *os << "static void _interface_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *servant," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _component method. *os << "static void _component_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _repository_id method. *os << "static void _repository_id_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *servant," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl - << "void *_servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *_servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // _this - *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt + << env_dflts << be_uidt_nl << ");" << be_uidt_nl << be_nl; // _interface_repository_id diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp index 62fd3026576..b030c2ed4bf 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp @@ -151,6 +151,6 @@ be_visitor_constant_ch::visit_constant (be_constant *node) *os << ";"; - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } 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 77cf1e95d81..d643647e864 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp @@ -103,7 +103,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node) << ";"; } - node->cli_stub_gen (I_TRUE); + node->cli_stub_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp index ce5bc752dbe..287f3853b9c 100644 --- a/TAO/TAO_IDL/be/be_visitor_context.cpp +++ b/TAO/TAO_IDL/be/be_visitor_context.cpp @@ -42,8 +42,8 @@ #include "be_visitor_context.h" -ACE_RCSID (be, - be_visitor_context, +ACE_RCSID (be, + be_visitor_context, "$Id$") @@ -216,24 +216,24 @@ be_visitor_context::attribute (void) } void -be_visitor_context::exception (idl_bool ib) +be_visitor_context::exception (bool ib) { this->exception_ = ib; } -idl_bool +bool be_visitor_context::exception (void) { return this->exception_; } void -be_visitor_context::comma (idl_bool ib) +be_visitor_context::comma (bool ib) { this->comma_ = ib; } -idl_bool +bool be_visitor_context::comma (void) { return this->comma_; @@ -648,7 +648,7 @@ const char * be_visitor_context::non_null_export_macro (void) const { const char *anyop_export = be_global->anyop_export_macro (); - + return (ACE_OS::strcmp (anyop_export, "") == 0 ? be_global->stub_export_macro () : anyop_export); 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 4b7067c7ab2..71bf537308b 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp @@ -75,6 +75,6 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node) *os << be_global->core_versioning_end () << be_nl; - node->cli_stub_cdr_op_gen (I_TRUE); + node->cli_stub_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp index 0ed02f95883..583b177c659 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp @@ -92,7 +92,7 @@ be_visitor_enum_ch::visit_enum (be_enum *node) } } - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp index 3bd120f3687..452cfeb3a7a 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp @@ -65,6 +65,6 @@ be_visitor_enum_cs::visit_enum (be_enum *node) } } - node->cli_stub_gen (I_TRUE); + node->cli_stub_gen (true); return 0; } 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 6410c05b30a..8ee3eab7b30 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 @@ -71,6 +71,6 @@ be_visitor_enum_serializer_op_cs::visit_enum (be_enum *node) << "return _tao_result;" << be_uidt_nl << "}"; - node->cli_stub_serializer_op_gen (I_TRUE); + node->cli_stub_serializer_op_gen (true); return 0; } 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 2a0618d7809..f432f30d54a 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 @@ -50,7 +50,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "// " << __FILE__ << ":" << __LINE__; *os << be_global->core_versioning_begin () << be_nl; - + if (!node->is_local ()) { *os << be_nl << be_nl @@ -68,16 +68,21 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "{" << be_idt_nl << "return false;" << be_uidt_nl << "}" << be_uidt_nl << be_nl - << "ACE_TRY_NEW_ENV" << be_idt_nl + << (be_global->use_raw_throw () ? "try" :"ACE_TRY_NEW_ENV") + << be_idt_nl << "{" << be_idt_nl - << "this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);" << be_nl - << "ACE_TRY_CHECK;" << be_uidt_nl + << "this->value_->_tao_decode (cdr" + << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER") + << ");" << ace_try_check << be_uidt_nl << "}" << be_uidt_nl - << "ACE_CATCHANY" << be_idt_nl + << (be_global->use_raw_throw () + ? "catch ( ::CORBA::Exception &)" + : "ACE_CATCHANY") + << be_idt_nl << "{" << be_idt_nl << "return false;" << be_uidt_nl - << "}" << be_uidt_nl - << "ACE_ENDTRY;" << be_nl << be_nl + << "}" << be_uidt + << ace_endtry << be_nl << be_nl << "return true;" << be_uidt_nl << "}" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp index dea21701546..7741845e7b4 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -99,12 +99,10 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) << "_tao_duplicate (void) const;\n" << be_nl << "virtual void _raise (void) const;\n" << be_nl << "virtual void _tao_encode (" << be_idt << be_idt_nl - << "TAO_OutputCDR &" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "TAO_OutputCDR &" << env_decl << be_uidt_nl << ") const;" << be_uidt_nl << be_nl << "virtual void _tao_decode (" << be_idt << be_idt_nl - << "TAO_InputCDR &" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "TAO_InputCDR &" << env_decl << be_uidt_nl << ");" << be_uidt; // Generate constructor that takes each member as a parameter. We need a 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 676c51401bc..25edecd0bac 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp @@ -54,6 +54,6 @@ int be_visitor_exception_ci::visit_exception (be_exception *node) -1); } - node->cli_inline_gen (I_TRUE); + node->cli_inline_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index 69014b8c6d5..fd6c6b08773 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -196,8 +196,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (!node->is_local ()) { - *os << "TAO_OutputCDR &cdr" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + *os << "TAO_OutputCDR &cdr" << env_decl << be_uidt_nl << ") const" << be_uidt_nl << "{" << be_idt_nl << "if (cdr << *this)" << be_idt_nl @@ -218,8 +217,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) } else { - *os << "TAO_OutputCDR &" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + *os << "TAO_OutputCDR &" << env_decl << be_uidt_nl << ") const" << be_uidt_nl << "{" << be_idt_nl; @@ -240,8 +238,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (!node->is_local ()) { - *os << "TAO_InputCDR &cdr" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + *os << "TAO_InputCDR &cdr" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "if (cdr >> *this)" << be_idt_nl @@ -262,8 +259,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) } else { - *os << "TAO_InputCDR &" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + *os << "TAO_InputCDR &" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -360,6 +356,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) } } - node->cli_stub_gen (I_TRUE); + node->cli_stub_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp index 4b5a5d8d1ac..cbe0a71da1e 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp @@ -75,6 +75,6 @@ be_visitor_home_ch::visit_home (be_home *node) } } - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp index 61552720cba..d57f034cc09 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp @@ -59,6 +59,6 @@ be_visitor_home_cs::visit_home (be_home *node) } } - node->cli_stub_gen (I_TRUE); + node->cli_stub_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp index 94b5bb12b7d..560bb8e72ef 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp @@ -98,6 +98,6 @@ be_visitor_amh_interface_ch::visit_interface (be_interface *node) "codegen for scope failed\n"), -1); } - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index f62b5150a47..e3454aecd71 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -121,8 +121,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "virtual ~" << class_name.c_str () << " (void);\n\n" << be_nl << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl - << "const char* logical_type_id" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "const char* logical_type_id" << env_dflts << be_uidt_nl << ");" << be_uidt_nl << be_nl; // *os << "virtual void* _downcast (" << be_idt << be_idt_nl @@ -133,47 +132,41 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) *os << "static void _is_a_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _non_existent method. *os << "static void _non_existent_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _interface method. *os << "static void _interface_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _component method. *os << "static void _component_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _repository_id method. *os << "static void _repository_id_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl - << "void *_servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *_servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; this->this_method (node); @@ -431,7 +424,7 @@ be_visitor_amh_interface_sh::this_method (be_interface *node) // interfaces is "special", because the returned type is not exactly // the type of the class, but the original class that "implied" the // AMH one. - *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt + << env_dflts << be_uidt_nl << ");\n" << be_uidt; } 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 5bbea728b19..10118851bcf 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp @@ -135,8 +135,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * context," << be_nl - << "void * obj" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * obj" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; *os << ancestor_amh_name @@ -148,8 +147,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "req," << be_nl << "context," << be_nl - << "impl" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "impl" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } @@ -173,8 +171,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * context," << be_nl - << "void * obj" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * obj" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -188,8 +185,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "req," << be_nl << "context," << be_nl - << "impl" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "impl" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; @@ -207,8 +203,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * context," << be_nl - << "void * obj" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * obj" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -222,8 +217,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "req," << be_nl << "context," << be_nl - << "impl" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "impl" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index d7b6ef96b1d..05fee0ef3d6 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -71,11 +71,13 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << non_amh_name.c_str () << "*" << be_nl << full_skel_name - << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl + << "::_this (" + << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL") + << ")" << be_nl << "{" << be_idt_nl - << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);" - << be_nl - << "ACE_CHECK_RETURN (0);" << be_nl << be_nl; + << "TAO_Stub *stub = this->_create_stub (" + << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK ("0") << be_nl << be_nl; *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl @@ -128,15 +130,13 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node) *os << "void" << be_nl << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl - << "void * context" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * context" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "this->asynchronous_upcall_dispatch (" << be_idt << be_idt_nl << "req," << be_nl << "context," << be_nl - << "this" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "this" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } @@ -148,7 +148,6 @@ be_visitor_amh_interface_ss::generate_send_reply (TAO_OutStream * os) << "server_request.tao_send_reply ();"; } - int be_visitor_amh_interface_ss::generate_amh_classes (be_interface *) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp index f006fb845da..916f4cb041d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp @@ -1,7 +1,7 @@ //$Id$ -ACE_RCSID (be_visitor_interface, - base_proxy_broker_ch, +ACE_RCSID (be_visitor_interface, + base_proxy_broker_ch, "$Id$") be_visitor_interface_base_proxy_broker_ch:: @@ -26,7 +26,7 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface ( TAO_OutStream *os = this->ctx_->stream (); *os << be_nl - << "///////////////////////////////////////////////////////////////////////" + << "///////////////////////////////////////////////////////////////////////" << be_nl << "// Base Proxy Broker Declaration " << be_nl << "//" << be_nl << be_nl; @@ -50,8 +50,7 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface ( << "select_proxy (" << be_idt << be_idt_nl; - *os << node->local_name () << " *object" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + *os << node->local_name () << " *object" << env_dflts << be_uidt_nl << ") = 0;" << be_uidt_nl // idt = 1 << be_uidt_nl; // idt = 0 diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp index b5cb1aa8d6b..eb7c5cda9d4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp @@ -40,7 +40,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface ( *os << "class " << be_global->skel_export_macro () << " " << node->direct_proxy_impl_name (); - idl_bool first_concrete = I_TRUE; + bool first_concrete = true; if (node->n_inherits () > 0) { @@ -60,17 +60,17 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface ( if (first_concrete) { - *os << be_nl + *os << be_nl << " : " << be_idt << be_idt; } else { - *os << "," << be_nl; + *os << "," << be_nl; } - first_concrete = I_FALSE; + first_concrete = false; - *os << "public virtual ::" + *os << "public virtual ::" << inherited->full_direct_proxy_impl_name (); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp index b1148857606..dc72c8a0ead 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp @@ -110,7 +110,7 @@ be_visitor_interface::visit_scope (be_scope *node) int status = intf->traverse_inheritance_graph (helper, this->ctx_->stream (), - I_FALSE); + false); if (status == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 959a01e914c..6c26766524a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -213,15 +213,15 @@ be_visitor_interface_ch::visit_interface (be_interface *node) { *os << "// These two are inherited from SessionComponent." << be_nl << be_nl - << "virtual void ciao_preactivate (" << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "virtual void ciao_preactivate (" << be_idt << be_idt + << env_sngl_dflts << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC ((" << be_idt_nl << "::CORBA::SystemException," << be_nl << "::Components::CCMException" << be_uidt_nl << "));" << be_uidt_nl << be_nl - << "virtual void ciao_postactivate (" << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "virtual void ciao_postactivate (" << be_idt << be_idt + << env_sngl_dflts << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC ((" << be_idt_nl << "::CORBA::SystemException," << be_nl @@ -238,8 +238,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // The _is_a method *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl - << "const char *type_id" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "const char *type_id" << env_dflts << be_uidt_nl << ");" << be_uidt_nl << be_nl; // The _interface_repository_id method. @@ -386,7 +385,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) } } - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } @@ -452,14 +451,14 @@ be_visitor_interface_ch::gen_xxx_narrow (const char *nar, if (node->is_abstract ()) { - *os << "::CORBA::AbstractBase_ptr obj" << be_nl; + *os << "::CORBA::AbstractBase_ptr obj"; } else { - *os << "::CORBA::Object_ptr obj" << be_nl; + *os << "::CORBA::Object_ptr obj"; } - *os << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + *os << env_dflts << be_uidt_nl << ");" << be_uidt_nl << be_nl; return true; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp index 4f95cccade4..e78a52a7528 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp @@ -54,7 +54,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node) // Nothing to generate for a local interface except from it scope. if (node->is_local ()) { - node->cli_inline_gen (I_TRUE); + node->cli_inline_gen (true); return 0; } @@ -107,6 +107,6 @@ be_visitor_interface_ci::visit_interface (be_interface *node) } os->gen_endif (); - node->cli_inline_gen (I_TRUE); + node->cli_inline_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index bece1d98687..49eed2b20ce 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -339,8 +339,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << be_nl << be_nl << "void" << be_nl << node->full_name () << "::ciao_preactivate (" - << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl + << be_idt << be_idt + << env_sngl_not << be_uidt_nl << ")" << be_uidt_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl << " ::Components::CCMException))" << be_uidt_nl @@ -348,8 +348,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}" << be_nl << be_nl << "void" << be_nl << node->full_name () << "::ciao_postactivate (" - << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl + << be_idt << be_idt + << env_sngl_not << be_uidt_nl << ")" << be_uidt_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl << " ::Components::CCMException))" << be_uidt_nl @@ -359,12 +359,16 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << "::CORBA::Boolean" << be_nl << node->full_name () << "::_is_a (" << be_idt << be_idt_nl - << "const char *value" << be_nl; + << "const char *value"; if (node->is_local () || node->is_abstract ()) - *os << "ACE_ENV_ARG_DECL_NOT_USED"; + { + *os << env_not; + } else - *os << "ACE_ENV_ARG_DECL"; + { + *os << env_decl; + } *os << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -430,8 +434,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) { *os << "return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (" << be_idt << be_idt_nl - << "value" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "value" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl; } @@ -524,9 +527,8 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, *os << "::CORBA::Object_ptr"; } - *os << " _tao_objref" << be_nl - << "ACE_ENV_ARG_DECL" - << (node->is_local () ? "_NOT_USED" : "") + *os << " _tao_objref" + << (node->is_local () ? env_not : env_decl) << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -554,8 +556,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, << "\"" << node->repoID () << "\"," << be_nl << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () - << "_Factory_function_pointer" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "_Factory_function_pointer" << env_arg << be_uidt_nl << ");" << be_uidt << be_nl << "return TAO_" << node->flat_name () << "_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (proxy);" @@ -582,8 +583,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, << "\"" << node->repoID () << "\"," << be_nl << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () - << "_Factory_function_pointer" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "_Factory_function_pointer" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; } 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 8af48e1e422..1e5817b65ce 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -84,31 +84,27 @@ be_visitor_interface_sh::visit_interface (be_interface *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; + << "// " << __FILE__ << ":" << __LINE__; // Generate the skeleton class name. - *os << "class " << class_name.c_str () << ";" << be_nl; + *os << be_nl << be_nl + << "class " << class_name.c_str () << ";" << be_nl; // Generate the _ptr declaration. *os << "typedef " << class_name.c_str () << " *" << class_name.c_str () - << "_ptr;" << be_nl << be_nl; + << "_ptr;"; if (be_global->gen_direct_collocation ()) { - *os << "class " << node->direct_proxy_impl_name () << ";" << be_nl; + *os << be_nl << be_nl + << "class " << node->direct_proxy_impl_name () << ";" << be_nl + << "class " << node->strategized_proxy_broker_name () << ";"; } - if (be_global->gen_direct_collocation ()) - { - *os << "class " << node->strategized_proxy_broker_name () - << ";" << be_nl; - } - - *os << be_nl; - // Now generate the class definition. - *os << "class " << be_global->skel_export_macro () + *os << be_nl << be_nl + << "class " << be_global->skel_export_macro () << " " << class_name.c_str () << be_idt_nl << ": " << be_idt; long n_parents = node->n_inherits (); @@ -169,8 +165,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << be_nl << "virtual ::CORBA::Boolean ciao_is_substitutable (" << be_idt << be_idt_nl - << "const char *event_repo_id" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "const char *event_repo_id" << env_dflts << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt_nl << be_nl; @@ -178,56 +173,49 @@ be_visitor_interface_sh::visit_interface (be_interface *node) // _is_a *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl - << "const char* logical_type_id" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "const char* logical_type_id" << env_dflts << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _is_a method. *os << "static void _is_a_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _non_existent method. *os << "static void _non_existent_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _interface method. *os << "static void _interface_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _component method. *os << "static void _component_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _repository_id method. *os << "static void _repository_id_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl - << "void * servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; this->this_method (node); @@ -392,7 +380,7 @@ be_visitor_interface_sh::this_method (be_interface *node) // Print out the _this() method. *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << env_dflts << be_uidt_nl << ");" << be_uidt << be_nl; } @@ -400,7 +388,7 @@ int be_visitor_interface_sh::generate_amh_classes (be_interface *node) { // We have to check for any abstract ancestor until AMH is integrated - // with abstract interfaces. If the node itself is abstract, this + // with abstract interfaces. If the node itself is abstract, this // visitor would not be created. if (be_global->gen_amh_classes () && !node->has_mixed_parentage ()) { 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 8c9c767d55c..1a4cecb0056 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -204,14 +204,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) full_skel_name, is_a_upcall_command_name.c_str ()); - *os << "void " << full_skel_name + *os << be_nl << be_nl + << "void " << full_skel_name << "::_is_a_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl; - *os << "{" << be_idt_nl; + *os << "{" << be_idt; // Generate exception list. be_visitor_operation_exceptlist_ss exception_list (this->ctx_); @@ -276,13 +276,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << " , exceptions" << be_nl << " , nexceptions" << "\n#endif /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl - << " ACE_ENV_ARG_PARAMETER);" << be_nl - << "ACE_CHECK;" << be_nl; + << " " + << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK (); this->generate_send_reply (os); *os << be_uidt_nl - << "}" << be_nl << be_nl; + << "}"; } // Generate code for the _non_existent skeleton. @@ -308,14 +309,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) full_skel_name, non_exist_upcall_command_name.c_str ()); - *os << "void " << full_skel_name + *os << be_nl << be_nl + << "void " << full_skel_name << "::_non_existent_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl; - *os << "{" << be_idt_nl; + *os << "{" << be_idt; // Generate exception list. be_visitor_operation_exceptlist_ss exception_list (this->ctx_); @@ -379,14 +380,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << " , exceptions" << be_nl << " , nexceptions" << "\n#endif /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl - << " ACE_ENV_ARG_PARAMETER);" << be_nl - << "ACE_CHECK;" << be_nl; + << " " + << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK (); this->generate_send_reply (os); *os << be_uidt_nl - << "}" << be_nl << be_nl; - + << "}"; } // Generate code for the _repository_id skeleton. @@ -416,14 +417,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) full_skel_name, repository_id_upcall_command_name.c_str ()); - *os << "void " << full_skel_name + *os << be_nl << be_nl + << "void " << full_skel_name << "::_repository_id_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl; - *os << "{" << be_idt_nl; + *os << "{" << be_idt; // Generate exception list. be_visitor_operation_exceptlist_ss exception_list (this->ctx_); @@ -487,26 +488,25 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << " , exceptions" << be_nl << " , nexceptions" << "\n#endif /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl - << " ACE_ENV_ARG_PARAMETER);" << be_nl - << "ACE_CHECK;" << be_nl; + << " " + << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK (); this->generate_send_reply (os); *os << be_uidt_nl - << "}" << be_nl << be_nl; - + << "}"; } *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; + << "// " << __FILE__ << ":" << __LINE__; *os << be_nl << be_nl << "void " << full_skel_name << "::_interface_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * /* servant_upcall */," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << "TAO_IFR_Client_Adapter *_tao_adapter =" << be_idt_nl @@ -516,8 +516,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << ");" << be_uidt_nl << be_uidt_nl; *os << "if (_tao_adapter == 0)" << be_idt_nl << "{" << be_idt_nl - << "ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1," << be_nl - << " ::CORBA::COMPLETED_NO));" << be_uidt_nl + << "ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1," + << be_nl + << " ::CORBA::COMPLETED_NO));" + << be_uidt_nl << "}" << be_uidt_nl << be_nl; // Get the right object implementation. @@ -527,9 +529,12 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << be_uidt_nl; *os << "::CORBA::InterfaceDef_ptr _tao_retval = " << be_idt_nl - << "impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);" - << be_uidt_nl - << "ACE_CHECK;" << be_nl << be_nl + << "impl->_get_interface (" + << (be_global->use_raw_throw () + ? "" + : "ACE_ENV_SINGLE_ARG_PARAMETER") + << ");" << be_uidt + << TAO_ACE_CHECK () << be_nl << be_nl << "server_request.init_reply ();" << be_nl << "TAO_OutputCDR &_tao_out = *server_request.outgoing ();" << be_nl << be_nl @@ -548,7 +553,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) this->generate_send_reply (os); *os << be_uidt_nl - << "}" << be_nl << be_nl; + << "}"; // Generate code for the _component skeleton. @@ -576,15 +581,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) full_skel_name, get_component_upcall_command_name.c_str()); - *os << "void " << full_skel_name + *os << be_nl << be_nl + << "void " << full_skel_name << "::_component_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl; - *os << "{" << be_idt_nl; - + *os << "{" << be_idt; // Generate exception list. be_visitor_operation_exceptlist_ss exception_list (this->ctx_); @@ -647,19 +651,18 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << " , exceptions" << be_nl << " , nexceptions" << "\n#endif /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl - << " ACE_ENV_ARG_PARAMETER);" << be_nl - << "ACE_CHECK;" << be_nl; - - *os << be_uidt_nl - << "}" << be_nl << be_nl; + << " " + << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK () << be_uidt_nl + << "}"; } // Generate code for the _is_a override. - *os << "::CORBA::Boolean " << full_skel_name + *os << be_nl << be_nl + << "::CORBA::Boolean " << full_skel_name << "::_is_a (" << be_idt << be_idt_nl - << "const char* value" << be_nl - << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "const char* value" << env_not << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "return" << be_idt_nl @@ -704,8 +707,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << be_nl << be_nl << "::CORBA::Boolean " << full_skel_name << "::ciao_is_substitutable (" << be_idt << be_idt_nl - << "const char * /* event_repo_id */" << be_nl - << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "const char * /* event_repo_id */" << env_not << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl @@ -815,11 +817,14 @@ be_visitor_interface_ss::this_method (be_interface *node) // the _this () operation. *os << node->full_name () << " *" << be_nl << node->full_skel_name () - << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl + << "::_this (" + << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL") + << ")" << be_nl << "{" << be_idt_nl - << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);" - << be_nl - << "ACE_CHECK_RETURN (0);" << be_nl << be_nl + << "TAO_Stub *stub = this->_create_stub (" + << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER") + << ");" + << TAO_ACE_CHECK ("0") << be_nl << be_nl << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl; *os << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" @@ -864,14 +869,15 @@ be_visitor_interface_ss::dispatch_method (be_interface *node) *os << "void " << node->full_skel_name () << "::_dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl - << "void * servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant_upcall" << env_decl << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << "this->synchronous_upcall_dispatch (req," << be_nl << " servant_upcall," << be_nl << " this" << be_nl - << " ACE_ENV_ARG_PARAMETER);" + << " " + << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") + << ");" << be_uidt_nl; *os << "}"; } @@ -880,7 +886,7 @@ int be_visitor_interface_ss::generate_amh_classes (be_interface *node) { // We have to check for any abstract ancestor until AMH is integrated - // with abstract interfaces. If the node itself is abstract, this + // with abstract interfaces. If the node itself is abstract, this // visitor would not be created. if (be_global->gen_amh_classes () && !node->has_mixed_parentage ()) { @@ -988,7 +994,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node) << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () << "_Factory_Initializer)" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl << be_nl; + << ");" << be_uidt << be_uidt; } if (be_global->gen_direct_collocation ()) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp index f0f00ab4c50..12c8f672665 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp @@ -31,7 +31,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface ( os->indent (); *os << be_nl - << "///////////////////////////////////////////////////////////////////////" + << "///////////////////////////////////////////////////////////////////////" << be_nl << "// Remote Proxy Broker Declaration " << be_nl << "//" << be_nl << be_nl; @@ -54,12 +54,11 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface ( << be_nl << be_nl; // Accessor Method - *os << "virtual " << node->base_proxy_impl_name () << " &" + *os << "virtual " << node->base_proxy_impl_name () << " &" << "select_proxy (" << be_idt << be_idt_nl; - *os << node->local_name () << " *object" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + *os << node->local_name () << " *object" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_uidt_nl; *os << "private:" << be_idt_nl @@ -71,7 +70,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface ( // Factory Member Function declaration. *os << "// This member function is used to get an handle to the " << "unique instance" << be_nl - << "// of the Remote Proxy Broker that is available for a given" + << "// of the Remote Proxy Broker that is available for a given" << be_nl << "// interface." << be_nl << "static " << node->remote_proxy_broker_name () diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp index 4399b3509d1..30d5a00dd13 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp @@ -2,8 +2,8 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - remote_proxy_broker_cs, +ACE_RCSID (be_visitor_interface, + remote_proxy_broker_cs, "$Id$") be_visitor_interface_remote_proxy_broker_cs:: @@ -34,7 +34,7 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface ( os->indent (); *os << be_nl - << "///////////////////////////////////////////////////////////////////////" + << "///////////////////////////////////////////////////////////////////////" << be_nl << "// Remote & Base Proxy Broker Implementation" << be_nl << "//" << be_nl << be_nl; @@ -84,9 +84,9 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface ( *os << node->full_base_proxy_impl_name () << "&" << be_nl <<node->full_remote_proxy_broker_name () << "::" << "select_proxy (" << be_idt << be_idt_nl - << "::" << node->full_name () << " *" << be_nl - << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" - << be_uidt_nl << "{" << be_idt_nl // idt = 1 + << "::" << node->full_name () << " *" << env_not << be_uidt_nl + << ")" << be_uidt_nl + << "{" << be_idt_nl // idt = 1 << "return this->remote_proxy_impl_;" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp index 8d4031086ae..c55d08b839e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - smart_proxy_ch, +ACE_RCSID (be_visitor_interface, + smart_proxy_ch, "$Id$") @@ -75,8 +75,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "virtual "<< node->local_name () << "_ptr create_proxy (" << be_idt << be_idt_nl << node->local_name () - << "_ptr proxy" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "_ptr proxy" << env_dflts << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "};\n\n"; @@ -89,16 +88,14 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>;" << be_nl << be_nl << "void register_proxy_factory (" << be_idt << be_idt_nl << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl - << "int one_shot_factory = 1" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "int one_shot_factory = 1" << env_dflts << be_uidt_nl << ");" << be_uidt_nl << be_nl - << "void unregister_proxy_factory (" << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "void unregister_proxy_factory (" << be_idt << be_idt + << env_dflts << be_uidt_nl << ");" << be_uidt_nl << be_nl << node->local_name () << "_ptr create_proxy (" << be_idt << be_idt_nl - << node->local_name () << "_ptr proxy" << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << node->local_name () << "_ptr proxy" << env_dflts << be_uidt_nl << ");" << be_uidt << be_uidt_nl << be_nl << "protected:" << be_idt_nl << "TAO_" << node->flat_name () @@ -160,11 +157,11 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) *os << "{" << be_nl << "public:" << be_idt_nl - << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" + << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" << be_nl // Just to keep Old g++ complier (version: 2.7.2.3) happy it's // necesssary to declare and define the destructor explicitly. - << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" + << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" << be_nl // This method will delegate this method to the <base_proxy_> // member of the smart proxy and so the smart proxy's (nil) @@ -185,7 +182,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_ch::" "visit_interface - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp index f2b65b7f3d3..4c4c41b8013 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp @@ -97,8 +97,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl << "::" << node->full_name () - << "_ptr proxy" << be_nl - << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "_ptr proxy" << env_not << be_uidt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "return proxy;" << be_uidt_nl @@ -158,8 +157,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "_Proxy_Factory_Adapter::register_proxy_factory (" << be_idt << be_idt_nl << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df," << be_nl - << "int one_shot_factory" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "int one_shot_factory" << env_decl << be_uidt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (" << be_idt << be_idt_nl @@ -169,9 +167,13 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "this->lock_" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ");" <<be_uidt_nl << be_nl - << "// Remove any existing <proxy_factory_> and replace with the new one." << be_nl - << "this->unregister_proxy_factory (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl - << "ACE_CHECK;" << be_nl + << "// Remove any existing <proxy_factory_> and " + << "replace with the new one." << be_nl + << "this->unregister_proxy_factory (" + << (be_global->use_raw_throw () + ? "" + : "ACE_ENV_SINGLE_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK () << be_nl << "this->proxy_factory_ = df;" << be_nl << "this->one_shot_factory_ = one_shot_factory;" << be_uidt_nl << "}\n\n"; @@ -186,8 +188,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_"<< node->flat_name () << "_Proxy_Factory_Adapter::unregister_proxy_factory (" - << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl + << be_idt << be_idt + << env_sngl_not << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (" << be_idt << be_idt_nl @@ -222,8 +224,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_"<< node->flat_name () << "_Proxy_Factory_Adapter::create_proxy (" << be_idt << be_idt_nl << "::" << node->full_name () - << "_ptr proxy" << be_nl - << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "_ptr proxy" << env_not << be_uidt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp index 8a446d8eda1..baf3709e1b7 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp @@ -53,8 +53,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface ( *os << be_nl << be_nl << "TAO::Collocation_Strategy" << be_nl << "get_strategy (" << be_idt << be_idt_nl - << "::CORBA::Object_ptr obj" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "::CORBA::Object_ptr obj" << env_decl << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt; @@ -67,13 +66,12 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface ( << "int num_args," << be_nl << "const char * op," << be_nl << "size_t op_len," << be_nl - << "TAO::Collocation_Strategy strategy" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "TAO::Collocation_Strategy strategy" << env_decl << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::Exception));"; *os << be_uidt_nl << be_nl - << "static " << node->strategized_proxy_broker_name () + << "static " << node->strategized_proxy_broker_name () << " *" << be_nl << "the" << node->strategized_proxy_broker_name () << " (void);" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp index 4a2479fa48d..80ce04b3f3f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp @@ -65,17 +65,18 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface ( // get_strategy() impementation. *os << "TAO::Collocation_Strategy" << be_nl - <<node->full_strategized_proxy_broker_name () << "::" + << node->full_strategized_proxy_broker_name () << "::" << "get_strategy (" << be_idt << be_idt_nl - << "::CORBA::Object_ptr obj" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "::CORBA::Object_ptr obj" << env_decl << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl << "TAO::Collocation_Strategy strategy =" << be_idt_nl - << "TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);" - << be_uidt_nl - << "ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);" << be_nl << be_nl + << "TAO_ORB_Core::collocation_strategy (obj" + << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER") + << ");" << be_uidt + << TAO_ACE_CHECK ("TAO::TAO_CS_REMOTE_STRATEGY") + << be_nl << be_nl << "return strategy;" << be_uidt_nl << "}" << be_nl << be_nl; @@ -89,21 +90,20 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface ( << "int num_args," << be_nl << "const char * op," << be_nl << "size_t op_len," << be_nl - << "TAO::Collocation_Strategy strategy" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "TAO::Collocation_Strategy strategy" << env_decl << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::Exception))" << be_uidt_nl << "{" << be_idt_nl << "TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;" << be_nl << "collocation_upcall_wrapper.upcall (" << be_idt_nl - << "obj, " << be_nl - << "forward_obj, " << be_nl - << "args, " << be_nl - << "num_args, " << be_nl - << "op, " << be_nl - << "op_len, " << be_nl - << "strategy " << be_nl - << "ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl + << "obj," << be_nl + << "forward_obj," << be_nl + << "args," << be_nl + << "num_args," << be_nl + << "op," << be_nl + << "op_len," << be_nl + << "strategy" << env_arg + << ");" << be_uidt << be_uidt_nl << "}"; *os << be_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index aecd1107492..d6ce5c3e516 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -19,8 +19,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - tie_sh, +ACE_RCSID (be_visitor_interface, + tie_sh, "$Id$") // ************************************************************ @@ -117,11 +117,11 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "void _is_owner ( ::CORBA::Boolean b);" << be_nl << "// set the ownership" << be_nl << be_nl << "// overridden ServantBase operations" << be_nl - << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt + << env_sngl_dflts << be_uidt_nl << ");" << be_uidt; - int status = + int status = node->traverse_inheritance_graph ( be_visitor_interface_tie_sh::method_helper, os @@ -161,7 +161,7 @@ be_visitor_interface_tie_sh::method_helper (be_interface *, TAO_OutStream *os) { // Any methods from abstract parents have already been - // "added" to the derived interface scope by the overridden + // "added" to the derived interface scope by the overridden // visit_scope() method in be_visitor_interface, so we can skip // this base interface, if it is abstract. if (node->is_abstract ()) @@ -178,7 +178,7 @@ be_visitor_interface_tie_sh::method_helper (be_interface *, { ACE_ERROR_RETURN ((LM_ERROR, "be_visitor_interface_tie_sh::" - "method_helper\n"), + "method_helper\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp index 46e93a19938..0bbf5bb2d1e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp @@ -19,8 +19,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - tie_si, +ACE_RCSID (be_visitor_interface, + tie_si, "$Id$") @@ -42,8 +42,8 @@ be_visitor_interface_tie_si::~be_visitor_interface_tie_si (void) int be_visitor_interface_tie_si::visit_interface (be_interface *node) { - if (node->srv_inline_gen () - || node->imported () + if (node->srv_inline_gen () + || node->imported () || node->is_abstract ()) { return 0; @@ -53,13 +53,13 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) static char localtiename [NAMEBUFSIZE]; static char localskelname [NAMEBUFSIZE]; - ACE_OS::memset (fulltiename, - '\0', + ACE_OS::memset (fulltiename, + '\0', NAMEBUFSIZE); - ACE_OS::memset (localtiename, - '\0', + ACE_OS::memset (localtiename, + '\0', NAMEBUFSIZE); - ACE_OS::memset (localskelname, + ACE_OS::memset (localskelname, '\0', NAMEBUFSIZE); @@ -67,25 +67,25 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) // class name. // We are outermost. - ACE_OS::sprintf (fulltiename, - "%s_tie", + ACE_OS::sprintf (fulltiename, + "%s_tie", node->full_skel_name ()); if (!node->is_nested ()) { - ACE_OS::sprintf (localskelname, + ACE_OS::sprintf (localskelname, "POA_%s", node->local_name ()); - ACE_OS::sprintf (localtiename, + ACE_OS::sprintf (localtiename, "POA_%s_tie", node->local_name ()); } else { - ACE_OS::sprintf (localskelname, + ACE_OS::sprintf (localskelname, "%s", node->local_name ()); - ACE_OS::sprintf (localtiename, + ACE_OS::sprintf (localtiename, "%s_tie", node->local_name ()); } @@ -180,19 +180,24 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) *os << "template <class T> ACE_INLINE " << "PortableServer::POA_ptr" << be_nl << fulltiename - << "<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)" << be_nl + << "<T>::_default_POA (" + << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_DECL") + << ")" << be_nl << "{" << be_idt_nl << "if (! CORBA::is_nil (this->poa_.in ()))" << be_idt_nl << "{" << be_idt_nl - << "return PortableServer::POA::_duplicate (this->poa_.in ());" << be_uidt_nl + << "return PortableServer::POA::_duplicate (this->poa_.in ());" + << be_uidt_nl << "}" << be_uidt_nl << be_nl << "return this->" << localskelname - << "::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl + << "::_default_POA (" + << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER") + << ");" << be_uidt_nl << "}"; int status = node->traverse_inheritance_graph ( - be_visitor_interface_tie_si::method_helper, + be_visitor_interface_tie_si::method_helper, os ); @@ -220,7 +225,7 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived, TAO_OutStream *os) { // Any methods from abstract parents have already been - // "added" to the derived interface scope by the overridden + // "added" to the derived interface scope by the overridden // visit_scope() method in be_visitor_interface, so we can skip // this base interface, if it is abstract. if (node->is_abstract ()) @@ -239,7 +244,7 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived, { ACE_ERROR_RETURN ((LM_ERROR, "be_visitor_interface_tie_si::" - "method_helper\n"), + "method_helper\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp index 8be0d364095..5985b56e260 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp @@ -56,6 +56,6 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node) // Copy the fwd helper name back to the forward declared interface node. node->fwd_helper_name (bfd->fwd_helper_name ()); - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } 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 1a858a5f1b6..63ebeb95fa8 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 @@ -66,7 +66,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) buf = 0; // Step 1 : Generate return type: always void - *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl + *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << "void" << be_nl @@ -158,34 +158,44 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) operation_name[idx] = '\0'; *os << be_nl << "{" << be_idt_nl - << "ACE_TRY" << be_nl + << (be_global->use_raw_throw () ? "try" : "ACE_TRY") << be_nl << "{" << be_idt_nl << "holder->raise_" << operation_name.c_str () - << " (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl - << "ACE_TRY_CHECK;" << be_uidt_nl + << " (" + << (be_global->use_raw_throw () + ? "" + : "ACE_ENV_SINGLE_ARG_PARAMETER") + << ");" << ace_try_check << be_uidt_nl << "}" << be_nl - << "ACE_CATCH ( ::CORBA::Exception, ex)" << be_nl - << "{" << be_nl - << " this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);" + << (be_global->use_raw_throw () + ? "catch ( ::CORBA::Exception& ex)" + : "ACE_CATCH ( ::CORBA::Exception, ex)") << be_nl - << " ACE_CHECK;" << be_nl - << "}" << be_nl - << "ACE_ENDTRY;" << be_uidt_nl + << "{" << be_idt_nl + << "this->_tao_rh_send_exception (ex" + << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK () << be_uidt_nl + << "}" << ace_endtry << be_uidt_nl << "}"; } else { // Step 3: Generate actual code for the method *os << be_nl << "{" << be_idt_nl - << "this->_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_PARAMETER);" - << be_nl - << "ACE_CHECK;" << be_nl << be_nl; + << "this->_tao_rh_init_reply (" + << (be_global->use_raw_throw () + ? "" + : "ACE_ENV_SINGLE_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK () << be_nl << be_nl; this->marshal_params (node); *os << be_nl - << "this->_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_PARAMETER);" - << be_uidt_nl + << "this->_tao_rh_send_reply (" + << (be_global->use_raw_throw () + ? "" + : "ACE_ENV_SINGLE_ARG_PARAMETER") + << ");" << be_uidt_nl << "}"; } 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 6a01601d05e..c1071830315 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp @@ -19,8 +19,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - amh_sh, +ACE_RCSID (be_visitor_operation, + amh_sh, "$Id$") // ****************************************************** @@ -83,9 +83,8 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node) } } - *os << be_nl - << "ACE_ENV_ARG_DECL" - << be_uidt_nl << ")" << be_uidt_nl; + *os << env_decl << be_uidt_nl + << ")" << be_uidt_nl; if (be_global->use_raw_throw ()) { @@ -108,7 +107,7 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node) } *os << " = 0;"; - + return 0; } @@ -120,11 +119,10 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node) if (!be_global->exception_support ()) { - *os << be_nl - << "ACE_ENV_ARG_DECL"; + *os << env_decl; } - *os << be_uidt_nl + *os << be_uidt_nl << ")" << be_uidt_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException)) = 0;" << be_nl; @@ -150,7 +148,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node) if (!be_global->exception_support ()) { - *os << be_nl << "ACE_ENV_ARG_DECL"; + *os << env_decl; } *os << be_uidt_nl << ")" << be_uidt_nl @@ -174,8 +172,7 @@ be_visitor_amh_operation_sh::generate_shared_prologue ( << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &_tao_req," << be_nl << "void *_tao_obj," << be_nl - << "void *_tao_servant_upcall" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void *_tao_servant_upcall" << env_decl << be_uidt_nl << ");" << be_uidt_nl << be_nl; // We need the interface node in which this operation was defined. However, 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 373bc2f88a2..bdb5192bb28 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -174,7 +174,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) } } - *os << be_nl << "ACE_ENV_ARG_PARAMETER"; + *os << env_arg; } if (this->generate_shared_epilogue (os) == -1) @@ -202,8 +202,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node) return -1; } - *os << be_nl - << "ACE_ENV_ARG_PARAMETER"; + *os << env_arg; if (this->generate_shared_epilogue (os) == -1) { @@ -282,7 +281,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node) } } - *os << be_nl << "ACE_ENV_ARG_PARAMETER"; + *os << env_arg; if (this->generate_shared_epilogue (os) == -1) { @@ -332,8 +331,7 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & _tao_server_request," << be_nl << "void * /* context */," << be_nl - << "void * _tao_servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * _tao_servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl; // Generate the actual code for the skeleton. 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 3b315ed6045..b2a7ba8f0f6 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -176,7 +176,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) << "TAO::Arg_Traits<void>::ret_val _tao_retval;"; // Declare the argument helper classes. - this->gen_stub_body_arglist (ami_op, os, I_TRUE); + this->gen_stub_body_arglist (ami_op, os, true); // Assemble the arg helper class pointer array. *os << be_nl << be_nl @@ -255,10 +255,9 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) *os << "AMI_" << parent->local_name () << "Handler::" << opname.fast_rep () + (this->ctx_->attribute () != 0) - << "_reply_stub" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl - << ");" << be_uidt_nl - << "ACE_CHECK;"; + << "_reply_stub" << env_arg << be_uidt_nl + << ");" << be_uidt + << TAO_ACE_CHECK (); *os << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp index 07d3324a12e..dc3271b3a40 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp @@ -205,8 +205,8 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation ( << "this->marshaled_exception ().get_buffer ()," << be_nl << "this->marshaled_exception ().length ()," << be_nl << "this->byte_order ()," << be_nl - << "this->is_system_exception ()" << be_nl - << "ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl; + << "this->is_system_exception ()" << env_arg + << ");" << be_uidt << be_uidt_nl; *os << "}\n\n"; #else diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp index fa1334c89bf..75921685b61 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp @@ -76,8 +76,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation ( << "::Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl << "::CORBA::ULong reply_status"; - *os << be_nl - << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + *os << env_dflts << 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 c04de8128d7..731fe568ef4 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 @@ -132,16 +132,12 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( *os << "TAO_InputCDR &_tao_in, " << be_nl << "::Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl << "::CORBA::ULong reply_status"; - - *os << be_nl - << "ACE_ENV_ARG_DECL"; - - *os << ")" << be_uidt << be_uidt_nl; + << env_decl << ")" << be_uidt << be_uidt_nl; // Generate the actual code for the stub. However, if any of the argument // types is "native", we flag a MARSHAL exception. // last argument - is always ACE_ENV_ARG_PARAMETER - *os << "{\n" << be_idt; + *os << "{" << be_idt_nl; // Generate any pre stub info if and only if none of our parameters is of the // native type. @@ -169,9 +165,10 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( << "_tao_reply_handler_object =" << be_idt_nl; *os << parent->full_name (); - *os << "::_narrow (_tao_reply_handler ACE_ENV_ARG_PARAMETER);" << be_uidt_nl; - - *os << "ACE_CHECK;" << be_nl << be_nl + *os << "::_narrow (_tao_reply_handler" + << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER") + << ");" << be_uidt + << TAO_ACE_CHECK () << be_nl << be_nl << "// Exception handling" << be_nl << "switch (reply_status)" << be_nl << "{" << be_idt_nl @@ -366,28 +363,19 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( // Generate the argument list. *os << "TAO_InputCDR &_tao_in, " << be_nl << "::Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl - << "::CORBA::ULong reply_status"; - - *os << be_nl - << "ACE_ENV_ARG_DECL"; - - *os << ")" << be_uidt << be_uidt_nl; - - // Generate the actual code for the stub. However, if any of the argument - // types is "native", we flag a MARSHAL exception. - // last argument - is always ACE_ENV_ARG_PARAMETER - *os << "{\n" << be_idt; - - os->indent(); + << "::CORBA::ULong reply_status" + << env_decl << ")" << be_uidt << be_uidt_nl + << "{" << be_idt_nl; *os << "// Retrieve Reply Handler object." << be_nl; *os << parent->full_name () << "_var " << "_tao_reply_handler_object =" << be_idt_nl; *os << parent->full_name (); - *os << "::_narrow (_tao_reply_handler ACE_ENV_ARG_PARAMETER);" << be_uidt_nl; - - *os << "ACE_CHECK;" << be_nl << be_nl + *os << "::_narrow (_tao_reply_handler" + << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER") + << ");" << be_uidt + << TAO_ACE_CHECK () << be_nl << be_nl << "// Exception handling" << be_nl << "switch (reply_status)" << be_nl << "{" << be_idt_nl @@ -486,9 +474,8 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( } - *os << be_uidt_nl << "};\n\n"; + *os << be_uidt_nl << "};" << be_nl << be_nl; - os->indent (); *os << "::CORBA::ULong exceptions_count = " << excep_count << ";\n" << be_nl; @@ -700,8 +687,8 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_marshal_and_invoke -1); } - *os << be_uidt_nl << ");" << be_uidt_nl; - *os << "ACE_CHECK;" << be_nl; + *os << be_uidt_nl << ");" << be_uidt + << TAO_ACE_CHECK () << be_nl; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp index 527d3d27916..fcd2fa84244 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - argument, +ACE_RCSID (be_visitor_operation, + argument, "$Id$") // ************************************************************ @@ -100,11 +100,11 @@ be_visitor_operation_argument::visit_operation (be_operation *node) // whether the operation node has parameters. if (node->argument_count () > 0) { - *os << be_nl << "ACE_ENV_ARG_PARAMETER"; + *os << env_arg; } else { - *os << be_nl << "ACE_ENV_SINGLE_ARG_PARAMETER"; + *os << env_sngl_arg; } break; 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 35266a34b06..76b2b20752a 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 @@ -68,8 +68,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( } *os << "," << be_nl - << "int " << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "int" << env_decl << be_uidt_nl << ")"; if (this->gen_throw_spec (node) != 0) @@ -146,8 +145,7 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke ( if (si.is_done ()) { - *os << be_nl - << "ACE_ENV_SINGLE_ARG_PARAMETER" << be_uidt_nl + *os << env_sngl_arg << be_uidt_nl << ");"; return 0; @@ -187,8 +185,7 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke ( } // End the upcall - *os << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + *os << env_arg << be_uidt_nl << ");"; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp index d8d4d18784d..1dcdda82daa 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp @@ -41,8 +41,7 @@ be_visitor_operation_exceptlist_ss::visit_operation (be_operation * node) { TAO_OutStream * const os = this->ctx_->stream (); - *os << be_nl - << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl; + *os << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl; // When there are exceptions and typecode support is enabled, then generate // the typecodes of the user exceptions this operation can throw. diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index a76bcfc4f49..068ec07b360 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -315,64 +315,6 @@ be_visitor_operation::gen_raise_exception (be_type *return_type, } int -be_visitor_operation::gen_check_exception (be_type *return_type) -{ - TAO_OutStream *os = this->ctx_->stream (); - - if (return_type == 0 || this->void_return_type (return_type)) - { - *os << "ACE_CHECK;" << be_nl; - return 0; - } - - // Non-void return type.... - *os << "ACE_CHECK_RETURN ("; - be_visitor_context ctx (*this->ctx_); - be_visitor_operation_rettype_return_cs visitor (&ctx); - - if (return_type->accept (&visitor) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_operation::" - "gen_check_exception - " - "codegen for return var failed\n"), - -1); - } - - *os << ");" << be_nl; - return 0; -} - -int -be_visitor_operation::gen_check_interceptor_exception (be_type *return_type) -{ - TAO_OutStream *os = this->ctx_->stream (); - - if (return_type == 0 || this->void_return_type (return_type)) - { - *os << "TAO_INTERCEPTOR_CHECK;\n"; - return 0; - } - - // Non-void return type. - *os << "TAO_INTERCEPTOR_CHECK_RETURN ("; - be_visitor_context ctx (*this->ctx_); - be_visitor_operation_rettype_return_cs visitor (&ctx); - - if (return_type->accept (&visitor) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_operation::" - "gen_check_exception - " - "codegen for return var failed\n"), - -1); - } - - *os << ");\n"; - return 0; -} - -int be_visitor_operation::gen_stub_operation_body ( be_operation *node, be_type *return_type @@ -528,24 +470,23 @@ be_visitor_operation::gen_stub_operation_body ( *os << "_tao_call.invoke (" << be_idt << be_idt_nl << "_tao_" << node->flat_name () << "_exceptiondata," << be_nl - << node->exceptions ()->length () << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << node->exceptions ()->length () << env_arg << be_uidt_nl << ");" << be_uidt; } else { - *os << "_tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);"; + *os << "_tao_call.invoke (0, 0" + << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER") + << ");"; } - *os << be_nl; - if (this->void_return_type (return_type)) { - *os << "ACE_CHECK;"; + *os << TAO_ACE_CHECK (); } else { - *os << "ACE_CHECK_RETURN (_tao_retval.excp ());"; + *os << TAO_ACE_CHECK ("_tao_retval.excp ()"); } if (!this->void_return_type (return_type)) @@ -633,7 +574,7 @@ be_visitor_operation::gen_raise_interceptor_exception ( void be_visitor_operation::gen_stub_body_arglist (be_operation *node, TAO_OutStream *os, - idl_bool ami) + bool ami) { AST_Argument *arg = 0; UTL_ScopeActiveIterator arg_decl_iter (node, UTL_Scope::IK_decls); 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 32530788656..7bba7f41d3b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation_sh, +ACE_RCSID (be_visitor_operation, + operation_sh, "$Id$") // ************************************************************ @@ -113,8 +113,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node) << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request," << be_nl << "void * servant_upcall," << be_nl - << "void * servant"<< be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ");" << be_uidt; } 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 df29bd7302a..34adf67cb75 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -161,8 +161,6 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node, -1); } - *os << be_nl; - ACE_CString upcall_command_name = ACE_CString (node->local_name ()->get_string()) + "_" + ACE_CString (intf->local_name()); @@ -211,14 +209,13 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request," << be_nl << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * servant" << env_decl << be_uidt_nl << ")" << be_uidt_nl; // Generate the actual code for the skeleton. However, if any of the // argument types is "native", we do not generate any skeleton // last argument - is always CORBA::Environment. - *os << "{" << be_idt_nl; + *os << "{" << be_idt; // Generate all the tables and other pre-skel info. if (this->gen_pre_skel_info (node) == -1) @@ -301,11 +298,9 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node, << " , exceptions" << be_nl << " , nexceptions" << "\n#endif /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl - << " ACE_ENV_ARG_PARAMETER);" << be_nl - << "ACE_CHECK;" << be_nl; - - - *os << be_uidt_nl + << " " + << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK () << be_uidt_nl << "}"; return 0; 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 7287ac5668d..2990b9fde70 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 @@ -42,8 +42,7 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node) *os << node->local_name () << " (" << be_idt << be_idt_nl << "TAO_Abstract_ServantBase *servant," << be_nl << "TAO::Argument ** args," << be_nl - << "int num_args" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "int num_args" << env_decl << be_uidt_nl << ")"; if (this->gen_throw_spec (node) != 0) 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 3f81493bdb5..b1bbcb64a7e 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 @@ -173,12 +173,14 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node, // initializer for the class argument array member/attribute. if (!node->void_return_type () || node->argument_count () > 0) { - os << be_nl; + os << be_idt_nl; if (be_global->gen_thru_poa_collocation ()) - os << ", operation_details_ (operation_details)" << be_nl; + { + os << ", operation_details_ (operation_details)" << be_nl; + } - os << ", args_ (args)"; + os << ", args_ (args)" << be_uidt; } os << be_uidt_nl; @@ -187,7 +189,9 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node, << "}" << be_nl << be_nl; // Generate execute() method. - os << "virtual void execute (ACE_ENV_SINGLE_ARG_DECL)" << be_nl + os << "virtual void execute (" + << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL") + << ")" << be_nl << "{" << be_idt_nl; if (!node->void_return_type ()) @@ -267,7 +271,7 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node, } os << be_uidt_nl - << "};" << be_nl; + << "};"; if (module != 0) { @@ -421,24 +425,34 @@ be_visitor_operation_upcall_command_ss::gen_upcall (be_operation * node) } os << "this->servant_->" << node->local_name () << " (" - << be_idt_nl; + << be_idt; size_t const count = node->argument_count (); for (unsigned int i = 0; i < count; ++i) - os << (i == 0 ? "" : ", ") << "arg_" << i + 1 << be_nl; + { + os << be_nl + << (i == 0 ? "" : ", ") << "arg_" << i + 1; + } if (count > 0) - os << "ACE_ENV_ARG_PARAMETER);"; + { + os << env_arg; + } else - os << "ACE_ENV_SINGLE_ARG_PARAMETER);"; + { + os << env_sngl_arg; + } + + os << ");"; if (!node->void_return_type ()) { os << be_uidt; } - os << be_uidt_nl << "ACE_CHECK;" << be_uidt_nl; + os << be_uidt + << TAO_ACE_CHECK () << be_uidt_nl; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp index 53da1f01bac..9c3ce0b4462 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp @@ -198,7 +198,7 @@ int be_visitor_root::visit_root (be_root *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + *os << "// Overrides of CORBA::release and CORBA::is_nil for" << be_nl << "// interfaces that inherit from both CORBA::Object" << be_nl @@ -230,7 +230,7 @@ int be_visitor_root::visit_root (be_root *node) // Make one more pass over the entire tree and generate the OBV_ namespaces // and OBV_ classes. - idl_bool obv = 1; + bool obv = 1; status = 0; switch (this->ctx_->state ()) diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp index b00aaced949..52504b81847 100644 --- a/TAO/TAO_IDL/be/be_visitor_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp @@ -25,8 +25,8 @@ #include "be_visitor_context.h" #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_visitor_scope, +ACE_RCSID (be, + be_visitor_scope, "$Id$") // ****************************************************** @@ -196,7 +196,7 @@ be_visitor_scope::next_elem (be_decl *elem, return 0; } -idl_bool +bool be_visitor_scope::last_node (be_decl *bd) { be_decl *next = 0; @@ -213,7 +213,7 @@ be_visitor_scope::last_node (be_decl *bd) return 1; } -idl_bool +bool be_visitor_scope::last_inout_or_out_node (be_decl *) { // Return true if we are the last inout or out argument. 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 cc10b86b3bb..f0efb4868c6 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -71,7 +71,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) -1); } - bt->seen_in_sequence (I_TRUE); + bt->seen_in_sequence (true); AST_Decl::NodeType nt = bt->node_type (); // If our base type is an anonymouse sequence, we must create a name 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 63782abb8d7..c96fb72bab1 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -193,6 +193,6 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) os->gen_endif (); - node->cli_stub_gen (I_TRUE); + node->cli_stub_gen (true); return 0; } 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 8b1322ad2d8..2463764b749 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 @@ -139,7 +139,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) *os << be_global->core_versioning_end () << be_nl; - node->cli_stub_cdr_op_gen (I_TRUE); + node->cli_stub_cdr_op_gen (true); return 0; } 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 4083ce2c89c..f99dbf45b27 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 @@ -244,7 +244,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) *os << be_uidt_nl << "}"; - node->cli_stub_serializer_op_gen (I_TRUE); + node->cli_stub_serializer_op_gen (true); return 0; } 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 27bcd6acaf7..f7e7d2751a6 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp @@ -98,6 +98,6 @@ int be_visitor_structure_ch::visit_structure (be_structure *node) } } - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp index f3a7520ba70..8feffbd15ea 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp @@ -53,6 +53,6 @@ int be_visitor_structure_ci::visit_structure (be_structure *node) -1); } - node->cli_inline_gen (I_TRUE); + node->cli_inline_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp index fe7103074a5..98c015f982e 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp @@ -91,6 +91,6 @@ be_visitor_structure_cs::visit_structure (be_structure *node) -1); } - node->cli_stub_gen (I_TRUE); + node->cli_stub_gen (true); return 0; } 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 1e8b3b26b0a..0df96e7e10a 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 @@ -50,6 +50,6 @@ be_visitor_structure_fwd_ch::visit_structure_fwd (be_structure_fwd *node) // This will be a no-op if it has already been done for this node. fd->gen_common_varout (os); - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index 20c8625047f..40c94c16bc8 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -146,7 +146,7 @@ be_visitor_traits::visit_interface (be_interface *node) -1); } - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -171,7 +171,7 @@ be_visitor_traits::visit_interface_fwd (be_interface_fwd *node) -1); } - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -206,7 +206,7 @@ be_visitor_traits::visit_valuebox (be_valuebox *node) os->gen_endif (); } - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -251,7 +251,7 @@ be_visitor_traits::visit_valuetype (be_valuetype *node) -1); } - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -278,7 +278,7 @@ be_visitor_traits::visit_valuetype_fwd (be_valuetype_fwd *node) -1); } - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -456,7 +456,7 @@ be_visitor_traits::visit_array (be_array *node) // os->gen_endif (); - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } @@ -478,6 +478,6 @@ be_visitor_traits::visit_typedef (be_typedef *node) } this->ctx_->alias (0); - node->cli_traits_gen (I_TRUE); + node->cli_traits_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp index 24a47afb53f..15bffced400 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp @@ -220,7 +220,7 @@ be_visitor_typedef_ci::visit_array (be_array *node) *os << "}" << be_nl << be_nl; } - bt->cli_inline_gen (I_TRUE); + bt->cli_inline_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp index 331ef16974f..1a6a3965983 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp @@ -203,6 +203,6 @@ int be_visitor_union_ch::visit_union (be_union *node) os->gen_endif (); - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); 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 6333a8f4945..e0d5784c355 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp @@ -91,6 +91,6 @@ int be_visitor_union_ci::visit_union (be_union *node) -1); } - node->cli_inline_gen (I_TRUE); + node->cli_inline_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp index 83721c478b6..c4690fff6d4 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -298,6 +298,6 @@ int be_visitor_union_cs::visit_union (be_union *node) } } - node->cli_stub_gen (I_TRUE); + node->cli_stub_gen (true); return 0; } 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 c4644d2e2a4..844b60007f3 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 @@ -235,7 +235,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); - idl_bool bt_is_defined = node->is_defined (); + bool bt_is_defined = node->is_defined (); *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl << "{" << be_idt_nl @@ -332,7 +332,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd ( TAO_OutStream *os = this->ctx_->stream (); - idl_bool bt_is_defined = node->full_definition ()->is_defined (); + bool bt_is_defined = node->full_definition ()->is_defined (); *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl << "{" << be_idt_nl 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 ab48fae03db..fec6a0f135b 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 @@ -351,7 +351,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node) ub->gen_default_label_value (os, bu); } - idl_bool bt_is_defined = node->is_defined (); + bool bt_is_defined = node->is_defined (); *os << ";" << be_nl << "typedef " @@ -448,7 +448,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node) ub->gen_default_label_value (os, bu); } - idl_bool bt_is_defined = node->full_definition ()->is_defined (); + bool bt_is_defined = node->full_definition ()->is_defined (); *os << ";" << be_nl << "typedef " diff --git a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp index 474c49e7075..a589e8eb0c4 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp @@ -48,6 +48,6 @@ be_visitor_union_fwd_ch::visit_union_fwd (be_union_fwd *node) // This will be a no-op if it has already been done for this node. fd->gen_common_varout (os); - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp index 176f4994b97..3b4856930e5 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp @@ -46,7 +46,7 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node) } TAO_OutStream *os = this->ctx_->stream (); - node->cli_stub_cdr_op_gen (I_TRUE); + node->cli_stub_cdr_op_gen (true); *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; 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 ec713d6758e..2dbe085fb1e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -153,7 +153,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) } // Indicate that code is already generated for this node. - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } @@ -276,7 +276,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) } // Indicate that this type has been used as a sequence element. - bt->seen_in_sequence (I_TRUE); + bt->seen_in_sequence (true); *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; 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 b06275c4fda..f670205b533 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -66,7 +66,7 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node) << "}" << be_nl << be_nl; // Indicate that code is already generated for this node. - node->cli_inline_gen (I_TRUE); + node->cli_inline_gen (true); return 0; } 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 04d5101783d..45de64c965b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -222,7 +222,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) } // Indicate that code is already generated for this node. - node->cli_stub_gen (I_TRUE); + node->cli_stub_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index 7daff5dc7c3..87186a23ea3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -41,7 +41,7 @@ be_visitor_obv_operation_arglist::~be_visitor_obv_operation_arglist (void) { } -idl_bool +bool be_visitor_obv_operation_arglist::is_amh_exception_holder (be_operation *node) { UTL_Scope *scope = node->defined_in (); @@ -56,18 +56,18 @@ be_visitor_obv_operation_arglist::is_amh_exception_holder (be_operation *node) if (last_E != 0 && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0) { - return I_TRUE; + return true; } } } - return I_FALSE; + return false; } int be_visitor_obv_operation_arglist::visit_operation (be_operation *node) { - idl_bool amh_valuetype = this->is_amh_exception_holder (node); + bool amh_valuetype = this->is_amh_exception_holder (node); TAO_OutStream *os = this->ctx_->stream (); *os << " ("; @@ -99,7 +99,9 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node) /***********************************************************/ if (amh_valuetype) { - *os << "ACE_ENV_SINGLE_ARG_DECL"; + *os << (be_global->use_raw_throw () + ? "" + : "ACE_ENV_SINGLE_ARG_DECL"); } /***********************************************************/ else @@ -109,11 +111,15 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node) if (node->argument_count () == 0) { - *os << " ACE_ENV_SINGLE_ARG_DECL"; + *os << (be_global->use_raw_throw () + ? "" + : " ACE_ENV_SINGLE_ARG_DECL"); } else { - *os << " ACE_ENV_ARG_DECL"; + *os << (be_global->use_raw_throw () + ? "" + : " ACE_ENV_ARG_DECL"); } } @@ -123,7 +129,9 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node) { case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH: // Last argument - is always ACE_ENV_ARG_DECL. - *os << "_WITH_DEFAULTS"; + *os << (be_global->use_raw_throw () + ? "" + : "_WITH_DEFAULTS"); break; default: break; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp index 27f2d4cb463..8e41015613f 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp @@ -58,7 +58,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node) } TAO_OutStream *os = this->ctx_->stream (); - node->cli_stub_cdr_op_gen (I_TRUE); + node->cli_stub_cdr_op_gen (true); if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 4e752620be3..58f53155d48 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -803,9 +803,9 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node, Identifier id (arg_name.c_str ()); UTL_ScopedName sn (&id, 0); be_type *ft = be_type::narrow_from_decl (f->field_type ()); - idl_bool seen = ft->seen_in_operation (); + bool seen = ft->seen_in_operation (); - // This sets ft->seen_in_operation (I_TRUE), so we have to + // This sets ft->seen_in_operation (true), so we have to // restore the original value below. be_argument arg (AST_Argument::dir_IN, ft, @@ -888,7 +888,7 @@ be_visitor_valuetype::gen_init_impl (be_valuetype *node) return 0; } -idl_bool +bool be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node) { // VT needs RefCounter if it has concrete factory or supports an @@ -918,7 +918,7 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node) return 1; } -idl_bool +bool be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node) { @@ -950,7 +950,7 @@ be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node) return 0; } -idl_bool +bool be_visitor_valuetype::is_amh_exception_holder (be_valuetype *node) { if (ACE_OS::strncmp (node->local_name (), "AMH_", 4) == 0) @@ -961,9 +961,9 @@ be_visitor_valuetype::is_amh_exception_holder (be_valuetype *node) if (last_E != 0 && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0) { - return I_TRUE; + return true; } } - return I_FALSE; + return false; } 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 8c2900977c6..22746d2ae4a 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -78,7 +78,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) // Node valuetype inherits from other valuetypes (OMG 20.17.9) // (ordinary (not abstract) interfaces ignored). - *os << be_idt_nl <<": " << be_idt; + *os << be_idt_nl << ": " << be_idt; long i; // loop index be_valuetype *inherited = 0; @@ -134,13 +134,13 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) ** 2.3) Make the destructor public (instead of protected) ** 2.4) Generate a private CORBA::Exception* field. ** 2.5) Generate the tao_marshal and tao_unmarshal methods as - ** non-abstarct. + ** non-abstract. ** 2.6) Generate the right throw spec for the AMH ExceptionHolders ************************************************************************/ /****************************************************************/ // 1) Find out if the ValueType is an AMH_*ExceptionHolder - idl_bool is_an_amh_exception_holder = this->is_amh_exception_holder (node); + bool is_an_amh_exception_holder = this->is_amh_exception_holder (node); if (is_an_amh_exception_holder) { @@ -151,8 +151,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << "public virtual ::CORBA::DefaultValueRefCountBase"; } - - if (node->node_type () == AST_Decl::NT_eventtype) + else if (node->node_type () == AST_Decl::NT_eventtype) { if (inherits_eventtype == 0) { @@ -166,11 +165,6 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) } else if (n_inherits == 0) { - if (is_an_amh_exception_holder) - { - *os << "," << be_nl; - } - *os << "public virtual ::CORBA::ValueBase"; } @@ -234,8 +228,8 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) node->traverse_supports_list_graphs ( be_visitor_valuetype_ch::gen_supported_ops, os, - I_FALSE, - I_TRUE + false, + true ); if (status == -1) @@ -379,7 +373,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) } } - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } 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 0443efe72c6..ad92ec14966 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -136,7 +136,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << node->name () << "::~" << node->local_name () << " (void)" << be_nl; *os << "{}\n" << be_nl; - idl_bool is_an_amh_exception_holder = + bool is_an_amh_exception_holder = this->is_amh_exception_holder (node); // Nothing to marshal if abstract valuetype. diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp index 704fd460b48..c68a18b7670 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp @@ -108,16 +108,16 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) os << be_nl << be_nl << "virtual ::CORBA::ValueBase *" << be_nl << "create_for_unmarshal (" - << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << be_idt << be_idt + << env_sngl_dflts << be_uidt_nl << ");" << be_uidt; if (node->supports_abstract ()) { os << be_nl << be_nl << "virtual ::CORBA::AbstractBase_ptr" << be_nl - << "create_for_unmarshal_abstract (" << be_idt << be_idt_nl - << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "create_for_unmarshal_abstract (" << be_idt << be_idt + << env_sngl_dflts << be_uidt_nl << ");" << be_uidt; } } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp index 37c2eb0a2da..07d27795d03 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp @@ -99,7 +99,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) << node->name () << "_init *" << be_nl << node->name () << "_init::_downcast ( ::CORBA::ValueFactoryBase *v)" << be_nl << "{" << be_idt_nl - << "return dynamic_cast< ::" << node->name () + << "return dynamic_cast< ::" << node->name () << "_init * > (v);" << be_uidt_nl << "}"; @@ -118,8 +118,11 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) // generate create_for_unmarshal() *os << be_nl << be_nl << "::CORBA::ValueBase *" << be_nl - << fname << "::create_for_unmarshal" << " " - << "(ACE_ENV_SINGLE_ARG_DECL)" << be_nl + << fname << "::create_for_unmarshal" << " (" + << (be_global->use_raw_throw () + ? "void" + : "ACE_ENV_SINGLE_ARG_DECL") + << ")" << be_nl << "{" << be_idt_nl << "::CORBA::ValueBase *ret_val = 0;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl @@ -134,7 +137,11 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) { *os << be_nl << be_nl << "::CORBA::AbstractBase_ptr" << be_nl - << fname << "::create_for_unmarshal_abstract (ACE_ENV_SINGLE_ARG_DECL)" << be_nl + << fname << "::create_for_unmarshal_abstract (" + << (be_global->use_raw_throw () + ? "void" + : "ACE_ENV_SINGLE_ARG_DECL") + << ")" << be_nl << "{" << be_idt_nl << "::CORBA::AbstractBase *ret_val = 0;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp index eba33c1a755..cb45192558c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp @@ -90,8 +90,8 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd ( *os << be_global->core_versioning_end () << be_nl; - node->cli_hdr_cdr_op_gen (I_TRUE); - bfd->cli_hdr_cdr_op_gen (I_TRUE); + node->cli_hdr_cdr_op_gen (true); + bfd->cli_hdr_cdr_op_gen (true); return 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 307fd0c236d..2b1638de626 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 @@ -92,6 +92,6 @@ be_visitor_valuetype_fwd_cdr_op_ci::visit_valuetype_fwd ( << node->full_name () << " *&);"; // Done with this. - node->cli_inline_cdr_op_gen (I_TRUE); + node->cli_inline_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp index 10c14850898..d5c8ecd8e5c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp @@ -53,7 +53,7 @@ be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node) // Copy the fwd helper name back to the forward declared interface node. node->fwd_helper_name (bfd->fwd_helper_name ()); - node->cli_hdr_gen (I_TRUE); + node->cli_hdr_gen (true); return 0; } |